aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-tegra/common.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-02-09 20:52:44 -0500
committerOlof Johansson <olof@lixom.net>2013-02-09 20:53:02 -0500
commitf58cf70ed954c179825cd0c51f5f64cd1ed74ed3 (patch)
treef46e6fd10e45bd7d4e25c6ba93f145e281b9f557 /arch/arm/mach-tegra/common.c
parente2efc25ac21ff3c8ead9670dffba40926aa54ad7 (diff)
parent1d7e5c2c815dda6eb7a0e41a6b27ea61cd927f99 (diff)
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.c25
1 files changed, 17 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 46c071861c4e..5449a3f2977b 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -1,6 +1,7 @@
1/* 1/*
2 * arch/arm/mach-tegra/common.c 2 * arch/arm/mach-tegra/common.c
3 * 3 *
4 * Copyright (c) 2013 NVIDIA Corporation. All rights reserved.
4 * Copyright (C) 2010 Google, Inc. 5 * Copyright (C) 2010 Google, Inc.
5 * 6 *
6 * Author: 7 * Author:
@@ -93,8 +94,7 @@ static void __init tegra_init_cache(void)
93 94
94} 95}
95 96
96#ifdef CONFIG_ARCH_TEGRA_2x_SOC 97static void __init tegra_init_early(void)
97void __init tegra20_init_early(void)
98{ 98{
99 tegra_cpu_reset_handler_init(); 99 tegra_cpu_reset_handler_init();
100 tegra_apb_io_init(); 100 tegra_apb_io_init();
@@ -102,22 +102,31 @@ void __init tegra20_init_early(void)
102 tegra_init_cache(); 102 tegra_init_cache();
103 tegra_pmc_init(); 103 tegra_pmc_init();
104 tegra_powergate_init(); 104 tegra_powergate_init();
105}
106
107#ifdef CONFIG_ARCH_TEGRA_2x_SOC
108void __init tegra20_init_early(void)
109{
110 tegra_init_early();
105 tegra20_hotplug_init(); 111 tegra20_hotplug_init();
106} 112}
107#endif 113#endif
114
108#ifdef CONFIG_ARCH_TEGRA_3x_SOC 115#ifdef CONFIG_ARCH_TEGRA_3x_SOC
109void __init tegra30_init_early(void) 116void __init tegra30_init_early(void)
110{ 117{
111 tegra_cpu_reset_handler_init(); 118 tegra_init_early();
112 tegra_apb_io_init();
113 tegra_init_fuse();
114 tegra_init_cache();
115 tegra_pmc_init();
116 tegra_powergate_init();
117 tegra30_hotplug_init(); 119 tegra30_hotplug_init();
118} 120}
119#endif 121#endif
120 122
123#ifdef CONFIG_ARCH_TEGRA_114_SOC
124void __init tegra114_init_early(void)
125{
126 tegra_init_early();
127}
128#endif
129
121void __init tegra_init_late(void) 130void __init tegra_init_late(void)
122{ 131{
123 tegra_powergate_debugfs_init(); 132 tegra_powergate_debugfs_init();