diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-11-23 12:29:57 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-11-25 10:44:03 +0100 |
| commit | 08162aa7d3b9d2a649cc8aec1c1cb64b54e211ef (patch) | |
| tree | 356ca75dfbeb01574990a9fbf57276f823ac1789 | |
| parent | 3c8514d86713a8a17dc269d881d3355154227876 (diff) | |
arm64: dts: imx8mp-verdin: correct audio codec mclk clk
Use the correct clk as the mclk.
Additionally set the mux pad values to a more sensible value, i.e.
for inputs enable the pullup.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rwxr-xr-x | arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi index f68baf658f4d..6aefaece482e 100755 --- a/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi @@ -136,6 +136,7 @@ dailink_master: simple-audio-card,codec { sound-dai = <&wm8904_1a>; + clocks = <&audiomix_clk IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1>; }; simple-audio-card,cpu { @@ -524,7 +525,7 @@ wm8904_1a: codec@1a { compatible = "wlf,wm8904"; #sound-dai-cells = <0>; - clocks = <&clk IMX8MP_CLK_SAI2>; + clocks = <&audiomix_clk IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1>; clock-names = "mclk"; reg = <0x1a>; status = "disabled"; @@ -643,7 +644,7 @@ #sound-dai-cells = <0>; assigned-clocks = <&clk IMX8MP_CLK_SAI3>; assigned-clock-parents = <&clk IMX8MP_AUDIO_PLL1_OUT>; - assigned-clock-rates = <12288000>; + assigned-clock-rates = <24576000>; clocks = <&audiomix_clk IMX8MP_CLK_AUDIOMIX_SAI3_IPG>, <&clk IMX8MP_CLK_DUMMY>, <&audiomix_clk IMX8MP_CLK_AUDIOMIX_SAI3_MCLK1>, <&clk IMX8MP_CLK_DUMMY>, <&clk IMX8MP_CLK_DUMMY>; @@ -1111,20 +1112,20 @@ pinctrl_sai1: sai1grp { fsl,pins = < - MX8MP_IOMUXC_SAI5_RXD1__AUDIOMIX_SAI1_TX_SYNC 0xd6 /* SODIMM 32 */ - MX8MP_IOMUXC_SAI5_MCLK__AUDIOMIX_SAI1_TX_BCLK 0xd6 /* SODIMM 30 */ - MX8MP_IOMUXC_SAI1_MCLK__AUDIOMIX_SAI1_MCLK 0xd6 /* SODIMM 38 */ - MX8MP_IOMUXC_SAI1_RXD0__AUDIOMIX_SAI1_RX_DATA00 0xd6 /* SODIMM 36 */ - MX8MP_IOMUXC_SAI5_RXFS__AUDIOMIX_SAI1_TX_DATA00 0xd6 /* SODIMM 34 */ + MX8MP_IOMUXC_SAI5_RXD1__AUDIOMIX_SAI1_TX_SYNC 0x1d6 /* SODIMM 32 */ + MX8MP_IOMUXC_SAI5_MCLK__AUDIOMIX_SAI1_TX_BCLK 0x1d6 /* SODIMM 30 */ + MX8MP_IOMUXC_SAI1_MCLK__AUDIOMIX_SAI1_MCLK 0x96 /* SODIMM 38 */ + MX8MP_IOMUXC_SAI1_RXD0__AUDIOMIX_SAI1_RX_DATA00 0x1d6 /* SODIMM 36 */ + MX8MP_IOMUXC_SAI5_RXFS__AUDIOMIX_SAI1_TX_DATA00 0x96 /* SODIMM 34 */ >; }; pinctrl_sai3: sai3grp { fsl,pins = < - MX8MP_IOMUXC_SAI3_RXD__AUDIOMIX_SAI3_RX_DATA00 0xd6 /* SODIMM 48 */ - MX8MP_IOMUXC_SAI3_TXFS__AUDIOMIX_SAI3_TX_SYNC 0xd6 /* SODIMM 44 */ - MX8MP_IOMUXC_SAI3_TXC__AUDIOMIX_SAI3_TX_BCLK 0xd6 /* SODIMM 42 */ - MX8MP_IOMUXC_SAI3_TXD__AUDIOMIX_SAI3_TX_DATA00 0xd6 /* SODIMM 46 */ + MX8MP_IOMUXC_SAI3_RXD__AUDIOMIX_SAI3_RX_DATA00 0x1d6 /* SODIMM 48 */ + MX8MP_IOMUXC_SAI3_TXFS__AUDIOMIX_SAI3_TX_SYNC 0x1d6 /* SODIMM 44 */ + MX8MP_IOMUXC_SAI3_TXC__AUDIOMIX_SAI3_TX_BCLK 0x1d6 /* SODIMM 42 */ + MX8MP_IOMUXC_SAI3_TXD__AUDIOMIX_SAI3_TX_DATA00 0x96 /* SODIMM 46 */ >; }; @@ -1313,10 +1314,10 @@ pinctrl_wifi_i2s: bti2sgrp { fsl,pins = < - MX8MP_IOMUXC_SAI5_RXD2__AUDIOMIX_SAI5_TX_BCLK 0xd6 /* WIFI_TX_BCLK */ - MX8MP_IOMUXC_SAI5_RXD0__AUDIOMIX_SAI5_RX_DATA00 0xd6 /* WIFI_TX_DATA0 */ - MX8MP_IOMUXC_SAI2_RXFS__AUDIOMIX_SAI5_TX_SYNC 0xd6 /* WIFI_TX_SYNC */ - MX8MP_IOMUXC_SAI5_RXD3__AUDIOMIX_SAI5_TX_DATA00 0xd6 /* WIFI_RX_DATA0 */ + MX8MP_IOMUXC_SAI5_RXD2__AUDIOMIX_SAI5_TX_BCLK 0x1d6 /* WIFI_TX_BCLK */ + MX8MP_IOMUXC_SAI5_RXD0__AUDIOMIX_SAI5_RX_DATA00 0x1d6 /* WIFI_TX_DATA0 */ + MX8MP_IOMUXC_SAI2_RXFS__AUDIOMIX_SAI5_TX_SYNC 0x1d6 /* WIFI_TX_SYNC */ + MX8MP_IOMUXC_SAI5_RXD3__AUDIOMIX_SAI5_TX_DATA00 0x96 /* WIFI_RX_DATA0 */ >; }; |