diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-10 01:52:44 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-10 01:53:02 (GMT) |
| commit | f58cf70ed954c179825cd0c51f5f64cd1ed74ed3 (patch) | |
| tree | f46e6fd10e45bd7d4e25c6ba93f145e281b9f557 /arch/arm/mach-tegra/common.c | |
| parent | e2efc25ac21ff3c8ead9670dffba40926aa54ad7 (diff) | |
| parent | 1d7e5c2c815dda6eb7a0e41a6b27ea61cd927f99 (diff) | |
| download | linux-fsl-qoriq-f58cf70ed954c179825cd0c51f5f64cd1ed74ed3.tar.xz | |
Merge branch 'tegra/t114' into next/soc
Add a couple of fixes sent via email (via Stephen/Hiroshi).
* tegra/t114:
ARM: tegra: sort Kconfig selects for Tegra114
ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114
ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/common.c')
| -rw-r--r-- | arch/arm/mach-tegra/common.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 46c0718..5449a3f 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -1,6 +1,7 @@ /* * arch/arm/mach-tegra/common.c * + * Copyright (c) 2013 NVIDIA Corporation. All rights reserved. * Copyright (C) 2010 Google, Inc. * * Author: @@ -93,8 +94,7 @@ static void __init tegra_init_cache(void) } -#ifdef CONFIG_ARCH_TEGRA_2x_SOC -void __init tegra20_init_early(void) +static void __init tegra_init_early(void) { tegra_cpu_reset_handler_init(); tegra_apb_io_init(); @@ -102,22 +102,31 @@ void __init tegra20_init_early(void) tegra_init_cache(); tegra_pmc_init(); tegra_powergate_init(); +} + +#ifdef CONFIG_ARCH_TEGRA_2x_SOC +void __init tegra20_init_early(void) +{ + tegra_init_early(); tegra20_hotplug_init(); } #endif + #ifdef CONFIG_ARCH_TEGRA_3x_SOC void __init tegra30_init_early(void) { - tegra_cpu_reset_handler_init(); - tegra_apb_io_init(); - tegra_init_fuse(); - tegra_init_cache(); - tegra_pmc_init(); - tegra_powergate_init(); + tegra_init_early(); tegra30_hotplug_init(); } #endif +#ifdef CONFIG_ARCH_TEGRA_114_SOC +void __init tegra114_init_early(void) +{ + tegra_init_early(); +} +#endif + void __init tegra_init_late(void) { tegra_powergate_debugfs_init(); |