Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6sll-evk.dts

diff --git a/arch/arm/boot/dts/imx6sll-evk.dts b/arch/arm/boot/dts/imx6sll-evk.dts
index c755cbdb7cde4d423df1d3327f7796bade271862..32b3d82fec53c37c703d0a5a9fafecf9a16437da 100644 (file)
--- a/arch/arm/boot/dts/imx6sll-evk.dts
+++ b/arch/arm/boot/dts/imx6sll-evk.dts
@@ -132,6 +132,31 @@
                        };
                };
        };
                        };
                };
        };

+
+       sound {
+               compatible = "fsl,imx6sl-evk-wm8962", "fsl,imx-audio-wm8962";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_hp>;
+               model = "wm8962-audio";
+               audio-cpu = <&ssi2>;
+               audio-codec = <&wm8962>;
+               audio-routing =
+                       "Headphone Jack", "HPOUTL",
+                       "Headphone Jack", "HPOUTR",
+                       "Ext Spk", "SPKOUTL",
+                       "Ext Spk", "SPKOUTR",
+                       "AMIC", "MICBIAS",
+                       "IN3R", "AMIC";
+               mux-int-port = <2>;
+               mux-ext-port = <3>;
+               hp-det-gpio = <&gpio4 24 GPIO_ACTIVE_LOW>;
+       };
+};
+
+&audmux {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_audmux3>;
+       status = "okay";

 };
 
 &cpu0 {
 };
 
 &cpu0 {


@@ -247,6 +272,27 @@
        };
 };
 
        };
 };
 

+&i2c3 {
+       clock-frequency = <100000>;
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_i2c3>;
+       status = "okay";
+
+       wm8962: audio-codec@1a {
+               compatible = "wlf,wm8962";
+               reg = <0x1a>;
+               clocks = <&clks IMX6SLL_CLK_EXTERN_AUDIO>;
+               DCVDD-supply = <&vgen3_reg>;
+               DBVDD-supply = <&reg_aud3v>;
+               AVDD-supply = <&vgen3_reg>;
+               CPVDD-supply = <&vgen3_reg>;
+               MICVDD-supply = <&reg_aud3v>;
+               PLLVDD-supply = <&vgen3_reg>;
+               SPKVDD1-supply = <&reg_aud4v>;
+               SPKVDD2-supply = <&reg_aud4v>;
+       };
+};
+

 &lcdif {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lcd>;
 &lcdif {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_lcd>;


@@ -274,6 +320,10 @@
        status = "okay";
 };
 
        status = "okay";
 };
 

+&ssi2 {
+       status = "okay";
+};
+

 &uart1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart1>;
 &uart1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_uart1>;


@@ -330,6 +380,22 @@
 };
 
 &iomuxc {
 };
 
 &iomuxc {

+       pinctrl_audmux3: audmux3grp {
+               fsl,pins = <
+                       MX6SLL_PAD_AUD_TXC__AUD3_TXC            0x4130b0
+                       MX6SLL_PAD_AUD_TXFS__AUD3_TXFS          0x4130b0
+                       MX6SLL_PAD_AUD_TXD__AUD3_TXD            0x4110b0
+                       MX6SLL_PAD_AUD_RXD__AUD3_RXD            0x4130b0
+                       MX6SLL_PAD_AUD_MCLK__AUDIO_CLK_OUT      0x4130b0
+               >;
+       };
+
+       pinctrl_hp: hpgrp {
+               fsl,pins = <
+                       MX6SLL_PAD_GPIO4_IO24__GPIO4_IO24 0x17059 /* HP DETECT */
+               >;
+       };
+

        pinctrl_reg_sd3_vmmc: sd3vmmcgrp {
                fsl,pins = <
                        MX6SLL_PAD_KEY_COL6__GPIO4_IO04 0x17059
        pinctrl_reg_sd3_vmmc: sd3vmmcgrp {
                fsl,pins = <
                        MX6SLL_PAD_KEY_COL6__GPIO4_IO04 0x17059


@@ -449,6 +515,13 @@
                >;
        };
 
                >;
        };
 

+       pinctrl_i2c3: i2c3grp {
+               fsl,pins = <
+                       MX6SLL_PAD_AUD_RXFS__I2C3_SCL  0x4041b8b1
+                       MX6SLL_PAD_AUD_RXC__I2C3_SDA   0x4041b8b1
+               >;
+       };
+

        pinctrl_lcd: lcdgrp {
                fsl,pins = <
                        MX6SLL_PAD_LCD_DATA00__LCD_DATA00       0x79
        pinctrl_lcd: lcdgrp {
                fsl,pins = <
                        MX6SLL_PAD_LCD_DATA00__LCD_DATA00       0x79