Merge branch 'pm-cpufreq'

[cascardo/linux.git] / arch / arm / boot / dts / am335x-pepper.dts

diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts
index 8867aaa..30e2f87 100644 (file)
--- a/arch/arm/boot/dts/am335x-pepper.dts
+++ b/arch/arm/boot/dts/am335x-pepper.dts
@@ -20,7 +20,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
@@ -41,15 +41,15 @@
                compatible = "ti,da830-evm-audio";
        };
 
-       vbat: fixedregulator@0 {
+       vbat: fixedregulator0 {
                compatible = "regulator-fixed";
        };
 
-       v3v3c_reg: fixedregulator@1 {
+       v3v3c_reg: fixedregulator1 {
                compatible = "regulator-fixed";
        };
 
-       vdd5_reg: fixedregulator@2 {
+       vdd5_reg: fixedregulator2 {
                compatible = "regulator-fixed";
        };
 };
@@ -595,14 +595,14 @@
        pinctrl-names = "default";
        pinctrl-0 = <&user_leds_pins>;
 
-       led@0 {
+       led0 {
                label = "pepper:user0:blue";
                gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>;
                linux,default-trigger = "none";
                default-state = "off";
        };
 
-       led@1 {
+       led1 {
                label = "pepper:user1:red";
                gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
                linux,default-trigger = "none";
@@ -616,21 +616,21 @@
        #address-cells = <1>;
        #size-cells = <0>;
 
-       button@0 {
+       button0 {
                label = "home";
                linux,code = <KEY_HOME>;
                gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
                wakeup-source;
        };
 
-       button@1 {
+       button1 {
                label = "menu";
                linux,code = <KEY_MENU>;
                gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
                wakeup-source;
        };
 
-       buttons@2 {
+       buttons2 {
                label = "power";
                linux,code = <KEY_POWER>;
                gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;