diff options
| author | Hiroshi Doyu | 2013-02-13 18:15:50 +0100 |
|---|---|---|
| committer | Stephen Warren | 2013-03-11 21:29:43 +0100 |
| commit | 1b14f3a57b0a1a9e0ca7091ca9f8c14fe23dfd70 (patch) | |
| tree | ca40ba80b0bed737e96c958f62e6e4ae918fadb6 /arch/arm/mach-tegra/tegra.c | |
| parent | ARM: tegra: Rename board-dt-tegra20.c to tegra.c (diff) | |
| download | kernel-qcow2-linux-1b14f3a57b0a1a9e0ca7091ca9f8c14fe23dfd70.tar.gz kernel-qcow2-linux-1b14f3a57b0a1a9e0ca7091ca9f8c14fe23dfd70.tar.xz kernel-qcow2-linux-1b14f3a57b0a1a9e0ca7091ca9f8c14fe23dfd70.zip | |
ARM: tegra: Unify Device tree board files
Unify board-dt-tegra{30,114} to the Tegra20 DT board file, "tegra.c".
Signed-off-by: Hiroshi Doyu <hdoyu@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/tegra.c')
| -rw-r--r-- | arch/arm/mach-tegra/tegra.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c index fca18e9157bd..27232c901a22 100644 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mach-tegra/tegra.c @@ -1,6 +1,7 @@ /* - * nVidia Tegra device tree board support + * NVIDIA Tegra SoC device tree board support * + * Copyright (C) 2011, 2013, NVIDIA Corporation * Copyright (C) 2010 Secret Lab Technologies, Ltd. * Copyright (C) 2010 Google, Inc. * @@ -111,7 +112,8 @@ static void __init harmony_init(void) static void __init paz00_init(void) { - tegra_paz00_wifikill_init(); + if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC)) + tegra_paz00_wifikill_init(); } static struct { @@ -137,12 +139,14 @@ static void __init tegra_dt_init_late(void) } } -static const char *tegra20_dt_board_compat[] = { +static const char * const tegra_dt_board_compat[] = { + "nvidia,tegra114", + "nvidia,tegra30", "nvidia,tegra20", NULL }; -DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)") +DT_MACHINE_START(TEGRA_DT, "NVIDIA Tegra SoC (Flattened Device Tree)") .map_io = tegra_map_common_io, .smp = smp_ops(tegra_smp_ops), .init_early = tegra_init_early, @@ -151,5 +155,5 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)") .init_machine = tegra_dt_init, .init_late = tegra_dt_init_late, .restart = tegra_assert_system_reset, - .dt_compat = tegra20_dt_board_compat, + .dt_compat = tegra_dt_board_compat, MACHINE_END |