[U-Boot] [PATCH 21/60] ARM: tegra: move scu.h

Stephen Warren
2016-04-19T20:59:01Z

From: Stephen Warren <swarren@nvidia.com>

This header is only needed by code local to mach-tegra, so move it there
to avoid polluting the global include path.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
arch/arm/mach-tegra/ap.c | 2 +-
arch/arm/mach-tegra/cpu.c | 2 +-
arch/arm/{include/asm/arch-tegra => mach-tegra}/scu.h | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
rename arch/arm/{include/asm/arch-tegra => mach-tegra}/scu.h (91%)

diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
index 94cc124979c6..386ca72707e8 100644
--- a/arch/arm/mach-tegra/ap.c
+++ b/arch/arm/mach-tegra/ap.c
@@ -13,12 +13,12 @@
#include <asm/arch/gp_padctrl.h>
#include <asm/arch/mc.h>
#include <asm/arch-tegra/clock.h>
-#include <asm/arch-tegra/scu.h>
#include <asm/arch-tegra/tegra.h>
#include <asm/arch-tegra/warmboot.h>
#include "cpu.h"
#include "fuse.h"
#include "pmc.h"
+#include "scu.h"

int tegra_get_chip(void)
{
diff --git a/arch/arm/mach-tegra/cpu.c b/arch/arm/mach-tegra/cpu.c
index 09d15974dd9b..3562a2d2188a 100644
--- a/arch/arm/mach-tegra/cpu.c
+++ b/arch/arm/mach-tegra/cpu.c
@@ -11,9 +11,9 @@
#include <asm/arch/pinmux.h>
#include <asm/arch/tegra.h>
#include <asm/arch-tegra/clk_rst.h>
-#include <asm/arch-tegra/scu.h>
#include "cpu.h"
#include "pmc.h"
+#include "scu.h"

int get_num_cpus(void)
{
diff --git a/arch/arm/include/asm/arch-tegra/scu.h b/arch/arm/mach-tegra/scu.h
similarity index 91%
rename from arch/arm/include/asm/arch-tegra/scu.h
rename to arch/arm/mach-tegra/scu.h
index 987c16ff45f9..b13c2d9d2061 100644
--- a/arch/arm/include/asm/arch-tegra/scu.h
+++ b/arch/arm/mach-tegra/scu.h
@@ -1,12 +1,12 @@
/*
- * (C) Copyright 2010,2011
+ * (C) Copyright 2010-2016
* NVIDIA Corporation <www.nvidia.com>
*
* SPDX-License-Identifier: GPL-2.0+
*/

-#ifndef _SCU_H_
-#define _SCU_H_
+#ifndef _TEGRA_SCU_H
+#define _TEGRA_SCU_H

/* ARM Snoop Control Unit (SCU) registers */
struct scu_ctlr {
@@ -24,4 +24,4 @@ struct scu_ctlr {

#define SCU_CTRL_ENABLE (1 << 0)

-#endif /* SCU_H */
+#endif
--
2.8.1