arm: Tegra: Use arch-specific pmc.h where needed, else use common pmc.h
Subsystems (2)
PATCH 1/1 arm: Tegra: Use arch-specific pmc.h where needed, else use common pmc.h
PMC block for T20/T30 is able to use a common header, but T1x4 has added registers and/or moved registers around, so these SoCs need a arch-specific pmc.h.
Built all Tegra AOK, tested on T114 Dalmore and T124 Venice OK.
Signed-off-by Tom Warren <[email protected]>
--- arch/arm/cpu/arm720t/tegra-common/cpu.c | 2 +- arch/arm/cpu/arm720t/tegra114/cpu.c | 4 ++-- arch/arm/cpu/arm720t/tegra20/cpu.c | 2 +- arch/arm/cpu/arm720t/tegra30/cpu.c | 2 +- arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c | 2 +- arch/arm/cpu/tegra-common/ap.c | 2 +- arch/arm/cpu/tegra-common/board.c | 2 +- arch/arm/cpu/tegra20-common/warmboot.c | 2 +- arch/arm/cpu/tegra20-common/warmboot_avp.c | 2 +- arch/arm/include/asm/arch-tegra124/pmc.h | 4 ++-- arch/arm/include/asm/arch-tegra20/pmc.h | 14 ++++++++++++++ arch/arm/include/asm/arch-tegra30/pmc.h | 15 +++++++++++++++ board/nvidia/common/board.c | 2 +- 13 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 arch/arm/include/asm/arch-tegra20/pmc.h create mode 100644 arch/arm/include/asm/arch-tegra30/pmc.h
arch/arm/cpu/arm720t/tegra-common/cpu.c +1 -1
@@ -10,9 +10,9 @@#include <asm/arch/clock.h> #include <asm/arch/gp_padctrl.h> #include <asm/arch/pinmux.h> +#include <asm/arch/pmc.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/clk_rst.h> -#include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/scu.h> #include "cpu.h"
arch/arm/cpu/arm720t/tegra114/cpu.c +2 -2
@@ -19,9 +19,9 @@#include <asm/arch/clock.h> #include <asm/arch/flow.h> #include <asm/arch/pinmux.h> +#include <asm/arch/pmc.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/clk_rst.h> -#include <asm/arch-tegra/pmc.h> #include "../tegra-common/cpu.h" /* Tegra114-specific CPU init code */
@@ -211,7 +211,7 @@ static int is_clamp_enabled(u32 mask)struct pmc_ctlr *pmc = (struct pmc_ctlr *)NV_PA_PMC_BASE ;u32 reg; -/* Get clamp status. TODO: Add pmc_clamp_status alias to pmc.h */ +/* Get clamp status */ reg =readl (&pmc->pmc_clamp_status);return (reg & mask) == mask; }
arch/arm/cpu/arm720t/tegra20/cpu.c +1 -1
@@ -16,8 +16,8 @@#include <common.h> #include <asm/io.h> +#include <asm/arch/pmc.h> #include <asm/arch/tegra.h> -#include <asm/arch-tegra/pmc.h> #include "../tegra-common/cpu.h" static void enable_cpu_power_rail (void )
arch/arm/cpu/arm720t/tegra30/cpu.c +1 -1
@@ -18,9 +18,9 @@#include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/flow.h> +#include <asm/arch/pmc.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/clk_rst.h> -#include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/tegra_i2c.h> #include "../tegra-common/cpu.h"
arch/arm/cpu/armv7/tegra-common/cmd_enterrcm.c +1 -1
@@ -26,8 +26,8 @@*/ #include <common.h> +#include <asm/arch/pmc.h> #include <asm/arch/tegra.h> -#include <asm/arch-tegra/pmc.h> static int do_enterrcm (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[])
arch/arm/cpu/tegra-common/ap.c +1 -1
@@ -10,10 +10,10 @@#include <common.h> #include <asm/io.h> #include <asm/arch/gp_padctrl.h> +#include <asm/arch/pmc.h> #include <asm/arch-tegra/ap.h> #include <asm/arch-tegra/clock.h> #include <asm/arch-tegra/fuse.h> -#include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/scu.h> #include <asm/arch-tegra/tegra.h> #include <asm/arch-tegra/warmboot.h>
arch/arm/cpu/tegra-common/board.c +1 -1
@@ -9,9 +9,9 @@#include <asm/io.h> #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> +#include <asm/arch/pmc.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/board.h> -#include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/sys_proto.h> #include <asm/arch-tegra/warmboot.h>
arch/arm/cpu/tegra20-common/warmboot.c +1 -1
@@ -11,12 +11,12 @@#include <asm/arch/clock.h> #include <asm/arch/emc.h> #include <asm/arch/gp_padctrl.h> +#include <asm/arch/pmc.h> #include <asm/arch/pinmux.h> #include <asm/arch/sdram_param.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/ap.h> #include <asm/arch-tegra/clk_rst.h> -#include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/fuse.h> #include <asm/arch-tegra/warmboot.h>
arch/arm/cpu/tegra20-common/warmboot_avp.c +1 -1
@@ -10,10 +10,10 @@#include <asm/arch/clock.h> #include <asm/arch/flow.h> #include <asm/arch/pinmux.h> +#include <asm/arch/pmc.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/ap.h> #include <asm/arch-tegra/clk_rst.h> -#include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/warmboot.h> #include "warmboot_avp.h"
arch/arm/include/asm/arch-tegra124/pmc.h +2 -2
@@ -1,6 +1,6 @@/* -* (C) Copyright 2013 -* NVIDIA Corporation <www.nvidia.com> +* (C) Copyright 2013 +* NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ */
arch/arm/include/asm/arch-tegra20/pmc.h new file +14 -0
@@ -0,0 +1,14 @@ +/* +* (C) Copyright 2010-2013 +* NVIDIA Corporation <www.nvidia.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _TEGRA20_PMC_H_ +#define _TEGRA20_PMC_H_ + +/* Use common include */ +#include <asm/arch-tegra/pmc.h> + +#endif /* _TEGRA20_PMC_H_ */
arch/arm/include/asm/arch-tegra30/pmc.h new file +15 -0
@@ -0,0 +1,15 @@ +/* +* (C) Copyright 2010-2013 +* NVIDIA Corporation <www.nvidia.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _TEGRA30_PMC_H_ +#define _TEGRA30_PMC_H_ + +/* Use common include */ +#include <asm/arch-tegra/pmc.h> + +#endif /* _TEGRA30_PMC_H_ */ +
board/nvidia/common/board.c +1 -1
@@ -19,10 +19,10 @@#ifdef CONFIG_PWM_TEGRA #include <asm/arch/pwm.h> #endif +#include <asm/arch/pmc.h> #include <asm/arch/tegra.h> #include <asm/arch-tegra/board.h> #include <asm/arch-tegra/clk_rst.h> -#include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/sys_proto.h> #include <asm/arch-tegra/uart.h> #include <asm/arch-tegra/warmboot.h>
Signature · 1 line
1.8.1.5