ARM: tegra: Use common header for PMU declarations

There's no need to replicate the pmu.h header file for every Tegra SoC
generation. Use a single header that is shared across generations.

Signed-off-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
This commit is contained in:
Thierry Reding 2019-04-15 11:32:17 +02:00 committed by Tom Warren
parent bf468e5e1a
commit e9c58f2bb8
7 changed files with 5 additions and 55 deletions

View file

@ -4,10 +4,10 @@
* NVIDIA Corporation <www.nvidia.com> * NVIDIA Corporation <www.nvidia.com>
*/ */
#ifndef _ARCH_PMU_H_ #ifndef _TEGRA_PMU_H_
#define _ARCH_PMU_H_ #define _TEGRA_PMU_H_
/* Set core and CPU voltages to nominal levels */ /* Set core and CPU voltages to nominal levels */
int pmu_set_nominal(void); int pmu_set_nominal(void);
#endif /* _ARCH_PMU_H_ */ #endif /* _TEGRA_PMU_H_ */

View file

@ -1,12 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved.
*/
#ifndef _TEGRA114_PMU_H_
#define _TEGRA114_PMU_H_
/* Set core and CPU voltages to nominal levels */
int pmu_set_nominal(void);
#endif /* _TEGRA114_PMU_H_ */

View file

@ -1,13 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010-2013
* NVIDIA Corporation <www.nvidia.com>
*/
#ifndef _TEGRA124_PMU_H_
#define _TEGRA124_PMU_H_
/* Set core and CPU voltages to nominal levels */
int pmu_set_nominal(void);
#endif /* _TEGRA124_PMU_H_ */

View file

@ -1,13 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2010-2015
* NVIDIA Corporation <www.nvidia.com>
*/
#ifndef _TEGRA210_PMU_H_
#define _TEGRA210_PMU_H_
/* Set core and CPU voltages to nominal levels */
int pmu_set_nominal(void);
#endif /* _TEGRA210_PMU_H_ */

View file

@ -1,12 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved.
*/
#ifndef _TEGRA30_PMU_H_
#define _TEGRA30_PMU_H_
/* Set core and CPU voltages to nominal levels */
int pmu_set_nominal(void);
#endif /* _TEGRA30_PMU_H_ */

View file

@ -15,6 +15,7 @@
#include <asm/arch-tegra/board.h> #include <asm/arch-tegra/board.h>
#include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/clk_rst.h>
#include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/pmc.h>
#include <asm/arch-tegra/pmu.h>
#include <asm/arch-tegra/sys_proto.h> #include <asm/arch-tegra/sys_proto.h>
#include <asm/arch-tegra/uart.h> #include <asm/arch-tegra/uart.h>
#include <asm/arch-tegra/warmboot.h> #include <asm/arch-tegra/warmboot.h>
@ -24,7 +25,6 @@
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/funcmux.h> #include <asm/arch/funcmux.h>
#include <asm/arch/pinmux.h> #include <asm/arch/pinmux.h>
#include <asm/arch/pmu.h>
#include <asm/arch/tegra.h> #include <asm/arch/tegra.h>
#ifdef CONFIG_TEGRA_CLOCK_SCALING #ifdef CONFIG_TEGRA_CLOCK_SCALING
#include <asm/arch/emc.h> #include <asm/arch/emc.h>

View file

@ -8,10 +8,10 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/emc.h> #include <asm/arch/emc.h>
#include <asm/arch/pmu.h>
#include <asm/arch/tegra.h> #include <asm/arch/tegra.h>
#include <asm/arch-tegra/ap.h> #include <asm/arch-tegra/ap.h>
#include <asm/arch-tegra/clk_rst.h> #include <asm/arch-tegra/clk_rst.h>
#include <asm/arch-tegra/pmu.h>
#include <asm/arch-tegra/sys_proto.h> #include <asm/arch-tegra/sys_proto.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;