aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/boot/dts/exynos3250-rinato.dts2
-rw-r--r--arch/arm/mach-exynos/platsmp.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts
index 031853b75528..baa9b2f52009 100644
--- a/arch/arm/boot/dts/exynos3250-rinato.dts
+++ b/arch/arm/boot/dts/exynos3250-rinato.dts
@@ -182,7 +182,7 @@
182 182
183 display-timings { 183 display-timings {
184 timing-0 { 184 timing-0 {
185 clock-frequency = <0>; 185 clock-frequency = <4600000>;
186 hactive = <320>; 186 hactive = <320>;
187 vactive = <320>; 187 vactive = <320>;
188 hfront-porch = <1>; 188 hfront-porch = <1>;
diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index 58e05a2eae57..98a2c0cbb833 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -182,7 +182,7 @@ static inline void __iomem *cpu_boot_reg(int cpu)
182 182
183 boot_reg = cpu_boot_reg_base(); 183 boot_reg = cpu_boot_reg_base();
184 if (!boot_reg) 184 if (!boot_reg)
185 return ERR_PTR(-ENODEV); 185 return IOMEM_ERR_PTR(-ENODEV);
186 if (soc_is_exynos4412()) 186 if (soc_is_exynos4412())
187 boot_reg += 4*cpu; 187 boot_reg += 4*cpu;
188 else if (soc_is_exynos5420() || soc_is_exynos5800()) 188 else if (soc_is_exynos5420() || soc_is_exynos5800())