[PATCH 1/1] ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC

[PATCH 1/1] ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC

[Hiroshi Doyu]

This patch fixes the build error when ARCH_TEGRA_114_SOC is enabled
and ARCH_TEGRA_3x_SOC is disabled.

This provides Tegra114 with its own tegra114_init_early() instead of
making use of tegra30_init_early() so that T114 build doesn't depend
on T3x anymore.

Signed-off-by: Hiroshi Doyu <hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/mach-tegra/board-dt-tegra114.c |    2 +-
 arch/arm/mach-tegra/board.h             |    2 ++
 arch/arm/mach-tegra/common.c            |   25 +++++++++++++++++--------
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/arch/arm/mach-tegra/board-dt-tegra114.c b/arch/arm/mach-tegra/board-dt-tegra114.c
index 72598e2..085d636 100644
--- a/arch/arm/mach-tegra/board-dt-tegra114.c
+++ b/arch/arm/mach-tegra/board-dt-tegra114.c
@@ -36,7 +36,7 @@ static const char * const tegra114_dt_board_compat[] = {
 DT_MACHINE_START(TEGRA114_DT, "NVIDIA Tegra114 (Flattened Device Tree)")
 	.smp		= smp_ops(tegra_smp_ops),
 	.map_io		= tegra_map_common_io,
-	.init_early	= tegra30_init_early,
+	.init_early	= tegra114_init_early,
 	.init_irq	= tegra_dt_init_irq,
 	.init_time	= clocksource_of_init,
 	.init_machine	= tegra114_dt_init,
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index da8f5a3..86851c8 100644
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -1,6 +1,7 @@
 /*
  * arch/arm/mach-tegra/board.h
  *
+ * Copyright (c) 2013 NVIDIA Corporation. All rights reserved.
  * Copyright (C) 2010 Google, Inc.
  *
  * Author:
@@ -27,6 +28,7 @@ void tegra_assert_system_reset(char mode, const char *cmd);
 
 void __init tegra20_init_early(void);
 void __init tegra30_init_early(void);
+void __init tegra114_init_early(void);
 void __init tegra_map_common_io(void);
 void __init tegra_init_irq(void);
 void __init tegra_dt_init_irq(void);
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();
-- 
1.7.9.5

Re: [PATCH 1/1] ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC

[Stephen Warren]

On 02/06/2013 09:10 AM, Hiroshi Doyu wrote:
> This patch fixes the build error when ARCH_TEGRA_114_SOC is enabled
> and ARCH_TEGRA_3x_SOC is disabled.
> 
> This provides Tegra114 with its own tegra114_init_early() instead of
> making use of tegra30_init_early() so that T114 build doesn't depend
> on T3x anymore.

Olof, Arnd,

This patch fixes the (well, an) issue for me. Can you apply it directly
to the arm-soc tree. I believe it should apply on top of the
tegra-for-3.9-soc-t114 pull request I sent.

Let me know if you need a resend, although it was CC'd to LAKML, so I
assume you have it in your email history.

BTW, I anticipate a few more fixes coming down the line:

1) Clock-related patch from Laxman so that UART C clock on Cardhu is set
up correctly for Bluetooth. v1 was posted already, but I think a v2 is
needed here.

2) Another fix for Tegra20+Tegra114 w/o Tegra30 build fix from Hiroshi,
related to drivers/amba/tegra-ahb.c, although there aren't any
dependencies there, so perhaps that can go through Russell since he
maintains that tree.

3) Something related to fb2229a "ARM: 7634/1: uncompress debug support
for multiplatform build" since that breaks tegra_defconfig, but I
haven't had a chance to look into that yet.

4) Something related to a boot failure related to crash in
tegra_timer_interrupt(), which I'm just about to go investigate.

Hopefully that's it...

Re: [PATCH 1/1] ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC

[Olof Johansson]

On Wed, Feb 06, 2013 at 11:05:52AM -0700, Stephen Warren wrote:
> On 02/06/2013 09:10 AM, Hiroshi Doyu wrote:
> > This patch fixes the build error when ARCH_TEGRA_114_SOC is enabled
> > and ARCH_TEGRA_3x_SOC is disabled.
> > 
> > This provides Tegra114 with its own tegra114_init_early() instead of
> > making use of tegra30_init_early() so that T114 build doesn't depend
> > on T3x anymore.
> 
> Olof, Arnd,
> 
> This patch fixes the (well, an) issue for me. Can you apply it directly
> to the arm-soc tree. I believe it should apply on top of the
> tegra-for-3.9-soc-t114 pull request I sent.

Ok, applied -- I presumed your acked-by so I added it.

> Let me know if you need a resend, although it was CC'd to LAKML, so I
> assume you have it in your email history.

No resend needed -- it had a bit of fuzz when applied though.

> BTW, I anticipate a few more fixes coming down the line:
> 
> 1) Clock-related patch from Laxman so that UART C clock on Cardhu is set
> up correctly for Bluetooth. v1 was posted already, but I think a v2 is
> needed here.
> 
> 2) Another fix for Tegra20+Tegra114 w/o Tegra30 build fix from Hiroshi,
> related to drivers/amba/tegra-ahb.c, although there aren't any
> dependencies there, so perhaps that can go through Russell since he
> maintains that tree.
> 
> 3) Something related to fb2229a "ARM: 7634/1: uncompress debug support
> for multiplatform build" since that breaks tegra_defconfig, but I
> haven't had a chance to look into that yet.
> 
> 4) Something related to a boot failure related to crash in
> tegra_timer_interrupt(), which I'm just about to go investigate.
> 
> Hopefully that's it...

Above sounds reasonable, thanks for the heads up.


-Olof