MLK-12782: ARM: dts: Add wm8958 sound card in imx6ull-ddr3-arm2-cs42888 dts

Add wm8958 sound card in cs42888 dts, SAI2 conflict with SD1.
So disable usdhc1.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

diff --git a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-cs42888.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-cs42888.dts
index 3be079d..cfcb2c7 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-cs42888.dts
+++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-cs42888.dts
@@ -29,6 +29,30 @@
                        regulator-max-microvolt = <3300000>;
                        regulator-always-on;
                };
+
+               reg_codec_5v: codec_5v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "CODEC_5V";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       enable-active-high;
+               };
+
+               reg_aud_3v3: aud_3v3 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "AUD_3V3";
+                       regulator-min-microvolt = <3300000>;
+                       regulator-max-microvolt = <3300000>;
+                       enable-active-high;
+               };
+
+               reg_aud_1v8: aud_1v8 {
+                       compatible = "regulator-fixed";
+                       regulator-name = "AUD_1V8";
+                       regulator-min-microvolt = <1800000>;
+                       regulator-max-microvolt = <1800000>;
+                       enable-active-high;
+               };
        };
 
        sound-cs42888 {
@@ -40,6 +64,22 @@
                audio-codec = <&codec_a>;
                codec-master;
        };
+
+       sound-wm8958 {
+               compatible = "fsl,imx6ul-ddr3-arm2-wm8958",
+                          "fsl,imx-audio-wm8958";
+               model = "wm8958-audio";
+               cpu-dai = <&sai2>;
+               audio-codec = <&codec_b>;
+               codec-master;
+               gpr = <&gpr>;
+               hp-det-gpios = <&gpio5 0 1>;
+       };
+};
+
+&clks {
+       assigned-clocks = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
+       assigned-clock-rates = <786432000>;
 };
 
 &esai {
@@ -68,6 +108,25 @@
                VLS-supply = <&reg_audio>;
                VLC-supply = <&reg_audio>;
        };
+
+       codec_b: wm8958@1a {
+               compatible = "wlf,wm8958";
+               reg = <0x1a>;
+               clocks = <&clks IMX6UL_CLK_SAI2>,
+                      <&clks IMX6UL_CLK_DUMMY>;
+               clock-names = "mclk1", "mclk2";
+
+               DBVDD1-supply = <&reg_aud_1v8>;
+               DBVDD2-supply = <&reg_aud_1v8>;
+               DBVDD3-supply = <&reg_aud_3v3>;
+               AVDD2-supply = <&reg_aud_1v8>;
+               CPVDD-supply = <&reg_aud_1v8>;
+               SPKVDD1-supply = <&reg_codec_5v>;
+               SPKVDD2-supply = <&reg_codec_5v>;
+
+               wlf,ldo1ena;
+               wlf,ldo2ena;
+       };
 };
 
 &iomuxc {
@@ -79,6 +138,16 @@
        status = "disabled";
 };
 
+&sai2 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_sai2>;
+       assigned-clocks = <&clks IMX6UL_CLK_SAI2_SEL>,
+                       <&clks IMX6UL_CLK_SAI2>;
+       assigned-clock-parents = <&clks IMX6UL_CLK_PLL4_AUDIO_DIV>;
+       assigned-clock-rates = <0>, <24576000>;
+       status = "okay";
+};
+
 &sdma {
        gpr = <&gpr>;
        /* SDMA event remap for ESAI */
@@ -88,3 +157,7 @@
 &uart2 {
        status = "disabled";
 };
+
+&usdhc1 {
+       status = "disabled";
+};