diff options
| author | Shengjiu Wang <shengjiu.wang@freescale.com> | 2016-05-11 16:34:38 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | 5df7b2bf4c987f74c7b9c95e93c185761ee47afb (patch) | |
| tree | 7b0f0feec3dfff17d1f6b7ae806ffcf3b64ab663 /arch/arm/boot/dts | |
| parent | c6debd830d7e0e2dc7710ebf48d50bf2b156e3df (diff) | |
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>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-cs42888.dts | 73 |
1 files changed, 73 insertions, 0 deletions
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 a75fb1d5847f..d1ff7d8d8746 100644 --- 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 = <®_audio>; VLC-supply = <®_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 = <®_aud_1v8>; + DBVDD2-supply = <®_aud_1v8>; + DBVDD3-supply = <®_aud_3v3>; + AVDD2-supply = <®_aud_1v8>; + CPVDD-supply = <®_aud_1v8>; + SPKVDD1-supply = <®_codec_5v>; + SPKVDD2-supply = <®_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"; +}; |