[U-Boot] [PATCH 18/60] ARM: tegra: move fuse.h

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

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/{include/asm/arch-tegra => mach-tegra}/fuse.h | 8 ++++----
arch/arm/mach-tegra/tegra20/warmboot.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
rename arch/arm/{include/asm/arch-tegra => mach-tegra}/fuse.h (83%)

diff --git a/arch/arm/mach-tegra/ap.c b/arch/arm/mach-tegra/ap.c
index 336a7e08196d..d226d546a1e5 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/fuse.h>
#include <asm/arch-tegra/pmc.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"

int tegra_get_chip(void)
{
diff --git a/arch/arm/include/asm/arch-tegra/fuse.h b/arch/arm/mach-tegra/fuse.h
similarity index 83%
rename from arch/arm/include/asm/arch-tegra/fuse.h
rename to arch/arm/mach-tegra/fuse.h
index 39b578c00d2c..448cf0869cde 100644
--- a/arch/arm/include/asm/arch-tegra/fuse.h
+++ b/arch/arm/mach-tegra/fuse.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 _FUSE_H_
-#define _FUSE_H_
+#ifndef _TEGRA_FUSE_H
+#define _TEGRA_FUSE_H

/* FUSE registers */
struct fuse_regs {
@@ -20,4 +20,4 @@ struct fuse_regs {
u32 security_mode; /* 0x1A0: FUSE_SECURITY_MODE */
};

-#endif /* ifndef _FUSE_H_ */
+#endif
diff --git a/arch/arm/mach-tegra/tegra20/warmboot.c b/arch/arm/mach-tegra/tegra20/warmboot.c
index 427af25032bc..ba996d1801da 100644
--- a/arch/arm/mach-tegra/tegra20/warmboot.c
+++ b/arch/arm/mach-tegra/tegra20/warmboot.c
@@ -16,9 +16,9 @@
#include <asm/arch/tegra.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 "../fuse.h"
#include "crypto.h"

DECLARE_GLOBAL_DATA_PTR;
--
2.8.1