hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Samsung non-critical fixes for v4.3 

- fix sparse warning for returning iomem
 - fix clock-frequency of display timing0 for exynos3250-rinato
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJVwGDEAAoJEA0Cl+kVi2xqAbQP/0Hn7gQX0l2nHMYO3xgf8jrE
 EtGiwRAx/InxfmBtJYtZf6KH/F/FJPrXrJBa3co9RHgIPK9bEpX9EBLmKdGHEf9w
 d7IDhECyAlFSFII35NX+IzAW9+9AuRx80/5PcJyPikwHyswdVVQAe00/L4rqwLuu
 ajUk5s6FsLnk6vuUZDGLz5+u8OezdJIYdWHeaNigH9IbvkczKkJKhWOdcYbH8hux
 mKN+5rCwqk2zdz6lFcZ8yPH1FlkVFfDGSi/97p4iqzz5S9Oy477tCgKYFnPqYcHP
 gIFcK6FqlTGMeTuqHC1ISrXp+ZIEzKUAlHhaTRG5G9umvjRj8qS0TAEUqCr5dx50
 nQupX4EUL+LFasE1oztHf4WQodkH3Q8polNWPT95jtcvCO37UGMPdEJIKbv9vdD/
 aT3OcvDbr+TqwsepXkVmkbLqLsjwmeO3WjK0VfTmElPc4qekgXxNRr6Zr8oSj4GN
 DeWXDrf1uj0fpY0/VlIkrAD6w6AtMRGERBkmSIIyCI6JWapIlM3EBgtIc4FQSIxC
 1dswY0v0Nt/WB8NQ0uJeN/r8GcEcSj61gSo/1acH3H3QHLP2ZzeiCOCdDrGKM7d9
 u4HOYZ1im8rBnXFFGKp3HIokd/nn73a8u6GGD6ror8+Q2ods+lPHVQ8HP0gGrzJH
 JVJl1UALMvogxtC2mGiE
 =7m5l
 -----END PGP SIGNATURE-----

Merge tag 'samsung-non-critical-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical

Samsung non-critical fixes for v4.3

- fix sparse warning for returning iomem
- fix clock-frequency of display timing0 for exynos3250-rinato

* tag 'samsung-non-critical-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Use IOMEM_ERR_PTR when function returns iomem
  ARM: dts: fix clock-frequency of display timing0 for exynos3250-rinato

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-08-11 14:38:36 +02:00
parent bc0195aad0 2cc6b81357
commit 7776f8e3f8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/exynos3250-rinato.dts
View File

@ -182,7 +182,7 @@
display-timings { display-timings {
timing-0 { timing-0 {
clock-frequency = <0>; clock-frequency = <4600000>;
hactive = <320>; hactive = <320>;
vactive = <320>; vactive = <320>;
hfront-porch = <1>; hfront-porch = <1>;

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

@ -182,7 +182,7 @@ static inline void __iomem *cpu_boot_reg(int cpu)
boot_reg = cpu_boot_reg_base(); boot_reg = cpu_boot_reg_base();
if (!boot_reg) if (!boot_reg)
return ERR_PTR(-ENODEV); return IOMEM_ERR_PTR(-ENODEV);
if (soc_is_exynos4412()) if (soc_is_exynos4412())
boot_reg += 4*cpu; boot_reg += 4*cpu;
else if (soc_is_exynos5420() || soc_is_exynos5800()) else if (soc_is_exynos5420() || soc_is_exynos5800())