UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: s3c: remove cpufreq header dependencies 

The cpufreq drivers are split between the machine directory
and the drivers/cpufreq directory. In order to share header
files after we convert s3c to multiplatform, those headers
have to live in a different global location.

Move them to linux/soc/samsung/ in lack of a better place.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Link: https://lore.kernel.org/r/20200806182059.2431-35-krzk@kernel.org
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
This commit is contained in:
Arnd Bergmann 2020-08-06 20:20:52 +02:00 committed by Krzysztof Kozlowski
parent 01e93a1739
commit 81b11a6a09
24 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-s3c24xx/common.c
View File

@ -37,7 +37,6 @@
#include <plat/cpu.h>
#include <plat/devs.h>
#include <plat/cpu-freq.h>
#include <plat/pwm-core.h>
#include "common.h"

2
arch/arm/mach-s3c24xx/cpufreq-utils.c
View File

@ -15,7 +15,7 @@
#include <mach/map.h>
#include <mach/regs-clock.h>
#include <plat/cpu-freq-core.h>
#include <linux/soc/samsung/s3c-cpufreq-core.h>
#include "regs-mem.h"

2
arch/arm/mach-s3c24xx/iotiming-s3c2410.c
View File

@ -17,7 +17,7 @@
#include <mach/map.h>
#include <mach/regs-clock.h>
#include <plat/cpu-freq-core.h>
#include <linux/soc/samsung/s3c-cpufreq-core.h>
#include "regs-mem.h"

2
arch/arm/mach-s3c24xx/iotiming-s3c2412.c
View File

@ -24,7 +24,7 @@
#include <asm/mach/map.h>
#include <plat/cpu.h>
#include <plat/cpu-freq-core.h>
#include <linux/soc/samsung/s3c-cpufreq-core.h>
#include <mach/s3c2412.h>

2
arch/arm/mach-s3c24xx/mach-bast.c
View File

@ -45,7 +45,7 @@
#include <mach/gpio-samsung.h>
#include <plat/cpu.h>
#include <plat/cpu-freq.h>
#include <linux/soc/samsung/s3c-cpu-freq.h>
#include <plat/devs.h>
#include <plat/gpio-cfg.h>

2
arch/arm/mach-s3c24xx/mach-osiris-dvs.c
View File

@ -14,7 +14,7 @@
#include <linux/mfd/tps65010.h>
#include <plat/cpu-freq.h>
#include <linux/soc/samsung/s3c-cpu-freq.h>
#include <mach/gpio-samsung.h>
#define OSIRIS_GPIO_DVS S3C2410_GPB(5)

2
arch/arm/mach-s3c24xx/mach-osiris.c
View File

@ -37,7 +37,7 @@
#include <linux/mtd/partitions.h>
#include <plat/cpu.h>
#include <plat/cpu-freq.h>
#include <linux/soc/samsung/s3c-cpu-freq.h>
#include <plat/devs.h>
#include <plat/gpio-cfg.h>

4
arch/arm/mach-s3c24xx/pll-s3c2410.c
View File

@ -15,8 +15,8 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <plat/cpu.h>
#include <plat/cpu-freq-core.h>
#include <linux/soc/samsung/s3c-cpufreq-core.h>
#include <linux/soc/samsung/s3c-pm.h>
/* This array should be sorted in ascending order of the frequencies */
static struct cpufreq_frequency_table pll_vals_12MHz[] = {

4
arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c
View File

@ -13,8 +13,8 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <plat/cpu.h>
#include <plat/cpu-freq-core.h>
#include <linux/soc/samsung/s3c-cpufreq-core.h>
#include <linux/soc/samsung/s3c-pm.h>
/* This array should be sorted in ascending order of the frequencies */
static struct cpufreq_frequency_table s3c2440_plls_12[] = {

4
arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c
View File

@ -13,8 +13,8 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <plat/cpu.h>
#include <plat/cpu-freq-core.h>
#include <linux/soc/samsung/s3c-cpufreq-core.h>
#include <linux/soc/samsung/s3c-pm.h>
/* This array should be sorted in ascending order of the frequencies */
static struct cpufreq_frequency_table s3c2440_plls_169344[] = {

1
arch/arm/mach-s3c24xx/s3c2410.c
View File

@ -30,7 +30,6 @@
#include <asm/irq.h>
#include <asm/system_misc.h>
#include <plat/cpu-freq.h>
#include <mach/regs-clock.h>

1
arch/arm/mach-s3c24xx/s3c2412.c
View File

@ -34,7 +34,6 @@
#include <mach/regs-gpio.h>
#include <plat/cpu.h>
#include <plat/cpu-freq.h>
#include <plat/devs.h>
#include <plat/pm.h>

2
arch/arm/mach-s3c24xx/s3c244x.c
View File

@ -28,8 +28,6 @@
#include <mach/hardware.h>
#include <asm/irq.h>
#include <plat/cpu-freq.h>
#include <mach/regs-clock.h>
#include <mach/regs-gpio.h>

1
arch/arm/mach-s3c64xx/s3c6400.c
View File

@ -28,7 +28,6 @@
#include <asm/irq.h>
#include <plat/cpu-freq.h>
#include <mach/regs-clock.h>
#include <plat/cpu.h>

2
arch/arm/mach-s3c64xx/s3c6410.c
View File

@ -29,7 +29,7 @@
#include <asm/irq.h>
#include <plat/cpu-freq.h>
#include <linux/soc/samsung/s3c-pm.h>
#include <mach/regs-clock.h>
#include <plat/cpu.h>

9
arch/arm/plat-samsung/include/plat/cpu.h
View File

@ -123,15 +123,6 @@ extern struct syscore_ops s3c2412_pm_syscore_ops;
extern struct syscore_ops s3c2416_pm_syscore_ops;
extern struct syscore_ops s3c244x_pm_syscore_ops;
/* system device subsystems */
extern struct bus_type s3c2410_subsys;
extern struct bus_type s3c2410a_subsys;
extern struct bus_type s3c2412_subsys;
extern struct bus_type s3c2416_subsys;
extern struct bus_type s3c2440_subsys;
extern struct bus_type s3c2442_subsys;
extern struct bus_type s3c2443_subsys;
extern struct bus_type s3c6410_subsys;
#endif

5
drivers/cpufreq/s3c2410-cpufreq.c
View File

@ -16,13 +16,12 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/soc/samsung/s3c-cpufreq-core.h>
#include <linux/soc/samsung/s3c-pm.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/cpu.h>
#include <plat/cpu-freq-core.h>
#include <mach/map.h>
#define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR)

5
drivers/cpufreq/s3c2412-cpufreq.c
View File

@ -19,15 +19,14 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/soc/samsung/s3c-cpufreq-core.h>
#include <linux/soc/samsung/s3c-pm.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <mach/s3c2412.h>
#include <plat/cpu.h>
#include <plat/cpu-freq-core.h>
#include <mach/map.h>
#define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR)

5
drivers/cpufreq/s3c2440-cpufreq.c
View File

@ -20,13 +20,12 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/io.h>
#include <linux/soc/samsung/s3c-cpufreq-core.h>
#include <linux/soc/samsung/s3c-pm.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/cpu.h>
#include <plat/cpu-freq-core.h>
#include <mach/map.h>
#define S3C2410_CLKREG(x) ((x) + S3C24XX_VA_CLKPWR)

2
drivers/cpufreq/s3c24xx-cpufreq-debugfs.c
View File

@ -18,7 +18,7 @@
#include <linux/seq_file.h>
#include <linux/err.h>
#include <plat/cpu-freq-core.h>
#include <linux/soc/samsung/s3c-cpufreq-core.h>
static struct dentry *dbgfs_root;
static struct dentry *dbgfs_file_io;

5
drivers/cpufreq/s3c24xx-cpufreq.c
View File

@ -21,13 +21,12 @@
#include <linux/device.h>
#include <linux/sysfs.h>
#include <linux/slab.h>
#include <linux/soc/samsung/s3c-cpufreq-core.h>
#include <linux/soc/samsung/s3c-pm.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <plat/cpu.h>
#include <plat/cpu-freq-core.h>
#include <mach/map.h>
/* note, cpufreq support deals in kHz, no Hz */

4
arch/arm/plat-samsung/include/plat/cpu-freq.h → include/linux/soc/samsung/s3c-cpu-freq.h
View File

@ -6,6 +6,8 @@
*
* S3C CPU frequency scaling support - driver and board
*/
#ifndef __LINUX_SOC_SAMSUNG_S3C_CPU_FREQ_H
#define __LINUX_SOC_SAMSUNG_S3C_CPU_FREQ_H
#include <linux/cpufreq.h>
@ -139,3 +141,5 @@ static inline int s3c_cpufreq_setboard(struct s3c_cpufreq_board *board)
return 0;
}
#endif /* CONFIG_ARM_S3C_CPUFREQ */
#endif

6
arch/arm/plat-samsung/include/plat/cpu-freq-core.h → include/linux/soc/samsung/s3c-cpufreq-core.h
View File

@ -6,8 +6,10 @@
*
* S3C CPU frequency scaling support - core support
*/
#ifndef __LINUX_SOC_SAMSUNG_S3C_CPUFREQ_CORE_H
#define __LINUX_SOC_SAMSUNG_S3C_CPUFREQ_CORE_H
#include <plat/cpu-freq.h>
#include <linux/soc/samsung/s3c-cpu-freq.h>
struct seq_file;
@ -285,3 +287,5 @@ static inline int s3c_cpufreq_addfreq(struct cpufreq_frequency_table *table,
return index + 1;
}
#endif

10
include/linux/soc/samsung/s3c-pm.h
View File

@ -81,4 +81,14 @@ extern void s3c_pm_check_store(void);
#define s3c_pm_check_store() do { } while (0)
#endif
/* system device subsystems */
extern struct bus_type s3c2410_subsys;
extern struct bus_type s3c2410a_subsys;
extern struct bus_type s3c2412_subsys;
extern struct bus_type s3c2416_subsys;
extern struct bus_type s3c2440_subsys;
extern struct bus_type s3c2442_subsys;
extern struct bus_type s3c2443_subsys;
#endif