Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

[karo-tx-linux.git] / arch / arm / boot / dts / imx6sx-sdb.dtsi

diff --git a/arch/arm/boot/dts/imx6sx-sdb.dtsi b/arch/arm/boot/dts/imx6sx-sdb.dtsi
index f1d37306e8bf4865c40a8923d76710654e0a9b0c..e5eafe4d9a701afa196cab8da9c59c79a9a7e6eb 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -254,6 +254,12 @@
        status = "okay";
 };
 
+&sai1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sai1>;
+       status = "disabled";
+};
+
 &ssi2 {
        status = "okay";
 };
@@ -468,6 +474,16 @@
                        >;
                };
 
+               pinctrl_sai1: sai1grp {
+                       fsl,pins = <
+                               MX6SX_PAD_CSI_DATA00__SAI1_TX_BCLK      0x130b0
+                               MX6SX_PAD_CSI_DATA01__SAI1_TX_SYNC      0x130b0
+                               MX6SX_PAD_CSI_HSYNC__SAI1_TX_DATA_0     0x120b0
+                               MX6SX_PAD_CSI_VSYNC__SAI1_RX_DATA_0     0x130b0
+                               MX6SX_PAD_CSI_PIXCLK__AUDMUX_MCLK       0x130b0
+                       >;
+               };
+
                pinctrl_uart1: uart1grp {
                        fsl,pins = <
                                MX6SX_PAD_GPIO1_IO04__UART1_TX          0x1b0b1