[PATCH 1/3] arm/tegra: Delete tegra_init_clock()

[PATCH 1/3] arm/tegra: Delete tegra_init_clock()

[Stephen Warren]

tegra_init_clock() is written to call tegra2_init_clocks(), which only
exists if Tegra20 support is enabled. This breaks the build of a
Tegra30-only kernel.

tegra_init_clock() isn't actually used any more; tegra20_init_early()
calls tegra2_init_clocks() directly. So, just delete this function.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
These 3 patches are all cleanup for Tegra's for-3.3/soc branch.

 arch/arm/mach-tegra/board.h |    1 -
 arch/arm/mach-tegra/clock.c |    5 -----
 2 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index 628f5a8..75d1543 100644
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -30,7 +30,6 @@ void __init tegra30_init_early(void);
 void __init tegra_map_common_io(void);
 void __init tegra_init_irq(void);
 void __init tegra_dt_init_irq(void);
-void __init tegra_init_clock(void);
 int __init tegra_pcie_init(bool init_port0, bool init_port1);
 
 extern struct sys_timer tegra_timer;
diff --git a/arch/arm/mach-tegra/clock.c b/arch/arm/mach-tegra/clock.c
index a8f359d..8337068 100644
--- a/arch/arm/mach-tegra/clock.c
+++ b/arch/arm/mach-tegra/clock.c
@@ -399,11 +399,6 @@ void tegra_periph_reset_assert(struct clk *c)
 }
 EXPORT_SYMBOL(tegra_periph_reset_assert);
 
-void __init tegra_init_clock(void)
-{
-	tegra2_init_clocks();
-}
-
 #ifdef CONFIG_DEBUG_FS
 
 static int __clk_lock_all_spinlocks(void)
-- 
1.7.0.4

[PATCH 2/3] arm/tegra: Make MACH_TEGRA_DT depend on ARCH_TEGRA_2x_SOC

[Stephen Warren]

Now that Tegra20 and Tegra30 device tree board files are separate,
MACH_TEGRA_DT (which enables the Tegra20 device tree board file) should
depend on Tegra20 support being enabled.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/mach-tegra/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index b3d78fc..373652d 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -66,6 +66,7 @@ config MACH_SEABOARD
 
 config MACH_TEGRA_DT
 	bool "Generic Tegra20 board (FDT support)"
+	depends on ARCH_TEGRA_2x_SOC
 	select USE_OF
 	help
 	  Support for generic NVIDIA Tegra20 boards using Flattened Device Tree
-- 
1.7.0.4

[PATCH 3/3] arm/tegra: Compile tegra_dt_init_irq only when CONFIG_OF

[Stephen Warren]

This fixes a build break attempting to build a Tegra20-only kernel
without device tree enabled.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/mach-tegra/common.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 864dc97..a2eb901 100644
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -33,6 +33,7 @@
 #include "clock.h"
 #include "fuse.h"
 
+#ifdef CONFIG_OF
 static const struct of_device_id tegra_dt_irq_match[] __initconst = {
 	{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init },
 	{ }
@@ -43,6 +44,7 @@ void __init tegra_dt_init_irq(void)
 	tegra_init_irq();
 	of_irq_init(tegra_dt_irq_match);
 }
+#endif
 
 void tegra_assert_system_reset(char mode, const char *cmd)
 {
-- 
1.7.0.4

Re: [PATCH 1/3] arm/tegra: Delete tegra_init_clock()

[Olof Johansson]

On Mon, Dec 19, 2011 at 12:24:03PM -0700, Stephen Warren wrote:
> tegra_init_clock() is written to call tegra2_init_clocks(), which only
> exists if Tegra20 support is enabled. This breaks the build of a
> Tegra30-only kernel.
> 
> tegra_init_clock() isn't actually used any more; tegra20_init_early()
> calls tegra2_init_clocks() directly. So, just delete this function.
> 
> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> ---
> These 3 patches are all cleanup for Tegra's for-3.3/soc branch.

Thanks, applied 1-3 to for-3.3/soc.


-Olof