Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4756f881 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-soc-4.8-3' of... 

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
parents a9840543 3981b11f

arch/arm/mach-s3c64xx/mach-smartq.c

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/plat-samsung/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/arm/plat-samsung/include/plat/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -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);