Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 17:51:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Samsung mach/soc update for v4.8, part 3:

Browse Source 
Just cleanup - fix Sparse warning and constify passed iomem address.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXg8ATAAoJEME3ZuaGi4PXUL0P+QHP+LO5aKxRLFqYfGXwIWcG
 NyAaHTRuSRu8wTvZKsPfr1l65ItfUxCwvW1N3ZCElF7+lLPR/W7INVpYsOfLa/6o
 MeTELRPItCKuRXW8dmuCmsSYRIzFNVtozOhD4RhGd/SgWB8qTFSe7sZNShib70dL
 ys8EHvWxBvuqRRAmf3riJ4jZPR9CaY/27oQclpkcxe65U6wTcsXY6dsmfsizcLB3
 j6aYDs4rkoDhg+GGQk/Th5w+z+Q2k44SZbs/lGy2GEBStOSePNUH4r61Yn+mdQx5
 X5Fd82H6AOCLSdUaslHdaBeE5PJeZIS4bdM+QnOxefPA5In9siOlgN0/H3xYlVYz
 gWgWJoydkYMRxPLvJMlV/G/XzyOVJFdHcp3JNGq1L2g6jeO7fGWAD0x1P3xdwOTD
 W4e9deeWlsgiucrKT0ZoK7AEouOM0kLx1s9T1q4sL7ht0KSNA+BLjBYtMkKC7kCy
 MW1vnyMYf2pXSAElZQXw/y0LiLxNSKDv2Utz7fCn73kBhjaI8ZYo9Mi2aOoLv1Lr
 coNyQPGXh3dCleHUORM+X9HCkaezsxGhnlmtpfr754QyG8DyAWLeRQ7KDVlCNmEr
 ns9Ji9RDAfWXB1UM5DzYWYyDPPKyefkxe4FxUT1m7sLQ+Sa1JeIIB0MlAs74gKTZ
 nXiMR/UR0BY4wr+Zv1K7
 =jpFy
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2016-07-14 15:36:01 +02:00
commit 4756f881ba
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

2
arch/arm/plat-samsung/cpu.c
View File

@ -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;

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

@ -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);