Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / boot / dts / imx7-mba7.dtsi

diff --git a/arch/arm/boot/dts/imx7-mba7.dtsi b/arch/arm/boot/dts/imx7-mba7.dtsi
index 84b5809..c6d1c63 100644 (file)
--- a/arch/arm/boot/dts/imx7-mba7.dtsi
+++ b/arch/arm/boot/dts/imx7-mba7.dtsi
@@ -14,6 +14,12 @@
 #include <dt-bindings/net/ti-dp83867.h>
 
 / {
+       aliases {
+               mmc0 = &usdhc3;
+               mmc1 = &usdhc1;
+               /delete-property/ mmc2;
+       };
+
        beeper {
                compatible = "gpio-beeper";
                gpios = <&pca9555 0 GPIO_ACTIVE_HIGH>;
@@ -164,6 +170,20 @@
                regulator-max-microvolt = <3300000>;
                regulator-always-on;
        };
+
+       sound {
+               compatible = "fsl,imx-audio-tlv320aic32x4";
+               model = "imx-audio-tlv320aic32x4";
+               ssi-controller = <&sai1>;
+               audio-codec = <&tlv320aic32x4>;
+               audio-routing =
+                       "IN3_L", "Mic Jack",
+                       "Mic Jack", "Mic Bias",
+                       "IN1_L", "Line In Jack",
+                       "IN1_R", "Line In Jack",
+                       "Line Out Jack", "LOL",
+                       "Line Out Jack", "LOR";
+       };
 };
 
 &adc1 {
@@ -357,13 +377,25 @@
                >;
        };
 
-
        pinctrl_pca9555: pca95550grp {
                fsl,pins = <
                        MX7D_PAD_ENET1_TX_CLK__GPIO7_IO12       0x78
                >;
        };
 
+       pinctrl_sai1: sai1grp {
+               fsl,pins = <
+                       MX7D_PAD_SAI1_MCLK__SAI1_MCLK           0x11
+                       MX7D_PAD_SAI1_RX_BCLK__SAI1_RX_BCLK     0x1c
+                       MX7D_PAD_SAI1_RX_DATA__SAI1_RX_DATA0    0x1c
+                       MX7D_PAD_SAI1_RX_SYNC__SAI2_RX_SYNC     0x1c
+
+                       MX7D_PAD_SAI1_TX_BCLK__SAI1_TX_BCLK     0x1c
+                       MX7D_PAD_SAI1_TX_DATA__SAI1_TX_DATA0    0x14
+                       MX7D_PAD_SAI1_TX_SYNC__SAI1_TX_SYNC     0x14
+               >;
+       };
+
        pinctrl_uart3: uart3grp {
                fsl,pins = <
                        MX7D_PAD_UART3_RX_DATA__UART3_DCE_RX    0x7e
@@ -481,6 +513,16 @@
        status = "okay";
 };
 
+&sai1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sai1>;
+       assigned-clocks = <&clks IMX7D_SAI1_ROOT_SRC>,
+                         <&clks IMX7D_SAI1_ROOT_CLK>;
+       assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>;
+       assigned-clock-rates = <0>, <36864000>;
+       status = "okay";
+};
+
 &uart3 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart3>;
@@ -519,6 +561,9 @@
        assigned-clocks = <&clks IMX7D_UART7_ROOT_SRC>;
        assigned-clock-parents = <&clks IMX7D_OSC_24M_CLK>;
        uart-has-rtscts;
+       linux,rs485-enabled-at-boot-time;
+       rs485-rts-active-low;
+       rs485-rx-during-tx;
        status = "okay";
 };
 
@@ -533,7 +578,8 @@
        srp-disable;
        hnp-disable;
        adp-disable;
-       dr_mode = "host";
+       over-current-active-low;
+       dr_mode = "otg";
        status = "okay";
 };