Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos5420-arndale-octa.dts

diff --git a/arch/arm/boot/dts/exynos5420-arndale-octa.dts b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
index e9a09dd..bf457d0 100644 (file)
--- a/arch/arm/boot/dts/exynos5420-arndale-octa.dts
+++ b/arch/arm/boot/dts/exynos5420-arndale-octa.dts
@@ -39,7 +39,7 @@
                };
        };
 
-       gpio_keys {
+       gpio-keys {
                compatible = "gpio-keys";
 
                wakeup {
@@ -344,7 +344,7 @@
 &hsi2c_4 {
        status = "okay";
 
-       s2mps11_pmic@66 {
+       pmic@66 {
                compatible = "samsung,s2mps11-pmic";
                reg = <0x66>;
 
@@ -673,7 +673,7 @@
                        };
 
                        buck2_reg: BUCK2 {
-                               regulator-name = "vdd_arm";
+                               regulator-name = "PVDD_ARM_1V0";
                                regulator-min-microvolt = <800000>;
                                regulator-max-microvolt = <1500000>;
                                regulator-always-on;