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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

Olof Johansson 10 years ago 7776f8e3 bc0195aa

+2 -2

2 changed files

expand all

arch

arm

boot

dts

exynos3250-rinato.dts

mach-exynos

platsmp.c

+1 -1

arch/arm/boot/dts/exynos3250-rinato.dts

··· 182 182 183 183 display-timings { 184 184 timing-0 { 185 - clock-frequency = <0>; 185 + clock-frequency = <4600000>; 186 186 hactive = <320>; 187 187 vactive = <320>; 188 188 hfront-porch = <1>;

+1 -1

arch/arm/mach-exynos/platsmp.c

··· 182 182 183 183 boot_reg = cpu_boot_reg_base(); 184 184 if (!boot_reg) 185 - return ERR_PTR(-ENODEV); 185 + return IOMEM_ERR_PTR(-ENODEV); 186 186 if (soc_is_exynos4412()) 187 187 boot_reg += 4*cpu; 188 188 else if (soc_is_exynos5420() || soc_is_exynos5800())