ARM: tegra: Unify board-dt-tegra{20,30,114}
Subsystems (3)
v3 cover ARM: tegra: Unify board-dt-tegra{20,30,114}
Hi,
This series unifies "board-dt-tegra{20,30,114}.c" to "tegra.c".
The following changes since commit d5b00d3fd920d8f2b1c35140212e66948ab9f6f3:
(Stephen's next-20130211-fixed)
of: fix recursive locking in of_get_next_available_child() (2013-02-11 14:08:15 -0700)
are available in the git repository at:
git://nv-tegra.nvidia.com/user/hdoyu/linux unify-board-dt
for you to fetch changes up to 7804a741550584b93b7f092d4d7b265cee52a4b0:
ARM: tegra: Unify Device tree board files (2013-02-13 18:59:07 +0200)
v2:
http://lists.infradead.org/pipermail/linux-arm-kernel/2013-February/148860.html
v1:
http://lists.infradead.org/pipermail/linux-arm-kernel/2013-February/148380.html
----------------------------------------------------------------
Hiroshi Doyu (3):
ARM: tegra: Unify tegra{20,30,114}_init_early()
ARM: tegra: Rename board-dt-tegra20.c to tegra.c
ARM: tegra: Unify Device tree board files
arch/arm/mach-tegra/Makefile | 4 +-
arch/arm/mach-tegra/board-dt-tegra114.c | 46 ---------------
arch/arm/mach-tegra/board-dt-tegra30.c | 60 --------------------
arch/arm/mach-tegra/board.h | 4 +-
arch/arm/mach-tegra/common.c | 26 +--------
arch/arm/mach-tegra/hotplug.c | 23 +++-----
arch/arm/mach-tegra/sleep.h | 10 ++--
.../arm/mach-tegra/{board-dt-tegra20.c => tegra.c} | 16 ++++--
8 files changed, 28 insertions(+), 161 deletions(-)
delete mode 100644 arch/arm/mach-tegra/board-dt-tegra114.c
delete mode 100644 arch/arm/mach-tegra/board-dt-tegra30.c
rename arch/arm/mach-tegra/{board-dt-tegra20.c => tegra.c} (89%)PATCH v3 1/3 ARM: tegra: Unify tegra{20,30,114}_init_early()
Refactored tegra{20,30,114}_init_early() so that we have the unified tegra_init_early().
--- arch/arm/mach-tegra/board-dt-tegra114.c | 2 +- arch/arm/mach-tegra/board-dt-tegra20.c | 2 +- arch/arm/mach-tegra/board-dt-tegra30.c | 4 ++-- arch/arm/mach-tegra/board.h | 4 +--- arch/arm/mach-tegra/common.c | 26 ++------------------------ arch/arm/mach-tegra/hotplug.c | 23 +++++++++-------------- arch/arm/mach-tegra/sleep.h | 10 +++++----- 7 files changed, 21 insertions(+), 50 deletions(-)
arch/arm/mach-tegra/board-dt-tegra114.c +1 -1
@@ -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 = tegra114_init_early, + .init_early = tegra_init_early, .init_irq = tegra_dt_init_irq, .init_time = clocksource_of_init, .init_machine = tegra114_dt_init,
arch/arm/mach-tegra/board-dt-tegra20.c +1 -1
@@ -145,7 +145,7 @@ static const char *tegra20_dt_board_compat[] = {DT_MACHINE_START (TEGRA_DT ,"nVidia Tegra20 (Flattened Device Tree)" ) .map_io = tegra_map_common_io, .smp = smp_ops(tegra_smp_ops), - .init_early = tegra20_init_early, + .init_early = tegra_init_early, .init_irq = tegra_dt_init_irq, .init_time = clocksource_of_init, .init_machine = tegra_dt_init,
arch/arm/mach-tegra/board-dt-tegra30.c +2 -2
@@ -3,7 +3,7 @@* * NVIDIA Tegra30 device tree board support * -* Copyright (C) 2011 NVIDIA Corporation +* Copyright (C) 2011, 2013, NVIDIA Corporation * * Derived from: *
@@ -50,7 +50,7 @@ static const char *tegra30_dt_board_compat[] = {DT_MACHINE_START (TEGRA30_DT ,"NVIDIA Tegra30 (Flattened Device Tree)" ) .smp = smp_ops(tegra_smp_ops), .map_io = tegra_map_common_io, - .init_early = tegra30_init_early, + .init_early = tegra_init_early, .init_irq = tegra_dt_init_irq, .init_time = clocksource_of_init, .init_machine = tegra30_dt_init,
arch/arm/mach-tegra/board.h +1 -3
@@ -26,9 +26,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_init_early (void );void __init tegra_map_common_io (void );void __init tegra_init_irq (void );void __init tegra_dt_init_irq (void );
arch/arm/mach-tegra/common.c +2 -24
@@ -94,7 +94,7 @@ static void __init tegra_init_cache(void) } -static void __init tegra_init_early (void ) +void __init tegra_init_early (void ) {tegra_cpu_reset_handler_init ();tegra_apb_io_init ();
@@ -102,31 +102,9 @@ static void __init tegra_init_early(void)tegra_init_cache ();tegra_pmc_init ();tegra_powergate_init (); +tegra_hotplug_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_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 ();
arch/arm/mach-tegra/hotplug.c +9 -14
@@ -1,8 +1,7 @@/* -* * Copyright (C) 2002 ARM Ltd. * All Rights Reserved -* Copyright (c) 2010, 2012 NVIDIA Corporation. All rights reserved. +* Copyright (c) 2010, 2012-2013, NVIDIA Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -15,6 +14,7 @@#include <asm/cacheflush.h> #include <asm/smp_plat.h> +#include "fuse.h" #include "sleep.h" static void (*tegra_hotplug_shutdown)(void );
@@ -56,18 +56,13 @@ int tegra_cpu_disable(unsigned int cpu)return cpu ==0 ? -EPERM :0 ; } -#ifdef CONFIG_ARCH_TEGRA_2x_SOC -extern void tegra20_hotplug_shutdown (void ); -void __init tegra20_hotplug_init (void ) +void __init tegra_hotplug_init (void ) { - tegra_hotplug_shutdown = tegra20_hotplug_shutdown; -} -#endif +if (!IS_ENABLED (CONFIG_HOTPLUG_CPU )) +return ; -#ifdef CONFIG_ARCH_TEGRA_3x_SOC -extern void tegra30_hotplug_shutdown (void ); -void __init tegra30_hotplug_init (void ) -{ - tegra_hotplug_shutdown = tegra30_hotplug_shutdown; +if (IS_ENABLED (CONFIG_ARCH_TEGRA_2x_SOC) && tegra_chip_id ==TEGRA20 ) + tegra_hotplug_shutdown = tegra20_hotplug_shutdown; +if (IS_ENABLED (CONFIG_ARCH_TEGRA_3x_SOC) && tegra_chip_id ==TEGRA30 ) + tegra_hotplug_shutdown = tegra30_hotplug_shutdown; } -#endif
arch/arm/mach-tegra/sleep.h +5 -5
@@ -1,5 +1,5 @@/* -* Copyright (c) 2010-2012, NVIDIA Corporation. All rights reserved. +* Copyright (c) 2010-2013, NVIDIA Corporation. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License,
@@ -124,11 +124,11 @@ int tegra_sleep_cpu_finish(unsigned long);void tegra_disable_clean_inv_dcache (void );#ifdef CONFIG_HOTPLUG_CPU -void tegra20_hotplug_init (void ); -void tegra30_hotplug_init (void ); +void tegra20_hotplug_shutdown (void ); +void tegra30_hotplug_shutdown (void ); +void tegra_hotplug_init (void );#else -static inline void tegra20_hotplug_init (void ) {} -static inline void tegra30_hotplug_init (void ) {} +static inline void tegra_hotplug_init (void ) {}#endif void tegra20_cpu_shutdown (int cpu);
Signature · 1 line
1.7.9.5
PATCH v3 2/3 ARM: tegra: Rename board-dt-tegra20.c to tegra.c
In reply to Hiroshi DoyuThis is the preparation to unify "board-dt-tegra{20,30,114}.c" to a single file "tegra.c".
---
arch/arm/mach-tegra/Makefile | 2 +-
.../arm/mach-tegra/{board-dt-tegra20.c => tegra.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename arch/arm/mach-tegra/{board-dt-tegra20.c => tegra.c} (100%)arch/arm/mach-tegra/Makefile +1 -1
@@ -27,7 +27,7 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o obj-$(CONFIG_TEGRA_PCI) += pcie.o -obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += board-dt-tegra20.o +obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra.o obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.o obj-$(CONFIG_ARCH_TEGRA_114_SOC) += board-dt-tegra114.o ifeq ($(CONFIG_CPU_IDLE),y)
arch/arm/mach-tegra/tegra.c renamed from arch/arm/mach-tegra/board-dt-tegra20.c +0 -0
Signature · 1 line
1.7.9.5
PATCH v3 3/3 ARM: tegra: Unify Device tree board files
In reply to Hiroshi DoyuUnify board-dt-tegra{30,114} to the Tegra20 DT board file, "tegra.c".
--- arch/arm/mach-tegra/Makefile | 4 +-- arch/arm/mach-tegra/board-dt-tegra114.c | 46 ------------------------ arch/arm/mach-tegra/board-dt-tegra30.c | 60 ------------------------------- arch/arm/mach-tegra/tegra.c | 14 +++++--- 4 files changed, 10 insertions(+), 114 deletions(-) delete mode 100644 arch/arm/mach-tegra/board-dt-tegra114.c delete mode 100644 arch/arm/mach-tegra/board-dt-tegra30.c
arch/arm/mach-tegra/Makefile +1 -3
@@ -10,6 +10,7 @@ obj-y += pm.o obj-y += reset.o obj-y += reset-handler.o obj-y += sleep.o +obj-y += tegra.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20_speedo.o obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra2_emc.o
@@ -27,9 +28,6 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o obj-$(CONFIG_CPU_FREQ) += cpu-tegra.o obj-$(CONFIG_TEGRA_PCI) += pcie.o -obj-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra.o -obj-$(CONFIG_ARCH_TEGRA_3x_SOC) += board-dt-tegra30.o -obj-$(CONFIG_ARCH_TEGRA_114_SOC) += board-dt-tegra114.o ifeq ($(CONFIG_CPU_IDLE),y) obj-$(CONFIG_ARCH_TEGRA_114_SOC) += cpuidle-tegra114.o endif
arch/arm/mach-tegra/board-dt-tegra114.c deleted +0 -46
46 lines not on this page · raw message
arch/arm/mach-tegra/board-dt-tegra30.c deleted +0 -60
60 lines not on this page · raw message
arch/arm/mach-tegra/tegra.c +9 -5
@@ -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
Signature · 1 line
1.7.9.5
A message that is not in the archive (sent off-list or not yet received): 1360775751-23850-1-git-send-email-hdoyu-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org
Quoted 3 lines · Hiroshi Doyu
Hi,
This series unifies "board-dt-tegra{20,30,114}.c" to "
tegra.c".
This series looks fine to me now. I'll apply for 3.10 when the time comes.
Stephen Warren
AppliedQuoted 3 lines · Hiroshi Doyu
Hi,
This series unifies "board-dt-tegra{20,30,114}.c" to "
tegra.c".
I've applied this series to Tegra's for-3.10/cleanup branch.