Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos3250-rinato.dts

diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts
index b55afaa..a26e3e5 100644 (file)
--- a/arch/arm/boot/dts/exynos3250-rinato.dts
+++ b/arch/arm/boot/dts/exynos3250-rinato.dts
@@ -38,10 +38,10 @@
                reg = <0x0205F000 0x1000>;
        };
 
-       gpio_keys {
+       gpio-keys {
                compatible = "gpio-keys";
 
-               power_key {
+               power-key {
                        gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
                        linux,code = <KEY_POWER>;
                        label = "power key";
@@ -62,7 +62,7 @@
                #address-cells = <1>;
                #size-cells = <0>;
 
-               max77836: subpmic@25 {
+               max77836: pmic@25 {
                        compatible = "maxim,max77836";
                        interrupt-parent = <&gpx1>;
                        interrupts = <5 IRQ_TYPE_NONE>;
@@ -267,7 +267,7 @@
        samsung,i2c-max-bus-freq = <100000>;
        status = "okay";
 
-       s2mps14_pmic@66 {
+       pmic@66 {
                compatible = "samsung,s2mps14-pmic";
                interrupt-parent = <&gpx0>;
                interrupts = <7 IRQ_TYPE_NONE>;