From: Stephen Warren swarren@nvidia.com
Machine-specific headers should be in this location. Eventually, we'll move all headers from arch/arm/include to arch/arm/mach-tegra/include, or find a way to delete them. This change also removes multiple useless empty wrappers for this header.
Signed-off-by: Stephen Warren swarren@nvidia.com --- arch/arm/include/asm/arch-tegra114/powergate.h | 6 ------ arch/arm/include/asm/arch-tegra124/powergate.h | 6 ------ arch/arm/include/asm/arch-tegra20/powergate.h | 6 ------ arch/arm/include/asm/arch-tegra210/powergate.h | 12 ------------ arch/arm/include/asm/arch-tegra30/powergate.h | 6 ------ .../asm/arch-tegra => mach-tegra/include/mach}/powergate.h | 10 ++++++++-- arch/arm/mach-tegra/powergate.c | 4 ++-- arch/arm/mach-tegra/tegra124/psci.c | 2 +- drivers/pci/pci_tegra.c | 2 +- 9 files changed, 12 insertions(+), 42 deletions(-) delete mode 100644 arch/arm/include/asm/arch-tegra114/powergate.h delete mode 100644 arch/arm/include/asm/arch-tegra124/powergate.h delete mode 100644 arch/arm/include/asm/arch-tegra20/powergate.h delete mode 100644 arch/arm/include/asm/arch-tegra210/powergate.h delete mode 100644 arch/arm/include/asm/arch-tegra30/powergate.h rename arch/arm/{include/asm/arch-tegra => mach-tegra/include/mach}/powergate.h (83%)
diff --git a/arch/arm/include/asm/arch-tegra114/powergate.h b/arch/arm/include/asm/arch-tegra114/powergate.h deleted file mode 100644 index 260ea801b81b..000000000000 --- a/arch/arm/include/asm/arch-tegra114/powergate.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _TEGRA114_POWERGATE_H_ -#define _TEGRA114_POWERGATE_H_ - -#include <asm/arch-tegra/powergate.h> - -#endif /* _TEGRA114_POWERGATE_H_ */ diff --git a/arch/arm/include/asm/arch-tegra124/powergate.h b/arch/arm/include/asm/arch-tegra124/powergate.h deleted file mode 100644 index 8a0cfbaf9665..000000000000 --- a/arch/arm/include/asm/arch-tegra124/powergate.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _TEGRA124_POWERGATE_H_ -#define _TEGRA124_POWERGATE_H_ - -#include <asm/arch-tegra/powergate.h> - -#endif /* _TEGRA124_POWERGATE_H_ */ diff --git a/arch/arm/include/asm/arch-tegra20/powergate.h b/arch/arm/include/asm/arch-tegra20/powergate.h deleted file mode 100644 index 439d88b7022a..000000000000 --- a/arch/arm/include/asm/arch-tegra20/powergate.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _TEGRA20_POWERGATE_H_ -#define _TEGRA20_POWERGATE_H_ - -#include <asm/arch-tegra/powergate.h> - -#endif /* _TEGRA20_POWERGATE_H_ */ diff --git a/arch/arm/include/asm/arch-tegra210/powergate.h b/arch/arm/include/asm/arch-tegra210/powergate.h deleted file mode 100644 index df6f91dece64..000000000000 --- a/arch/arm/include/asm/arch-tegra210/powergate.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) 2014-2015 NVIDIA CORPORATION. All rights reserved. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _TEGRA210_POWERGATE_H_ -#define _TEGRA210_POWERGATE_H_ - -#include <asm/arch-tegra/powergate.h> - -#endif /* _TEGRA210_POWERGATE_H_ */ diff --git a/arch/arm/include/asm/arch-tegra30/powergate.h b/arch/arm/include/asm/arch-tegra30/powergate.h deleted file mode 100644 index c70e44b6216d..000000000000 --- a/arch/arm/include/asm/arch-tegra30/powergate.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _TEGRA30_POWERGATE_H_ -#define _TEGRA30_POWERGATE_H_ - -#include <asm/arch-tegra/powergate.h> - -#endif /* _TEGRA30_POWERGATE_H_ */ diff --git a/arch/arm/include/asm/arch-tegra/powergate.h b/arch/arm/mach-tegra/include/mach/powergate.h similarity index 83% rename from arch/arm/include/asm/arch-tegra/powergate.h rename to arch/arm/mach-tegra/include/mach/powergate.h index 2e491f19005a..3ac9c9b092b1 100644 --- a/arch/arm/include/asm/arch-tegra/powergate.h +++ b/arch/arm/mach-tegra/include/mach/powergate.h @@ -1,5 +1,11 @@ -#ifndef _TEGRA_POWERGATE_H_ -#define _TEGRA_POWERGATE_H_ +/* + * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#ifndef _MACH_POWERGATE_H +#define _MACH_POWERGATE_H
#include <asm/arch/clock.h>
diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c index 30ae036bff05..49723e88cc56 100644 --- a/arch/arm/mach-tegra/powergate.c +++ b/arch/arm/mach-tegra/powergate.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0 */ @@ -10,8 +10,8 @@ #include <asm/io.h> #include <asm/types.h> #include <asm/arch/flow.h> -#include <asm/arch/powergate.h> #include <asm/arch/tegra.h> +#include <mach/powergate.h>
#define PWRGATE_TOGGLE 0x30 #define PWRGATE_TOGGLE_START (1 << 8) diff --git a/arch/arm/mach-tegra/tegra124/psci.c b/arch/arm/mach-tegra/tegra124/psci.c index 739cf352676e..b6d99c7740c7 100644 --- a/arch/arm/mach-tegra/tegra124/psci.c +++ b/arch/arm/mach-tegra/tegra124/psci.c @@ -10,7 +10,7 @@ #include <asm/io.h> #include <asm/psci.h> #include <asm/arch/flow.h> -#include <asm/arch/powergate.h> +#include <mach/powergate.h> #include "../cpu.h" #include "../pmc.h"
diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c index 5e0f9c50aef3..392ebde1e05c 100644 --- a/drivers/pci/pci_tegra.c +++ b/drivers/pci/pci_tegra.c @@ -23,8 +23,8 @@ #include <asm/gpio.h>
#include <asm/arch/clock.h> -#include <asm/arch/powergate.h>
+#include <mach/powergate.h> #include <mach/xusb-padctl.h>
#include <linux/list.h>