Merge tag 'nios2-v4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / at91-tse850-3.dts

diff --git a/arch/arm/boot/dts/at91-tse850-3.dts b/arch/arm/boot/dts/at91-tse850-3.dts
index 669a2c6bdefca2e0b9e70f18e282b59616c6d2d5..498fba3e52b58bb0918b4cd7e89d8049da3c1a69 100644 (file)
--- a/arch/arm/boot/dts/at91-tse850-3.dts
+++ b/arch/arm/boot/dts/at91-tse850-3.dts
@@ -86,16 +86,43 @@
                #io-channel-cells = <1>;
        };
 
-       envelope-detector {
+       env_det: envelope-detector {
                compatible = "axentia,tse850-envelope-detector";
                io-channels = <&dac 0>;
                io-channel-names = "dac";
+               #io-channel-cells = <1>;
 
                interrupt-parent = <&pioA>;
                interrupts = <3 IRQ_TYPE_EDGE_RISING>;
                interrupt-names = "comp";
        };
 
+       mux: mux-controller {
+               compatible = "gpio-mux";
+               #mux-control-cells = <0>;
+
+               mux-gpios = <&pioA 0 GPIO_ACTIVE_HIGH>,
+                           <&pioA 1 GPIO_ACTIVE_HIGH>,
+                           <&pioA 2 GPIO_ACTIVE_HIGH>;
+               idle-state = <0>;
+       };
+
+       envelope-detector-mux {
+               compatible = "io-channel-mux";
+               io-channels = <&env_det 0>;
+               io-channel-names = "parent";
+
+               mux-controls = <&mux>;
+
+               channels = "", "",
+                        "sync-1",
+                        "in",
+                        "out",
+                        "sync-2",
+                        "sys-reg",
+                        "ana-reg";
+       };
+
        leds {
                compatible = "gpio-leds";