[U-Boot] [PATCH 36/60] ARM: tegra: move mc.h

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

From: Stephen Warren <swarren@nvidia.com>

This header is only needed by code local to mach-tegra, so move it there.
Since the definitions are used by code in mach-tegra/ itself, not just in
SoC-specific mach-tegra/tegraNNN/, and the content varies per SoC, we need
to put it in the (somewhat isolated) <soc/> include directory rather than
in mach-tegra/ directly.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
arch/arm/mach-tegra/ap.c | 2 +-
arch/arm/mach-tegra/board.c | 2 +-
arch/arm/mach-tegra/gpu.c | 2 +-
.../{include/asm/arch-tegra114 => mach-tegra/tegra114/include/soc}/mc.h | 2 +-
.../{include/asm/arch-tegra124 => mach-tegra/tegra124/include/soc}/mc.h | 0
.../{include/asm/arch-tegra20 => mach-tegra/tegra20/include/soc}/mc.h | 2 +-
.../{include/asm/arch-tegra210 => mach-tegra/tegra210/include/soc}/mc.h | 0
.../{include/asm/arch-tegra30 => mach-tegra/tegra30/include/soc}/mc.h | 2 +-
8 files changed, 6 insertions(+), 6 deletions(-)
rename arch/arm/{include/asm/arch-tegra114 => mach-tegra/tegra114/include/soc}/mc.h (97%)
rename arch/arm/{include/asm/arch-tegra124 => mach-tegra/tegra124/include/soc}/mc.h (100%)
rename arch/arm/{include/asm/arch-tegra20 => mach-tegra/tegra20/include/soc}/mc.h (97%)
rename arch/arm/{include/asm/arch-tegra210 => mach-tegra/tegra210/include/soc}/mc.h (100%)
rename arch/arm/{include/asm/arch-tegra30 => mach-tegra/tegra30/include/soc}/mc.h (97%)

diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
index 4cb6367cd0a4..a200010e2937 100644
--- a/arch/arm/mach-tegra/ap.c
+++ b/arch/arm/mach-tegra/ap.c
@@ -11,9 +11,9 @@
#include <linux/bug.h>
#include <asm/io.h>
#include <asm/arch/gp_padctrl.h>
-#include <asm/arch/mc.h>
#include <asm/arch-tegra/clock.h>
#include <asm/arch-tegra/tegra.h>
+#include <soc/mc.h>
#include "cpu.h"
#include "fuse.h"
#include "pmc.h"
diff --git a/arch/arm/mach-tegra/board.c b/arch/arm/mach-tegra/board.c
index 87a9b5266804..71eb1a5d1b63 100644
--- a/arch/arm/mach-tegra/board.c
+++ b/arch/arm/mach-tegra/board.c
@@ -12,9 +12,9 @@
#include <asm/io.h>
#include <asm/arch/clock.h>
#include <asm/arch/funcmux.h>
-#include <asm/arch/mc.h>
#include <asm/arch/tegra.h>
#include <mach/board.h>
+#include <soc/mc.h>
#include "pmc.h"

void save_boot_params_ret(void);
diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c
index 172514204b1d..36204f54e4c9 100644
--- a/arch/arm/mach-tegra/gpu.c
+++ b/arch/arm/mach-tegra/gpu.c
@@ -10,7 +10,7 @@
#include <fdt_support.h>
#include <asm/io.h>
#include <asm/arch/tegra.h>
-#include <asm/arch/mc.h>
+#include <soc/mc.h>
#include "gpu.h"

static bool _configured;
diff --git a/arch/arm/include/asm/arch-tegra114/mc.h b/arch/arm/mach-tegra/tegra114/include/soc/mc.h
similarity index 97%
rename from arch/arm/include/asm/arch-tegra114/mc.h
rename to arch/arm/mach-tegra/tegra114/include/soc/mc.h
index 044b1e0b3990..6690f0435a95 100644
--- a/arch/arm/include/asm/arch-tegra114/mc.h
+++ b/arch/arm/mach-tegra/tegra114/include/soc/mc.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2014
+ * (C) Copyright 2014-2016
* NVIDIA Corporation <www.nvidia.com>
*
* SPDX-License-Identifier: GPL-2.0+
diff --git a/arch/arm/include/asm/arch-tegra124/mc.h b/arch/arm/mach-tegra/tegra124/include/soc/mc.h
similarity index 100%
rename from arch/arm/include/asm/arch-tegra124/mc.h
rename to arch/arm/mach-tegra/tegra124/include/soc/mc.h
diff --git a/arch/arm/include/asm/arch-tegra20/mc.h b/arch/arm/mach-tegra/tegra20/include/soc/mc.h
similarity index 97%
rename from arch/arm/include/asm/arch-tegra20/mc.h
rename to arch/arm/mach-tegra/tegra20/include/soc/mc.h
index 9c6e3ffb6f44..d85ceb6b20d7 100644
--- a/arch/arm/include/asm/arch-tegra20/mc.h
+++ b/arch/arm/mach-tegra/tegra20/include/soc/mc.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2014
+ * (C) Copyright 2014-2016
* NVIDIA Corporation <www.nvidia.com>
*
* SPDX-License-Identifier: GPL-2.0+
diff --git a/arch/arm/include/asm/arch-tegra210/mc.h b/arch/arm/mach-tegra/tegra210/include/soc/mc.h
similarity index 100%
rename from arch/arm/include/asm/arch-tegra210/mc.h
rename to arch/arm/mach-tegra/tegra210/include/soc/mc.h
diff --git a/arch/arm/include/asm/arch-tegra30/mc.h b/arch/arm/mach-tegra/tegra30/include/soc/mc.h
similarity index 97%
rename from arch/arm/include/asm/arch-tegra30/mc.h
rename to arch/arm/mach-tegra/tegra30/include/soc/mc.h
index 242a1fc64b9b..99ea0f22125d 100644
--- a/arch/arm/include/asm/arch-tegra30/mc.h
+++ b/arch/arm/mach-tegra/tegra30/include/soc/mc.h
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2014
+ * (C) Copyright 2014-2016
* NVIDIA Corporation <www.nvidia.com>
*
* SPDX-License-Identifier: GPL-2.0+
--
2.8.1