On Thu, Oct 10, 2019 at 10:30:14PM +0200, Arnd Bergmann wrote:
> 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
> ---
> arch/arm/mach-s3c24xx/common.c | 1 -
> arch/arm/mach-s3c24xx/cpufreq-utils.c | 2 +-
> arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 2 +-
> arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 2 +-
> arch/arm/mach-s3c24xx/mach-bast.c | 2 +-
> arch/arm/mach-s3c24xx/mach-osiris-dvs.c| 2 +-
> arch/arm/mach-s3c24xx/mach-osiris.c| 2 +-
> arch/arm/mach-s3c24xx/pll-s3c2410.c| 4 ++--
> arch/arm/mach-s3c24xx/pll-s3c2440-1200.c | 4 ++--
> arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | 4 ++--
> arch/arm/mach-s3c24xx/s3c2410.c| 1 -
> arch/arm/mach-s3c24xx/s3c2412.c| 1 -
> arch/arm/mach-s3c24xx/s3c244x.c| 2 --
> arch/arm/mach-s3c64xx/s3c6400.c| 1 -
> arch/arm/mach-s3c64xx/s3c6410.c| 2 +-
> arch/arm/plat-samsung/include/plat/cpu.h | 9 -
> drivers/cpufreq/s3c2410-cpufreq.c | 5 ++---
> drivers/cpufreq/s3c2412-cpufreq.c | 5 ++---
> drivers/cpufreq/s3c2440-cpufreq.c | 5 ++---
> drivers/cpufreq/s3c24xx-cpufreq-debugfs.c | 2 +-
> drivers/cpufreq/s3c24xx-cpufreq.c | 5 ++---
> .../linux/soc/samsung/s3c-cpu-freq.h | 0
> .../linux/soc/samsung/s3c-cpufreq-core.h | 2 +-
> include/linux/soc/samsung/s3c-pm.h | 10 ++
> 24 files changed, 33 insertions(+), 42 deletions(-)
> rename arch/arm/plat-samsung/include/plat/cpu-freq.h =>
> include/linux/soc/samsung/s3c-cpu-freq.h (100%)
> rename arch/arm/plat-samsung/include/plat/cpu-freq-core.h =>
> include/linux/soc/samsung/s3c-cpufreq-core.h (99%)
>
> diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
> index ebf6bde67816..d16a164df6c4 100644
> --- a/arch/arm/mach-s3c24xx/common.c
> +++ b/arch/arm/mach-s3c24xx/common.c
> @@ -35,7 +35,6 @@
>
> #include
> #include
> -#include
> #include
>
> #include "common.h"
> diff --git a/arch/arm/mach-s3c24xx/cpufreq-utils.c
> b/arch/arm/mach-s3c24xx/cpufreq-utils.c
> index 1a7f38d085dd..43ab714eaa9e 100644
> --- a/arch/arm/mach-s3c24xx/cpufreq-utils.c
> +++ b/arch/arm/mach-s3c24xx/cpufreq-utils.c
> @@ -15,7 +15,7 @@
> #include
> #include
>
> -#include
> +#include
>
> #include "regs-mem.h"
>
> diff --git a/arch/arm/mach-s3c24xx/iotiming-s3c2410.c
> b/arch/arm/mach-s3c24xx/iotiming-s3c2410.c
> index 9f90aaf70bf3..5b3b16dd0ce8 100644
> --- a/arch/arm/mach-s3c24xx/iotiming-s3c2410.c
> +++ b/arch/arm/mach-s3c24xx/iotiming-s3c2410.c
> @@ -17,7 +17,7 @@
> #include
> #include
>
> -#include
> +#include
>
> #include "regs-mem.h"
>
> diff --git a/arch/arm/mach-s3c24xx/iotiming-s3c2412.c
> b/arch/arm/mach-s3c24xx/iotiming-s3c2412.c
> index 59356d10fbcf..a22b5611697d 100644
> --- a/arch/arm/mach-s3c24xx/iotiming-s3c2412.c
> +++ b/arch/arm/mach-s3c24xx/iotiming-s3c2412.c
> @@ -24,7 +24,7 @@
> #include
>
> #include
> -#include
> +#include
>
> #include
>
> diff --git a/arch/arm/mach-s3c24xx/mach-bast.c
> b/arch/arm/mach-s3c24xx/mach-bast.c
> index cc941b5030ea..b2f2d036bca2 100644
> --- a/arch/arm/mach-s3c24xx/mach-bast.c
> +++ b/arch/arm/mach-s3c24xx/mach-bast.c
> @@ -46,7 +46,7 @@
> #include
>
> #include
> -#include
> +#include
> #include
> #include
> #include
> diff --git a/arch/arm/mach-s3c24xx/mach-osiris-dvs.c
> b/arch/arm/mach-s3c24xx/mach-osiris-dvs.c
> index 5d819b6ea428..1250520b3bcc 100644
> --- a/arch/arm/mach-s3c24xx/mach-osiris-dvs.c
> +++ b/arch/arm/mach-s3c24xx/mach-osiris-dvs.c
> @@ -14,7 +14,7 @@
>
> #include
>
> -#include
> +#include
> #include
>
> #define OSIRIS_GPIO_DVS S3C2410_GPB(5)
> diff --git a/arch/arm/mach-s3c24xx/mach-osiris.c
> b/arch/arm/mach-s3c24xx/mach-osiris.c
> index 262e77bd48de..674164264076 100644
> --- a/arch/arm/mach-s3c24xx/mach-osiris.c
> +++ b/arch/arm/mach-s3c24xx/mach-osiris.c
> @@ -37,7 +37,7 @@
> #include
>
> #include
> -#include
> +#include
> #include
> #include
> #include
> diff --git a/arch/arm/mach-s3c24xx/pll-s3c2410.c
> b/arch/arm/mach-s3c24xx/pll-s3c2410.c
> index 0561f79ddce8..3fbc99eaa4a2 100644
> --- a/arch/arm/mach-s3c24xx/pll-s3c2410.c
> +++ b/arch/arm/mach-s3c24xx/pll-s3c2410.c
> @@ -15,8 +15,8 @@
> #include
> #include
>
> -#include
> -#include
> +#include
> +#include
>
> /*
