diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2012-08-29 10:30:43 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2012-09-07 16:11:17 -0700 |
| commit | de7829bae15ab2452472255cb5ab6381d5229c89 (patch) | |
| tree | 36c61cbaf58c879f4cb863fe83f2d7eefe5ed0dd /arch/arm/mach-tegra/board-cardhu.c | |
| parent | b8461baeb3999e4bd1d2b600df1cd0acdcb869fd (diff) | |
arm: tegra: populate device nodes from device tree
Update init_machine routine for cardhu and enterprise
so that device nodes can be populated from device tree.
Disable nodes which are currently added from board files.
Bug 1036909
Change-Id: Iedf394bf5ea414b1e64cace565931991fec858a4
Signed-off-by: Nitin Kumbhar <nkumbhar@nvidia.com>
Reviewed-on: http://git-master/r/130158
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index 5b0deef113dc..011bee31094c 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -1,8 +1,7 @@ /* * arch/arm/mach-tegra/board-cardhu.c * - * Copyright (c) 2011-2012, NVIDIA Corporation. All rights reserved. - * Copyright (c) 2011-2012, NVIDIA Corporation. + * Copyright (c) 2011-2012, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -41,7 +40,7 @@ #include <linux/spi-tegra.h> #include <linux/nfc/pn544.h> #include <linux/rfkill-gpio.h> - +#include <linux/of_platform.h> #include <sound/wm8903.h> #include <sound/max98095.h> @@ -1483,6 +1482,14 @@ static void __init tegra_cardhu_init(void) tegra_serial_debug_init(TEGRA_UARTD_BASE, INT_WDT_CPU, NULL, -1, -1); } +static void __init tegra_cardhu_dt_init(void) +{ + tegra_cardhu_init(); + + of_platform_populate(NULL, + of_default_bus_match_table, NULL, NULL); +} + static void __init tegra_cardhu_reserve(void) { #if defined(CONFIG_NVMAP_CONVERT_CARVEOUT_TO_IOVMM) @@ -1508,7 +1515,7 @@ MACHINE_START(CARDHU, "cardhu") .init_irq = tegra_init_irq, .handle_irq = gic_handle_irq, .timer = &tegra_timer, - .init_machine = tegra_cardhu_init, + .init_machine = tegra_cardhu_dt_init, .restart = tegra_assert_system_reset, .dt_compat = cardhu_dt_board_compat, MACHINE_END |