Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[deliverable/linux.git] / arch / arm / boot / dts / exynos5420-smdk5420.dts

diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 0785fedf441e8001aa33ea198060477c5c644836..9b77940c920125dacf2e99f7aba62b19d54b5aaf 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -111,7 +111,7 @@
 
        display-timings {
                native-mode = <&timing0>;
-               timing0: timing@0 {
+               timing0: timing {
                        clock-frequency = <50000>;
                        hactive = <2560>;
                        vactive = <1600>;
@@ -142,13 +142,6 @@
        s2mps11_pmic@66 {
                compatible = "samsung,s2mps11-pmic";
                reg = <0x66>;
-               s2mps11,buck2-ramp-delay = <12>;
-               s2mps11,buck34-ramp-delay = <12>;
-               s2mps11,buck16-ramp-delay = <12>;
-               s2mps11,buck6-ramp-enable = <1>;
-               s2mps11,buck2-ramp-enable = <1>;
-               s2mps11,buck3-ramp-enable = <1>;
-               s2mps11,buck4-ramp-enable = <1>;
 
                s2mps11_osc: clocks {
                        #clock-cells = <1>;