Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[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 bc0190e..85e04c2 100644 (file)
--- a/arch/arm/boot/dts/am335x-icev2.dts
+++ b/arch/arm/boot/dts/am335x-icev2.dts
@@ -19,7 +19,7 @@
        model = "TI AM3359 ICE-V2";
        compatible = "ti,am3359-icev2", "ti,am33xx";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x10000000>; /* 256 MB */
        };
@@ -139,6 +139,15 @@
                        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 {