Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: EXYNOS: Move pmu specific headers under "linux/soc/samsung"

Moving Exynos PMU specific header file into "include/linux/soc/samsung"
thus updated affected files under "mach-exynos" to use new location of
these header files.

Signed-off-by: Amit Daniel Kachhap <amitdanielk@gmail.com>
[tested on Peach-Pi (Exynos5880)]
Signed-off-by: Pankaj Dubey <pankaj.dubey@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
[for testing on Trats2 (Exynos4412) and Odroid XU3 (Exynos5422)]
Tested-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>

authored by

Pankaj Dubey and committed by
Krzysztof Kozlowski
2262d6ef 18fd9c63

+16 -16
+3 -3
arch/arm/mach-exynos/exynos-pmu.h include/linux/soc/samsung/exynos-pmu.h
··· 9 9 * published by the Free Software Foundation. 10 10 */ 11 11 12 - #ifndef __EXYNOS_PMU_H 13 - #define __EXYNOS_PMU_H 12 + #ifndef __LINUX_SOC_EXYNOS_PMU_H 13 + #define __LINUX_SOC_EXYNOS_PMU_H 14 14 15 15 enum sys_powerdown { 16 16 SYS_AFTR, ··· 21 21 22 22 extern void exynos_sys_powerdown_conf(enum sys_powerdown mode); 23 23 24 - #endif /* __EXYNOS_PMU_H */ 24 + #endif /* __LINUX_SOC_EXYNOS_PMU_H */
+1 -1
arch/arm/mach-exynos/exynos.c
··· 20 20 #include <linux/platform_device.h> 21 21 #include <linux/pm_domain.h> 22 22 #include <linux/irqchip.h> 23 + #include <linux/soc/samsung/exynos-regs-pmu.h> 23 24 24 25 #include <asm/cacheflush.h> 25 26 #include <asm/hardware/cache-l2x0.h> ··· 32 31 33 32 #include "common.h" 34 33 #include "mfc.h" 35 - #include "regs-pmu.h" 36 34 37 35 void __iomem *pmu_base_addr; 38 36
+1 -1
arch/arm/mach-exynos/mcpm-exynos.c
··· 16 16 #include <linux/io.h> 17 17 #include <linux/of_address.h> 18 18 #include <linux/syscore_ops.h> 19 + #include <linux/soc/samsung/exynos-regs-pmu.h> 19 20 20 21 #include <asm/cputype.h> 21 22 #include <asm/cp15.h> 22 23 #include <asm/mcpm.h> 23 24 #include <asm/smp_plat.h> 24 25 25 - #include "regs-pmu.h" 26 26 #include "common.h" 27 27 28 28 #define EXYNOS5420_CPUS_PER_CLUSTER 4
+1 -1
arch/arm/mach-exynos/platsmp.c
··· 20 20 #include <linux/smp.h> 21 21 #include <linux/io.h> 22 22 #include <linux/of_address.h> 23 + #include <linux/soc/samsung/exynos-regs-pmu.h> 23 24 24 25 #include <asm/cacheflush.h> 25 26 #include <asm/cp15.h> ··· 31 30 #include <mach/map.h> 32 31 33 32 #include "common.h" 34 - #include "regs-pmu.h" 35 33 36 34 extern void exynos4_secondary_startup(void); 37 35
+2 -2
arch/arm/mach-exynos/pm.c
··· 18 18 #include <linux/cpu_pm.h> 19 19 #include <linux/io.h> 20 20 #include <linux/err.h> 21 + #include <linux/soc/samsung/exynos-regs-pmu.h> 22 + #include <linux/soc/samsung/exynos-pmu.h> 21 23 22 24 #include <asm/firmware.h> 23 25 #include <asm/smp_scu.h> ··· 31 29 #include <plat/pm-common.h> 32 30 33 31 #include "common.h" 34 - #include "exynos-pmu.h" 35 - #include "regs-pmu.h" 36 32 37 33 static inline void __iomem *exynos_boot_vector_addr(void) 38 34 {
+3 -3
arch/arm/mach-exynos/pmu.c
··· 15 15 #include <linux/platform_device.h> 16 16 #include <linux/delay.h> 17 17 18 - #include <asm/cputype.h> 18 + #include <linux/soc/samsung/exynos-regs-pmu.h> 19 + #include <linux/soc/samsung/exynos-pmu.h> 19 20 20 - #include "exynos-pmu.h" 21 - #include "regs-pmu.h" 21 + #include <asm/cputype.h> 22 22 23 23 #define PMU_TABLE_END (-1U) 24 24
+3 -3
arch/arm/mach-exynos/regs-pmu.h include/linux/soc/samsung/exynos-regs-pmu.h
··· 9 9 * published by the Free Software Foundation. 10 10 */ 11 11 12 - #ifndef __ASM_ARCH_REGS_PMU_H 13 - #define __ASM_ARCH_REGS_PMU_H __FILE__ 12 + #ifndef __LINUX_SOC_EXYNOS_REGS_PMU_H 13 + #define __LINUX_SOC_EXYNOS_REGS_PMU_H __FILE__ 14 14 15 15 #define S5P_CENTRAL_SEQ_CONFIGURATION 0x0200 16 16 ··· 690 690 | EXYNOS5420_KFC_USE_STANDBY_WFI2 \ 691 691 | EXYNOS5420_KFC_USE_STANDBY_WFI3) 692 692 693 - #endif /* __ASM_ARCH_REGS_PMU_H */ 693 + #endif /* __LINUX_SOC_EXYNOS_REGS_PMU_H */
+2 -2
arch/arm/mach-exynos/suspend.c
··· 24 24 #include <linux/of_address.h> 25 25 #include <linux/err.h> 26 26 #include <linux/regulator/machine.h> 27 + #include <linux/soc/samsung/exynos-pmu.h> 28 + #include <linux/soc/samsung/exynos-regs-pmu.h> 27 29 28 30 #include <asm/cacheflush.h> 29 31 #include <asm/hardware/cache-l2x0.h> ··· 37 35 #include <plat/pm-common.h> 38 36 39 37 #include "common.h" 40 - #include "exynos-pmu.h" 41 - #include "regs-pmu.h" 42 38 #include "regs-srom.h" 43 39 44 40 #define REG_TABLE_END (-1U)