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

[cascardo/linux.git] / arch / arm / boot / dts / stih407-pinctrl.dtsi

diff --git a/arch/arm/boot/dts/stih407-pinctrl.dtsi b/arch/arm/boot/dts/stih407-pinctrl.dtsi
index 4be681a..c325cc0 100644 (file)
--- a/arch/arm/boot/dts/stih407-pinctrl.dtsi
+++ b/arch/arm/boot/dts/stih407-pinctrl.dtsi
@@ -296,10 +296,12 @@
                                pinctrl_pwm1_chan0_default: pwm1-0-default {
                                        st,pins {
                                                pwm-out = <&pio3 0 ALT1 OUT>;
+                                               pwm-capturein = <&pio3 2 ALT1 IN>;
                                        };
                                };
                                pinctrl_pwm1_chan1_default: pwm1-1-default {
                                        st,pins {
+                                               pwm-capturein = <&pio4 3 ALT1 IN>;
                                                pwm-out = <&pio4 4 ALT1 OUT>;
                                        };
                                };
@@ -1044,6 +1046,7 @@
                        pwm0 {
                                pinctrl_pwm0_chan0_default: pwm0-0-default {
                                        st,pins {
+                                               pwm-capturein = <&pio31 0 ALT1 IN>;
                                                pwm-out = <&pio31 1 ALT1 OUT>;
                                        };
                                };
@@ -1081,6 +1084,61 @@
                                };
                        };
 
+                       i2s_out {
+                               pinctrl_i2s_8ch_out: i2s_8ch_out{
+                                       st,pins {
+                                               mclk = <&pio33 5 ALT1 OUT>;
+                                               lrclk = <&pio33 7 ALT1 OUT>;
+                                               sclk = <&pio33 6 ALT1 OUT>;
+                                               data0 = <&pio33 4 ALT1 OUT>;
+                                               data1 = <&pio34 0 ALT1 OUT>;
+                                               data2 = <&pio34 1 ALT1 OUT>;
+                                               data3 = <&pio34 2 ALT1 OUT>;
+                                       };
+                               };
+
+                               pinctrl_i2s_2ch_out: i2s_2ch_out{
+                                       st,pins {
+                                               mclk = <&pio33 5 ALT1 OUT>;
+                                               lrclk = <&pio33 7 ALT1 OUT>;
+                                               sclk = <&pio33 6 ALT1 OUT>;
+                                               data0 = <&pio33 4 ALT1 OUT>;
+                                       };
+                               };
+                       };
+
+                       i2s_in {
+                               pinctrl_i2s_8ch_in: i2s_8ch_in{
+                                       st,pins {
+                                               mclk = <&pio32 5 ALT1 IN>;
+                                               lrclk = <&pio32 7 ALT1 IN>;
+                                               sclk = <&pio32 6 ALT1 IN>;
+                                               data0 = <&pio32 4 ALT1 IN>;
+                                               data1 = <&pio33 0 ALT1 IN>;
+                                               data2 = <&pio33 1 ALT1 IN>;
+                                               data3 = <&pio33 2 ALT1 IN>;
+                                               data4 = <&pio33 3 ALT1 IN>;
+                                       };
+                               };
+
+                               pinctrl_i2s_2ch_in: i2s_2ch_in{
+                                       st,pins {
+                                               mclk = <&pio32 5 ALT1 IN>;
+                                               lrclk = <&pio32 7 ALT1 IN>;
+                                               sclk = <&pio32 6 ALT1 IN>;
+                                               data0 = <&pio32 4 ALT1 IN>;
+                                       };
+                               };
+                       };
+
+                       spdif_out {
+                               pinctrl_spdif_out: spdif_out{
+                                       st,pins {
+                                               spdif_out = <&pio34 7 ALT1 OUT>;
+                                       };
+                               };
+                       };
+
                        serial3 {
                                pinctrl_serial3: serial3-0 {
                                        st,pins {