arm: Tegra: T114: Use common tegra1x4- includes in arch-tegra
Subsystems (2)
PATCH 1/1 arm: Tegra: T114: Use common tegra1x4- includes in arch-tegra
A previous commit created common arch-tegra/tegra1x4-xxx header files for T124, based on the existing T114 headers (HW is nearly 100% compatible for most blocks). Now that T124 support is in, move T114 over to use those common headers (which are actually copies of the T114 headers). Some headers aren't shared, such as clk_rst.h, gpio.h, pmc.h, etc. as they have extra regs/bits for T124.
--- arch/arm/include/asm/arch-tegra114/ahb.h | 13 + arch/arm/include/asm/arch-tegra114/clock-tables.h | 15 +- arch/arm/include/asm/arch-tegra114/clock.h | 21 +- arch/arm/include/asm/arch-tegra114/emc.h | 13 + arch/arm/include/asm/arch-tegra114/flow.h | 30 +- arch/arm/include/asm/arch-tegra114/funcmux.h | 15 +- arch/arm/include/asm/arch-tegra114/fuse.h | 13 + arch/arm/include/asm/arch-tegra114/gp_padctrl.h | 78 +---- arch/arm/include/asm/arch-tegra114/gpio.h | 15 +- arch/arm/include/asm/arch-tegra114/hardware.h | 15 +- arch/arm/include/asm/arch-tegra114/pinmux.h | 15 +- arch/arm/include/asm/arch-tegra114/pmc.h | 343 ++++++++++++++++++++++ arch/arm/include/asm/arch-tegra114/pmu.h | 18 +- arch/arm/include/asm/arch-tegra114/spl.h | 15 +- arch/arm/include/asm/arch-tegra114/sysctr.h | 30 +- arch/arm/include/asm/arch-tegra114/tegra.h | 15 +- arch/arm/include/asm/arch-tegra114/usb.h | 153 +--------- 17 files changed, 428 insertions(+), 389 deletions(-) create mode 100644 arch/arm/include/asm/arch-tegra114/ahb.h create mode 100644 arch/arm/include/asm/arch-tegra114/emc.h create mode 100644 arch/arm/include/asm/arch-tegra114/fuse.h create mode 100644 arch/arm/include/asm/arch-tegra114/pmc.h
arch/arm/include/asm/arch-tegra114/ahb.h new file +13 -0
@@ -0,0 +1,13 @@ +/* +* (C) Copyright 2013 +* NVIDIA Corporation <www.nvidia.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _TEGRA114_AHB_H_ +#define _TEGRA114_AHB_H_ + +#include <asm/arch-tegra/tegra1x4_ahb.h> + +#endif /* _TEGRA114_AHB_H_ */
arch/arm/include/asm/arch-tegra114/clock-tables.h +3 -12
@@ -1,17 +1,8 @@/* -* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. +* (C) Copyright 2010-2013 +* NVIDIA Corporation <www.nvidia.com> * -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. +* SPDX-License-Identifier: GPL-2.0+ */ /* Tegra114 clock PLL tables */
arch/arm/include/asm/arch-tegra114/clock.h +4 -17
@@ -1,17 +1,8 @@/* -* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. +* (C) Copyright 2013 +* NVIDIA Corporation <www.nvidia.com> * -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. +* SPDX-License-Identifier: GPL-2.0+ */ /* Tegra114 clock control functions */
@@ -19,10 +10,6 @@#ifndef _TEGRA114_CLOCK_H_#define _TEGRA114_CLOCK_H_ -#include <asm/arch-tegra/clock.h> - -/* CLK_RST_CONTROLLER_OSC_CTRL_0 */ -#define OSC_FREQ_SHIFT 28 -#define OSC_FREQ_MASK (0xF << OSC_FREQ_SHIFT) +#include <asm/arch-tegra/tegra1x4_clock.h> #endif /* _TEGRA114_CLOCK_H_ */
arch/arm/include/asm/arch-tegra114/emc.h new file +13 -0
@@ -0,0 +1,13 @@ +/* +* (C) Copyright 2013 +* NVIDIA Corporation <www.nvidia.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _TEGRA114_EMC_H_ +#define _TEGRA114_EMC_H_ + +#include <asm/arch-tegra/tegra1x4_emc.h> + +#endif /* _TEGRA114_EMC_H_ */
arch/arm/include/asm/arch-tegra114/flow.h +4 -26
@@ -1,35 +1,13 @@/* -* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. +* (C) Copyright 2013 +* NVIDIA Corporation <www.nvidia.com> * -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. +* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _TEGRA114_FLOW_H_#define _TEGRA114_FLOW_H_ -struct flow_ctlr { -u32 halt_cpu_events; -u32 halt_cop_events; -u32 cpu_csr; -u32 cop_csr; -u32 xrq_events; -u32 halt_cpu1_events; -u32 cpu1_csr; -u32 halt_cpu2_events; -u32 cpu2_csr; -u32 halt_cpu3_events; -u32 cpu3_csr; -u32 cluster_control; -}; +#include <asm/arch-tegra/tegra1x4_flow.h> #endif /* _TEGRA114_FLOW_H_ */
arch/arm/include/asm/arch-tegra114/funcmux.h +3 -12
@@ -1,17 +1,8 @@/* -* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. +* (C) Copyright 2010-2013 +* NVIDIA Corporation <www.nvidia.com> * -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. +* SPDX-License-Identifier: GPL-2.0+ */ /* Tegra114 high-level function multiplexing */
arch/arm/include/asm/arch-tegra114/fuse.h new file +13 -0
@@ -0,0 +1,13 @@ +/* +* (C) Copyright 2013 +* NVIDIA Corporation <www.nvidia.com> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#ifndef _TEGRA114_FUSE_H_ +#define _TEGRA114_FUSE_H_ + +#include <asm/arch-tegra/tegra1x4_fuse.h> + +#endif /* _TEGRA114_FUSE_H_ */
arch/arm/include/asm/arch-tegra114/gp_padctrl.h +4 -74
87 lines not on this page · raw message
arch/arm/include/asm/arch-tegra114/gpio.h +3 -12
@@ -1,17 +1,8 @@/* -* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. +* (C) Copyright 2010-2013 +* NVIDIA Corporation <www.nvidia.com> * -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. +* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _TEGRA114_GPIO_H_
arch/arm/include/asm/arch-tegra114/hardware.h +3 -12
@@ -1,17 +1,8 @@/* -* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. +* (C) Copyright 2010-2013 +* NVIDIA Corporation <www.nvidia.com> * -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. +* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _TEGRA114_HARDWARE_H_
arch/arm/include/asm/arch-tegra114/pinmux.h +3 -12
@@ -1,17 +1,8 @@/* -* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. +* (C) Copyright 2010-2013 +* NVIDIA Corporation <www.nvidia.com> * -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. +* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _TEGRA114_PINMUX_H_
arch/arm/include/asm/arch-tegra114/pmc.h new file +343 -0
343 lines not on this page · raw message
arch/arm/include/asm/arch-tegra114/pmu.h +4 -14
@@ -1,23 +1,13 @@/* -* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. +* (C) Copyright 2010-2013 +* NVIDIA Corporation <www.nvidia.com> * -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. +* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _TEGRA114_PMU_H_#define _TEGRA114_PMU_H_ -/* Set core and CPU voltages to nominal levels */ -int pmu_set_nominal (void ); +#include <asm/arch-tegra/tegra1x4_pmu.h> #endif /* _TEGRA114_PMU_H_ */
arch/arm/include/asm/arch-tegra114/spl.h +3 -12
@@ -1,17 +1,8 @@/* -* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. +* (C) Copyright 2010-2013 +* NVIDIA Corporation <www.nvidia.com> * -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. +* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_ARCH_SPL_H_
arch/arm/include/asm/arch-tegra114/sysctr.h +4 -26
@@ -1,35 +1,13 @@/* -* Copyright (c) 2013, NVIDIA CORPORATION. All rights reserved. +* (C) Copyright 2013 +* NVIDIA Corporation <www.nvidia.com> * -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. +* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _TEGRA114_SYSCTR_H_#define _TEGRA114_SYSCTR_H_ -struct sysctr_ctlr { -u32 cntcr;/* 0x00: SYSCTR0_CNTCR Counter Control */ -u32 cntsr;/* 0x04: SYSCTR0_CNTSR Counter Status */ -u32 cntcv0;/* 0x08: SYSCTR0_CNTCV0 Counter Count 31:00 */ -u32 cntcv1;/* 0x0C: SYSCTR0_CNTCV1 Counter Count 63:32 */ -u32 reserved1[4 ];/* 0x10 - 0x1C */ -u32 cntfid0;/* 0x20: SYSCTR0_CNTFID0 Freq Table Entry */ -u32 cntfid1;/* 0x24: SYSCTR0_CNTFID1 Freq Table End */ -u32 reserved2[1002 ];/* 0x28 - 0xFCC */ -u32 counterid[12 ];/* 0xFD0 - 0xFxx CounterID regs, RO */ -}; - -#define TSC_CNTCR_ENABLE (1 << 0)/* Enable */ -#define TSC_CNTCR_HDBG (1 << 1)/* Halt on debug */ +#include <asm/arch-tegra/tegra1x4_sysctr.h> #endif /* _TEGRA114_SYSCTR_H_ */
arch/arm/include/asm/arch-tegra114/tegra.h +3 -12
@@ -1,17 +1,8 @@/* -* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. +* (C) Copyright 2010-2013 +* NVIDIA Corporation <www.nvidia.com> * -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. +* SPDX-License-Identifier: GPL-2.0+ */ #ifndef _TEGRA114_H_
arch/arm/include/asm/arch-tegra114/usb.h +5 -148
161 lines not on this page · raw message
Signature · 1 line
1.8.1.5
PATCH 1/1 arm: Tegra: T114: Use common tegra1x4- includes in arch-tegra
Quoted 9 lines · Tom Warren
A previous commit created common arch-tegra/tegra1x4-xxx header files for T124, based on the existing T114 headers (HW is nearly 100% compatible for most blocks). Now that T124 support is in, move T114 over to use those common headers (which are actually copies of the T114 headers). Some headers aren't shared, such as
clk_rst.h,gpio.h,pmc.h, etc. as they have extra regs/bits for T124.arch/arm/include/asm/arch-tegra114/pmc.h | 343 ++++++++++++++++++++++
How come that one file was created and is so large? If this patch is just about making Tegra114 files use the common files where possible, I wouldn't have expected any new Tegra114-specific files to be added. Is arch/arm/include/asm/arch-tegra/pmc.h wrong for Tegra114? If so, fixing that seems like it should be a separate patch.