Merge branch 'pm-cpufreq'

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

diff --git a/arch/arm/boot/dts/am335x-icev2.dts b/arch/arm/boot/dts/am335x-icev2.dts
index 7d8b8fe..85e04c2 100644 (file)
--- a/arch/arm/boot/dts/am335x-icev2.dts
+++ b/arch/arm/boot/dts/am335x-icev2.dts
@@ -19,12 +19,12 @@
        model = "TI AM3359 ICE-V2";
        compatible = "ti,am3359-icev2", "ti,am33xx";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
 
-       vbat: fixedregulator@0 {
+       vbat: fixedregulator0 {
                compatible = "regulator-fixed";
                regulator-name = "vbat";
                regulator-min-microvolt = <5000000>;
@@ -32,7 +32,7 @@
                regulator-boot-on;
        };
 
-       vtt_fixed: fixedregulator@1 {
+       vtt_fixed: fixedregulator1 {
                compatible = "regulator-fixed";
                regulator-name = "vtt";
                regulator-min-microvolt = <1500000>;
@@ -43,52 +43,52 @@
                enable-active-high;
        };
 
-       leds@0 {
+       leds0 {
                compatible = "gpio-leds";
 
-               led@0 {
+               led0 {
                        label = "out0";
                        gpios = <&tpic2810 0 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@1 {
+               led1 {
                        label = "out1";
                        gpios = <&tpic2810 1 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@2 {
+               led2 {
                        label = "out2";
                        gpios = <&tpic2810 2 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@3 {
+               led3 {
                        label = "out3";
                        gpios = <&tpic2810 3 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@4 {
+               led4 {
                        label = "out4";
                        gpios = <&tpic2810 4 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@5 {
+               led5 {
                        label = "out5";
                        gpios = <&tpic2810 5 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@6 {
+               led6 {
                        label = "out6";
                        gpios = <&tpic2810 6 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@7 {
+               led7 {
                        label = "out7";
                        gpios = <&tpic2810 7 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
@@ -96,49 +96,58 @@
        };
 
        /* Tricolor status LEDs */
-       leds@1 {
+       leds1 {
                compatible = "gpio-leds";
                pinctrl-names = "default";
                pinctrl-0 = <&user_leds>;
 
-               led@0 {
+               led0 {
                        label = "status0:red:cpu0";
                        gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                        linux,default-trigger = "cpu0";
                };
 
-               led@1 {
+               led1 {
                        label = "status0:green:usr";
                        gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@2 {
+               led2 {
                        label = "status0:yellow:usr";
                        gpios = <&gpio3 9 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@3 {
+               led3 {
                        label = "status1:red:mmc0";
                        gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                        linux,default-trigger = "mmc0";
                };
 
-               led@4 {
+               led4 {
                        label = "status1:green:usr";
                        gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
 
-               led@5 {
+               led5 {
                        label = "status1:yellow:usr";
                        gpios = <&gpio0 19 GPIO_ACTIVE_HIGH>;
                        default-state = "off";
                };
        };
+       gpio-decoder {
+               compatible = "gpio-decoder";
+               gpios = <&pca9536 3 GPIO_ACTIVE_HIGH>,
+                       <&pca9536 2 GPIO_ACTIVE_HIGH>,
+                       <&pca9536 1 GPIO_ACTIVE_HIGH>,
+                       <&pca9536 0 GPIO_ACTIVE_HIGH>;
+               linux,axis = <0>; /* ABS_X */
+               decoder-max-value = <9>;
+       };
 };
 
 &am33xx_pinmux {