[U-Boot] [PATCH 17/60] ARM: tegra: move apb_misc.h

Stephen Warren
2016-04-19T20:58:57Z

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/{include/asm/arch-tegra => mach-tegra}/apb_misc.h | 5 +++--
arch/arm/mach-tegra/spl.c | 4 ++--
arch/arm/mach-tegra/tegra20/emc.c | 2 +-
arch/arm/mach-tegra/tegra20/warmboot.c | 2 +-
arch/arm/mach-tegra/tegra20/warmboot_avp.c | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)
rename arch/arm/{include/asm/arch-tegra => mach-tegra}/apb_misc.h (79%)

diff --git a/arch/arm/include/asm/arch-tegra/apb_misc.h b/arch/arm/mach-tegra/apb_misc.h
similarity index 79%
rename from arch/arm/include/asm/arch-tegra/apb_misc.h
rename to arch/arm/mach-tegra/apb_misc.h
index a5bc092ffdc1..8622826172e9 100644
--- a/arch/arm/include/asm/arch-tegra/apb_misc.h
+++ b/arch/arm/mach-tegra/apb_misc.h
@@ -1,11 +1,12 @@
/*
* Copyright (c) 2012 The Chromium OS Authors.
+ * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
*
* SPDX-License-Identifier: GPL-2.0+
*/

-#ifndef _GP_PADCTRL_H_
-#define _GP_PADCTRL_H_
+#ifndef _TEGRA_APB_MISC_H
+#define _TEGRA_APB_MISC_H

/* APB_MISC_PP registers */
struct apb_misc_pp_ctlr {
diff --git a/arch/arm/mach-tegra/spl.c b/arch/arm/mach-tegra/spl.c
index e0f9d5b6b4e9..ad13ad5ba5fb 100644
--- a/arch/arm/mach-tegra/spl.c
+++ b/arch/arm/mach-tegra/spl.c
@@ -1,5 +1,5 @@
/*
- * (C) Copyright 2012
+ * (C) Copyright 2012-2016
* NVIDIA Inc, <www.nvidia.com>
*
* Allen Martin <amartin@nvidia.com>
@@ -13,9 +13,9 @@
#include <asm/arch/clock.h>
#include <asm/arch/pinmux.h>
#include <asm/arch/tegra.h>
-#include <asm/arch-tegra/apb_misc.h>
#include <asm/arch-tegra/board.h>
#include <asm/spl.h>
+#include "apb_misc.h"
#include "cpu.h"

void spl_board_init(void)
diff --git a/arch/arm/mach-tegra/tegra20/emc.c b/arch/arm/mach-tegra/tegra20/emc.c
index eab61b7cd2ab..ace5fb5aa758 100644
--- a/arch/arm/mach-tegra/tegra20/emc.c
+++ b/arch/arm/mach-tegra/tegra20/emc.c
@@ -8,10 +8,10 @@
#include <common.h>
#include <fdtdec.h>
#include <asm/io.h>
-#include <asm/arch-tegra/apb_misc.h>
#include <asm/arch/clock.h>
#include <asm/arch/emc.h>
#include <asm/arch/tegra.h>
+#include "../apb_misc.h"

/*
* The EMC registers have shadow registers. When the EMC clock is updated
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index 1013441d4265..427af25032bc 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -14,11 +14,11 @@
#include <asm/arch/pinmux.h>
#include <asm/arch/sdram_param.h>
#include <asm/arch/tegra.h>
-#include <asm/arch-tegra/apb_misc.h>
#include <asm/arch-tegra/clk_rst.h>
#include <asm/arch-tegra/pmc.h>
#include <asm/arch-tegra/fuse.h>
#include <asm/arch-tegra/warmboot.h>
+#include "../apb_misc.h"
#include "crypto.h"

DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-tegra/tegra20/warmboot_avp.c b/arch/arm/mach-tegra/tegra20/warmboot_avp.c
index 616358b657be..0ae401c569b6 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot_avp.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot_avp.c
@@ -11,10 +11,10 @@
#include <asm/arch/flow.h>
#include <asm/arch/pinmux.h>
#include <asm/arch/tegra.h>
-#include <asm/arch-tegra/apb_misc.h>
#include <asm/arch-tegra/clk_rst.h>
#include <asm/arch-tegra/pmc.h>
#include <asm/arch-tegra/warmboot.h>
+#include "../apb_misc.h"
#include "../cpu.h"
#include "warmboot_avp.h"

--
2.8.1