diff options
| -rw-r--r-- | arch/arm/mach-tegra/fuse.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/pmc.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/powergate.c | 3 | ||||
| -rw-r--r-- | drivers/amba/tegra-ahb.c | 3 | ||||
| -rw-r--r-- | drivers/clk/tegra/clk-periph-gate.c | 3 | ||||
| -rw-r--r-- | drivers/clk/tegra/clk-tegra30.c | 5 | ||||
| -rw-r--r-- | drivers/clk/tegra/clk.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/tegra/gr3d.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/tegra/sor.c | 3 | ||||
| -rw-r--r-- | drivers/iommu/tegra-smmu.c | 3 | ||||
| -rw-r--r-- | drivers/pci/host/pci-tegra.c | 5 | ||||
| -rw-r--r-- | include/soc/tegra/ahb.h (renamed from include/linux/tegra-ahb.h) | 6 | ||||
| -rw-r--r-- | include/soc/tegra/cpuidle.h (renamed from include/linux/tegra-cpuidle.h) | 6 | ||||
| -rw-r--r-- | include/soc/tegra/fuse.h (renamed from include/linux/tegra-soc.h) | 6 | ||||
| -rw-r--r-- | include/soc/tegra/powergate.h (renamed from include/linux/tegra-powergate.h) | 6 |
15 files changed, 37 insertions, 24 deletions
diff --git a/arch/arm/mach-tegra/fuse.c b/arch/arm/mach-tegra/fuse.c index c9ac23b385be..930fef861227 100644 --- a/arch/arm/mach-tegra/fuse.c +++ b/arch/arm/mach-tegra/fuse.c @@ -23,7 +23,8 @@ #include <linux/export.h> #include <linux/random.h> #include <linux/clk.h> -#include <linux/tegra-soc.h> + +#include <soc/tegra/fuse.h> #include "fuse.h" #include "iomap.h" diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c index 7c7123e7557b..0f457801eaca 100644 --- a/arch/arm/mach-tegra/pmc.c +++ b/arch/arm/mach-tegra/pmc.c @@ -20,7 +20,8 @@ #include <linux/io.h> #include <linux/of.h> #include <linux/of_address.h> -#include <linux/tegra-powergate.h> + +#include <soc/tegra/powergate.h> #include "flowctrl.h" #include "fuse.h" diff --git a/arch/arm/mach-tegra/powergate.c b/arch/arm/mach-tegra/powergate.c index 4cefc5cd6bed..7b148bc6c995 100644 --- a/arch/arm/mach-tegra/powergate.c +++ b/arch/arm/mach-tegra/powergate.c @@ -29,7 +29,8 @@ #include <linux/seq_file.h> #include <linux/spinlock.h> #include <linux/clk/tegra.h> -#include <linux/tegra-powergate.h> + +#include <soc/tegra/powergate.h> #include "fuse.h" #include "iomap.h" diff --git a/drivers/amba/tegra-ahb.c b/drivers/amba/tegra-ahb.c index 558a239954e8..d8961ef4d2e7 100644 --- a/drivers/amba/tegra-ahb.c +++ b/drivers/amba/tegra-ahb.c @@ -25,7 +25,8 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/io.h> -#include <linux/tegra-ahb.h> + +#include <soc/tegra/ahb.h> #define DRV_NAME "tegra-ahb" diff --git a/drivers/clk/tegra/clk-periph-gate.c b/drivers/clk/tegra/clk-periph-gate.c index 507015314827..0aa8830ae7cc 100644 --- a/drivers/clk/tegra/clk-periph-gate.c +++ b/drivers/clk/tegra/clk-periph-gate.c @@ -20,7 +20,8 @@ #include <linux/io.h> #include <linux/delay.h> #include <linux/err.h> -#include <linux/tegra-soc.h> + +#include <soc/tegra/fuse.h> #include "clk.h" diff --git a/drivers/clk/tegra/clk-tegra30.c b/drivers/clk/tegra/clk-tegra30.c index 8b10c38b6e3c..5679ffdb3f8c 100644 --- a/drivers/clk/tegra/clk-tegra30.c +++ b/drivers/clk/tegra/clk-tegra30.c @@ -22,8 +22,11 @@ #include <linux/of.h> #include <linux/of_address.h> #include <linux/clk/tegra.h> -#include <linux/tegra-powergate.h> + +#include <soc/tegra/powergate.h> + #include <dt-bindings/clock/tegra30-car.h> + #include "clk.h" #include "clk-id.h" diff --git a/drivers/clk/tegra/clk.c b/drivers/clk/tegra/clk.c index c0a7d7723510..f4503ba97400 100644 --- a/drivers/clk/tegra/clk.c +++ b/drivers/clk/tegra/clk.c @@ -19,7 +19,8 @@ #include <linux/of.h> #include <linux/clk/tegra.h> #include <linux/reset-controller.h> -#include <linux/tegra-soc.h> + +#include <soc/tegra/fuse.h> #include "clk.h" diff --git a/drivers/gpu/drm/tegra/gr3d.c b/drivers/gpu/drm/tegra/gr3d.c index 30f5ba9bd6d0..69974851e564 100644 --- a/drivers/gpu/drm/tegra/gr3d.c +++ b/drivers/gpu/drm/tegra/gr3d.c @@ -12,7 +12,8 @@ #include <linux/module.h> #include <linux/platform_device.h> #include <linux/reset.h> -#include <linux/tegra-powergate.h> + +#include <soc/tegra/powergate.h> #include "drm.h" #include "gem.h" diff --git a/drivers/gpu/drm/tegra/sor.c b/drivers/gpu/drm/tegra/sor.c index 27c979b50111..eafd0b8a71d2 100644 --- a/drivers/gpu/drm/tegra/sor.c +++ b/drivers/gpu/drm/tegra/sor.c @@ -11,7 +11,8 @@ #include <linux/io.h> #include <linux/platform_device.h> #include <linux/reset.h> -#include <linux/tegra-powergate.h> + +#include <soc/tegra/powergate.h> #include <drm/drm_dp_helper.h> diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index 605b5b46a903..230d06c9328b 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -35,7 +35,8 @@ #include <linux/of_iommu.h> #include <linux/debugfs.h> #include <linux/seq_file.h> -#include <linux/tegra-ahb.h> + +#include <soc/tegra/ahb.h> #include <asm/page.h> #include <asm/cacheflush.h> diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index 083cf37ca047..a2f0f88be382 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -41,11 +41,12 @@ #include <linux/reset.h> #include <linux/sizes.h> #include <linux/slab.h> -#include <linux/tegra-cpuidle.h> -#include <linux/tegra-powergate.h> #include <linux/vmalloc.h> #include <linux/regulator/consumer.h> +#include <soc/tegra/cpuidle.h> +#include <soc/tegra/powergate.h> + #include <asm/mach/irq.h> #include <asm/mach/map.h> #include <asm/mach/pci.h> diff --git a/include/linux/tegra-ahb.h b/include/soc/tegra/ahb.h index f1cd075ceee1..504eb6f957e5 100644 --- a/include/linux/tegra-ahb.h +++ b/include/soc/tegra/ahb.h @@ -11,9 +11,9 @@ * more details. */ -#ifndef __LINUX_AHB_H__ -#define __LINUX_AHB_H__ +#ifndef __SOC_TEGRA_AHB_H__ +#define __SOC_TEGRA_AHB_H__ extern int tegra_ahb_enable_smmu(struct device_node *ahb); -#endif /* __LINUX_AHB_H__ */ +#endif /* __SOC_TEGRA_AHB_H__ */ diff --git a/include/linux/tegra-cpuidle.h b/include/soc/tegra/cpuidle.h index 9c6286bbf662..ea04f4225638 100644 --- a/include/linux/tegra-cpuidle.h +++ b/include/soc/tegra/cpuidle.h @@ -11,8 +11,8 @@ * more details. */ -#ifndef __LINUX_TEGRA_CPUIDLE_H__ -#define __LINUX_TEGRA_CPUIDLE_H__ +#ifndef __SOC_TEGRA_CPUIDLE_H__ +#define __SOC_TEGRA_CPUIDLE_H__ #ifdef CONFIG_CPU_IDLE void tegra_cpuidle_pcie_irqs_in_use(void); @@ -22,4 +22,4 @@ static inline void tegra_cpuidle_pcie_irqs_in_use(void) } #endif -#endif +#endif /* __SOC_TEGRA_CPUIDLE_H__ */ diff --git a/include/linux/tegra-soc.h b/include/soc/tegra/fuse.h index 95f611d78f3a..85f555c89ad5 100644 --- a/include/linux/tegra-soc.h +++ b/include/soc/tegra/fuse.h @@ -14,9 +14,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef __LINUX_TEGRA_SOC_H_ -#define __LINUX_TEGRA_SOC_H_ +#ifndef __SOC_TEGRA_FUSE_H__ +#define __SOC_TEGRA_FUSE_H__ u32 tegra_read_chipid(void); -#endif /* __LINUX_TEGRA_SOC_H_ */ +#endif /* __SOC_TEGRA_FUSE_H__ */ diff --git a/include/linux/tegra-powergate.h b/include/soc/tegra/powergate.h index 46f0a07812b4..c16912ed1a8d 100644 --- a/include/linux/tegra-powergate.h +++ b/include/soc/tegra/powergate.h @@ -15,8 +15,8 @@ * */ -#ifndef _MACH_TEGRA_POWERGATE_H_ -#define _MACH_TEGRA_POWERGATE_H_ +#ifndef __SOC_TEGRA_POWERGATE_H__ +#define __SOC_TEGRA_POWERGATE_H__ struct clk; struct reset_control; @@ -131,4 +131,4 @@ static inline int tegra_io_rail_power_off(int id) } #endif -#endif /* _MACH_TEGRA_POWERGATE_H_ */ +#endif /* __SOC_TEGRA_POWERGATE_H__ */ |