From: Stephen Warren swarren@nvidia.com
Machine-specific headers should be in this location. Eventually, we'll move all headers from arch/arm/include to arch/arm/mach-tegra/include, or find a way to delete them.
Signed-off-by: Stephen Warren swarren@nvidia.com --- arch/arm/mach-tegra/board2.c | 2 +- .../asm/arch-tegra => mach-tegra/include/mach}/xusb-padctl.h | 4 ++-- arch/arm/mach-tegra/xusb-padctl-common.h | 9 ++++----- arch/arm/mach-tegra/xusb-padctl-dummy.c | 4 ++-- drivers/pci/pci_tegra.c | 5 +++-- 5 files changed, 12 insertions(+), 12 deletions(-) rename arch/arm/{include/asm/arch-tegra => mach-tegra/include/mach}/xusb-padctl.h (92%)
diff --git a/arch/arm/mach-tegra/board2.c b/arch/arm/mach-tegra/board2.c index b1db5febd199..9d970c483e0e 100644 --- a/arch/arm/mach-tegra/board2.c +++ b/arch/arm/mach-tegra/board2.c @@ -30,7 +30,7 @@ #ifdef CONFIG_TEGRA_MMC #include <mach/tegra_mmc.h> #endif -#include <asm/arch-tegra/xusb-padctl.h> +#include <mach/xusb-padctl.h> #include <power/as3722.h> #include <i2c.h> #include <spi.h> diff --git a/arch/arm/include/asm/arch-tegra/xusb-padctl.h b/arch/arm/mach-tegra/include/mach/xusb-padctl.h similarity index 92% rename from arch/arm/include/asm/arch-tegra/xusb-padctl.h rename to arch/arm/mach-tegra/include/mach/xusb-padctl.h index b4b4c8ba4d10..ab277123be51 100644 --- a/arch/arm/include/asm/arch-tegra/xusb-padctl.h +++ b/arch/arm/mach-tegra/include/mach/xusb-padctl.h @@ -1,5 +1,5 @@ -#ifndef _TEGRA_XUSB_PADCTL_H_ -#define _TEGRA_XUSB_PADCTL_H_ +#ifndef _MACH_XUSB_PADCTL_H +#define _MACH_XUSB_PADCTL_H
struct tegra_xusb_phy;
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.h b/arch/arm/mach-tegra/xusb-padctl-common.h index f44790a65004..b63b2faaa1c6 100644 --- a/arch/arm/mach-tegra/xusb-padctl-common.h +++ b/arch/arm/mach-tegra/xusb-padctl-common.h @@ -1,17 +1,16 @@ /* - * Copyright (c) 2014-2015, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0 */
-#ifndef _TEGRA_XUSB_PADCTL_COMMON_H_ -#define _TEGRA_XUSB_PADCTL_COMMON_H_ +#ifndef _TEGRA_XUSB_PADCTL_COMMON_H +#define _TEGRA_XUSB_PADCTL_COMMON_H
#include <common.h> #include <fdtdec.h> - #include <asm/io.h> -#include <asm/arch-tegra/xusb-padctl.h> +#include <mach/xusb-padctl.h>
struct tegra_xusb_padctl_lane { const char *name; diff --git a/arch/arm/mach-tegra/xusb-padctl-dummy.c b/arch/arm/mach-tegra/xusb-padctl-dummy.c index 65f8d2ea967a..779ee97d1482 100644 --- a/arch/arm/mach-tegra/xusb-padctl-dummy.c +++ b/arch/arm/mach-tegra/xusb-padctl-dummy.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0 */ @@ -7,7 +7,7 @@ #include <common.h> #include <errno.h>
-#include <asm/arch-tegra/xusb-padctl.h> +#include <mach/xusb-padctl.h>
struct tegra_xusb_phy * __weak tegra_xusb_phy_get(unsigned int type) { diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c index 5dadf6fa62a7..5e0f9c50aef3 100644 --- a/drivers/pci/pci_tegra.c +++ b/drivers/pci/pci_tegra.c @@ -5,7 +5,7 @@ * Based on NVIDIA PCIe driver * Copyright (c) 2008-2009, NVIDIA Corporation. * - * Copyright (c) 2013-2014, NVIDIA Corporation. + * Copyright (c) 2013-2016, NVIDIA Corporation. * * SPDX-License-Identifier: GPL-2.0 */ @@ -24,7 +24,8 @@
#include <asm/arch/clock.h> #include <asm/arch/powergate.h> -#include <asm/arch-tegra/xusb-padctl.h> + +#include <mach/xusb-padctl.h>
#include <linux/list.h>