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

Samsung mach/soc changes for v4.19 

Minor cleanups and fixes.
 -----BEGIN PGP SIGNATURE-----
 
 iQItBAABCAAXBQJbWJ83EBxrcnprQGtlcm5lbC5vcmcACgkQwTdm5oaLg9d+7xAA
 j2yiTMIXwDRuT61odTKE7TDoIkJUYmWGfnEWfDmeNyYEQmSaZNSbOP97LQI1u8mv
 /xCMS1RjO+G54HLpKBet3Xk/ZR+aGp/mkDN9hrGwCgfVvo9eiaSAWTw160lLumhB
 DbP3jgsmmsCId0nmXMh3hn23/kV17g/JHGrHI0Mug02ZT8giyfZesXSue2sHHkGk
 erl/gQ5Lj0W/sMFwaI1bu5ai/ALWzq0huzaCMEGVV+2SOPtrCHKtoiBu01DmMf6u
 ug+uBsJeFS/NL4+S3Iw6//6l8o3sihtCR+HmqNpIv+N5zqCri1dc6GyhRH4hFcdG
 Per8qo//V/6vQtle+HYeJBLwTkWdAcad9WfBwMncdIvKimC3nOk89T3DYQ3cDk8E
 nIiqz9i8c2TYSIGwv05YcBzlY+kpBwQ/mbdW7G11kvwGteddJwVVTbAscwGWXQ1R
 Yrc426I2w/tB/2EdUB28Pn4gp1C9Jco0dMRJnml1BOl4kfZkmI/0APllbGKSsUl8
 O8T4ERsZUGZEgMGFKTJfdwAYnqM3RIoxBExfe0/0CyO+QNC0USKqBG2JgUQkEq9J
 CzTFplxZMW5cRfBWK6uPsH1d2waGg73ifEeGwznche+cGwxHbTUFdzHWQbldLWS0
 1cJnSVSTkvyFj8SFM/zSmt6SmGQvIDcy8DPiRm9ix6Y=
 =1puh
 -----END PGP SIGNATURE-----

Merge tag 'samsung-soc-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc

Samsung mach/soc changes for v4.19

Minor cleanups and fixes.

* tag 'samsung-soc-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos: Clear global variable on init error path
  ARM: exynos: Remove outdated maintainer information
  ARM: s3c24xx: Fix typo in guard macro of s3c2412.h

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-07-26 00:18:25 -07:00
parent f0ad841230 cd4806911c
commit 5acdc77014
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-exynos/exynos.c
View File

@ -190,8 +190,6 @@ static void __init exynos_dt_fixup(void)
}
DT_MACHINE_START(EXYNOS_DT, "SAMSUNG EXYNOS (Flattened Device Tree)")
/* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */
/* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
.l2c_aux_val = 0x3c400001,
.l2c_aux_mask = 0xc20fffff,
.smp = smp_ops(exynos_smp_ops),

1
arch/arm/mach-exynos/suspend.c
View File

@ -203,6 +203,7 @@ static int __init exynos_pmu_irq_init(struct device_node *node,
NULL);
if (!domain) {
iounmap(pmu_base_addr);
pmu_base_addr = NULL;
return -ENOMEM;
}

2
arch/arm/mach-s3c24xx/include/mach/s3c2412.h
View File

@ -6,7 +6,7 @@
*/
#ifndef __ARCH_ARM_MACH_S3C24XX_S3C2412_H
#define __ARCH_ARM_REGS_S3C24XX_S3C2412_H __FILE__
#define __ARCH_ARM_MACH_S3C24XX_S3C2412_H __FILE__
#define S3C2412_MEMREG(x) (S3C24XX_VA_MEMCTRL + (x))
#define S3C2412_EBIREG(x) (S3C2412_VA_EBI + (x))