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/board2.c | 2 +- arch/arm/mach-tegra/gpu.c | 6 +++--- arch/arm/{include/asm/arch-tegra => mach-tegra}/gpu.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) rename arch/arm/{include/asm/arch-tegra => mach-tegra}/gpu.h (80%)
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index 3ee65ee3f921..35ae69fbbe29 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -22,7 +22,6 @@ #include <asm/arch-tegra/pmc.h> #include <asm/arch-tegra/sys_proto.h> #include <asm/arch-tegra/warmboot.h> -#include <asm/arch-tegra/gpu.h> #ifdef CONFIG_TEGRA_CLOCK_SCALING #include <asm/arch/emc.h> #endif @@ -38,6 +37,7 @@ #include <i2c.h> #include <spi.h> #include "emc.h" +#include "gpu.h"
DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/mach-tegra/gpu.c b/arch/arm/mach-tegra/gpu.c index 74b64a620c5f..0da681bfe927 100644 --- a/arch/arm/mach-tegra/gpu.c +++ b/arch/arm/mach-tegra/gpu.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0 */ @@ -7,11 +7,11 @@ /* Tegra vpr routines */
#include <common.h> +#include <fdt_support.h> #include <asm/io.h> #include <asm/arch/tegra.h> #include <asm/arch/mc.h> - -#include <fdt_support.h> +#include "gpu.h"
static bool _configured;
diff --git a/arch/arm/include/asm/arch-tegra/gpu.h b/arch/arm/mach-tegra/gpu.h similarity index 80% rename from arch/arm/include/asm/arch-tegra/gpu.h rename to arch/arm/mach-tegra/gpu.h index 6be9f6157b36..12f0c6a2bf3e 100644 --- a/arch/arm/include/asm/arch-tegra/gpu.h +++ b/arch/arm/mach-tegra/gpu.h @@ -1,12 +1,12 @@ /* - * (C) Copyright 2015 + * (C) Copyright 2015-2016 * NVIDIA Corporation <www.nvidia.com> * * SPDX-License-Identifier: GPL-2.0+ */
-#ifndef __ASM_ARCH_TEGRA_GPU_H -#define __ASM_ARCH_TEGRA_GPU_H +#ifndef _TEGRA_GPU_H +#define _TEGRA_GPU_H
#if defined(CONFIG_TEGRA_GPU)
@@ -33,4 +33,4 @@ static inline int tegra_gpu_enable_node(void *blob, const char *compat)
#endif /* CONFIG_OF_LIBFDT */
-#endif /* __ASM_ARCH_TEGRA_GPU_H */ +#endif