diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 15:36:01 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 15:36:01 +0200 |
| commit | 4756f881ba303e4dada613feeacf44d26c3e35b9 (patch) | |
| tree | 3b89aed5d80512a9153c9a19aebc1101a7ed3758 | |
| parent | a98405432e864e8483e1bdbf50a5668d6604283f (diff) | |
| parent | 3981b11fda14ea0b459043d97c68db0a614ec9f8 (diff) | |
| download | linux-4756f881ba303e4dada613feeacf44d26c3e35b9.tar.bz2 | |
Merge tag 'samsung-soc-4.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc
Merge "Samsung mach/soc update for v4.8, part 3: from Krzysztof Kozlowski:
Just cleanup - fix Sparse warning and constify passed iomem address.
* tag 'samsung-soc-4.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: s3c64xx: smartq: Avoid sparse warnings
ARM: SAMSUNG: Constify iomem address passed to s5p_init_cpu
| -rw-r--r-- | arch/arm/mach-s3c64xx/mach-smartq.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/cpu.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/cpu.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c index 936a63fc68d5..e0e1a729ef98 100644 --- a/arch/arm/mach-s3c64xx/mach-smartq.c +++ b/arch/arm/mach-s3c64xx/mach-smartq.c @@ -43,6 +43,7 @@ #include <plat/samsung-time.h> #include "common.h" +#include "mach-smartq.h" #include "regs-modem.h" #define UCON S3C2410_UCON_DEFAULT diff --git a/arch/arm/plat-samsung/cpu.c b/arch/arm/plat-samsung/cpu.c index bd12a55401e0..a107b3a0b095 100644 --- a/arch/arm/plat-samsung/cpu.c +++ b/arch/arm/plat-samsung/cpu.c @@ -44,7 +44,7 @@ void __init s3c64xx_init_cpu(void) pr_info("Samsung CPU ID: 0x%08lx\n", samsung_cpu_id); } -void __init s5p_init_cpu(void __iomem *cpuid_addr) +void __init s5p_init_cpu(const void __iomem *cpuid_addr) { samsung_cpu_id = readl_relaxed(cpuid_addr); samsung_cpu_rev = samsung_cpu_id & 0xFF; diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h index 4f8a6221dc6d..b7b702a72cac 100644 --- a/arch/arm/plat-samsung/include/plat/cpu.h +++ b/arch/arm/plat-samsung/include/plat/cpu.h @@ -113,7 +113,7 @@ extern void s3c_init_cpu(unsigned long idcode, extern void s3c24xx_init_io(struct map_desc *mach_desc, int size); extern void s3c64xx_init_cpu(void); -extern void s5p_init_cpu(void __iomem *cpuid_addr); +extern void s5p_init_cpu(const void __iomem *cpuid_addr); extern unsigned int samsung_rev(void); |