Add audio support for imx6sx platform
Subsystems (3)
cover Add audio support for imx6sx platform
Add audio support for imx6sx platform.
Enable ASRC, ESAI, SPDIF, MQS.
Shengjiu Wang (5):
ARM: dts: imx6sx: Enable ASRC device
ARM: dts: imx6sx-sdb: Add MQS support
ARM: dts: imx6sx-sdb: Add SPDIF support
ARM: dts: imx6sx-sabreauto: Add SPDIF support
ARM: dts: imx6sx-sabreauto: Add cs42888 sound card support
arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx6sx-sabreauto.dts | 96 ++++++++++++++++++++++++++ arch/arm/boot/dts/imx6sx-sdb-mqs.dts | 48 +++++++++++++ arch/arm/boot/dts/imx6sx-sdb.dtsi | 30 ++++++++ arch/arm/boot/dts/imx6sx.dtsi | 36 +++++++--- 5 files changed, 203 insertions(+), 8 deletions(-) create mode 100644 arch/arm/boot/dts/imx6sx-sdb-mqs.dts
Signature · 1 line
2.21.0
PATCH 1/5 ARM: dts: imx6sx: Enable ASRC device
Add compatible string, update the clock table,
add fsl,asrc-rate and fsl,asrc-width property.
--- arch/arm/boot/dts/imx6sx.dtsi | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-)
arch/arm/boot/dts/imx6sx.dtsi +18 -8
@@ -390,18 +390,28 @@ }; asrc: asrc@2034000 { + compatible = "fsl,imx6sx-asrc", "fsl,imx53-asrc"; reg = <0x02034000 0x4000>; interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&clks IMX6SX_CLK_ASRC_MEM>, - <&clks IMX6SX_CLK_ASRC_IPG>, - <&clks IMX6SX_CLK_SPDIF>, - <&clks IMX6SX_CLK_SPBA>; - clock-names = "mem", "ipg", "asrck", "spba"; - dmas = <&sdma 17 20 1>, <&sdma 18 20 1>, - <&sdma 19 20 1>, <&sdma 20 20 1>, - <&sdma 21 20 1>, <&sdma 22 20 1>; + clocks = <&clks IMX6SX_CLK_ASRC_IPG>, + <&clks IMX6SX_CLK_ASRC_MEM>, <&clks 0>, + <&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>, + <&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>, + <&clks 0>, <&clks 0>, <&clks 0>, <&clks 0>, + <&clks IMX6SX_CLK_SPDIF>, <&clks 0>, <&clks 0>, + <&clks IMX6SX_CLK_SPBA>; + clock-names = "mem", "ipg", "asrck_0", + "asrck_1", "asrck_2", "asrck_3", "asrck_4", + "asrck_5", "asrck_6", "asrck_7", "asrck_8", + "asrck_9", "asrck_a", "asrck_b", "asrck_c", + "asrck_d", "asrck_e", "asrck_f", "spba"; + dmas = <&sdma 17 23 1>, <&sdma 18 23 1>, + <&sdma 19 23 1>, <&sdma 20 23 1>, + <&sdma 21 23 1>, <&sdma 22 23 1>; dma-names = "rxa", "rxb", "rxc", "txa", "txb", "txc"; + fsl,asrc-rate = <48000>; + fsl,asrc-width = <16>; status = "okay"; }; };
Signature · 1 line
2.21.0
PATCH 4/5 ARM: dts: imx6sx-sabreauto: Add SPDIF support
In reply to Shengjiu WangAdd SPDIF support.
--- arch/arm/boot/dts/imx6sx-sabreauto.dts | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/arm/boot/dts/imx6sx-sabreauto.dts +21 -0
@@ -66,6 +66,13 @@ enable-active-high; vin-supply = <®_can_en>; }; + + sound-spdif { + compatible = "fsl,imx-audio-spdif"; + model = "imx-spdif"; + spdif-controller = <&spdif>; + spdif-in; + }; }; &anaclk2 {
@@ -227,6 +234,12 @@ >; }; + pinctrl_spdif: spdifgrp { + fsl,pins = < + MX6SX_PAD_ENET2_COL__SPDIF_IN 0x1b0b0 + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX6SX_PAD_GPIO1_IO04__UART1_DCE_TX 0x1b0b1
@@ -454,6 +467,14 @@ }; }; +&spdif { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spdif>; + assigned-clocks = <&clks IMX6SX_CLK_SPDIF_PODF>; + assigned-clock-rates = <24576000>; + status = "okay"; +}; + &wdog1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_wdog>;
Signature · 1 line
2.21.0
PATCH 3/5 ARM: dts: imx6sx-sdb: Add SPDIF support
In reply to Shengjiu WangAdd SPDIF support.
--- arch/arm/boot/dts/imx6sx-sdb.dtsi | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
arch/arm/boot/dts/imx6sx-sdb.dtsi +23 -0
@@ -179,6 +179,15 @@ }; }; }; + + sound-spdif { + compatible = "fsl,imx-audio-spdif", + "fsl,imx6sx-sdb-spdif"; + model = "imx-spdif"; + spdif-controller = <&spdif>; + spdif-out; + }; + }; &audmux {
@@ -296,6 +305,14 @@ status = "disabled"; }; +&spdif { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spdif>; + assigned-clocks = <&clks IMX6SX_CLK_SPDIF_PODF>; + assigned-clock-rates = <24576000>; + status = "okay"; +}; + &ssi2 { status = "okay"; };
@@ -569,6 +586,12 @@ >; }; + pinctrl_spdif: spdifgrp { + fsl,pins = < + MX6SX_PAD_SD4_DATA4__SPDIF_OUT 0x1b0b0 + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX6SX_PAD_GPIO1_IO04__UART1_DCE_TX 0x1b0b1
Signature · 1 line
2.21.0
PATCH 2/5 ARM: dts: imx6sx-sdb: Add MQS support
In reply to Shengjiu WangAdd MQS support. As the pin conflict with usdhc2, then need to add a separate dts.
--- arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx6sx-sdb-mqs.dts | 48 ++++++++++++++++++++++++++++ arch/arm/boot/dts/imx6sx-sdb.dtsi | 7 ++++ arch/arm/boot/dts/imx6sx.dtsi | 6 ++++ 4 files changed, 62 insertions(+) create mode 100644 arch/arm/boot/dts/imx6sx-sdb-mqs.dts
arch/arm/boot/dts/Makefile +1 -0
@@ -592,6 +592,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \ imx6sx-sdb-reva.dtb \ imx6sx-sdb-sai.dtb \ imx6sx-sdb.dtb \ + imx6sx-sdb-mqs.dtb \ imx6sx-softing-vining-2000.dtb \ imx6sx-udoo-neo-basic.dtb \ imx6sx-udoo-neo-extended.dtb \
arch/arm/boot/dts/imx6sx-sdb-mqs.dts new file +48 -0
48 lines not on this page · raw message
arch/arm/boot/dts/imx6sx-sdb.dtsi +7 -0
@@ -450,6 +450,13 @@ >; }; + pinctrl_mqs: mqsgrp { + fsl,pins = < + MX6SX_PAD_SD2_CLK__MQS_RIGHT 0x120b0 + MX6SX_PAD_SD2_CMD__MQS_LEFT 0x120b0 + >; + }; + pinctrl_i2c1: i2c1grp { fsl,pins = < MX6SX_PAD_GPIO1_IO01__I2C1_SDA 0x4001b8b1
arch/arm/boot/dts/imx6sx.dtsi +6 -0
@@ -134,6 +134,12 @@ clock-output-names = "anaclk2"; }; + mqs: mqs { + compatible = "fsl,imx6sx-mqs"; + gpr = <&gpr>; + status = "disabled"; + }; + tempmon: tempmon { compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon"; interrupt-parent = <&gpc>;
Signature · 1 line
2.21.0
PATCH 5/5 ARM: dts: imx6sx-sabreauto: Add cs42888 sound card support
In reply to Shengjiu WangComplete the ESAI node and Add cs42888 sound card support.
--- arch/arm/boot/dts/imx6sx-sabreauto.dts | 75 ++++++++++++++++++++++++++ arch/arm/boot/dts/imx6sx.dtsi | 4 ++ 2 files changed, 79 insertions(+)
arch/arm/boot/dts/imx6sx-sabreauto.dts +75 -0
@@ -67,6 +67,36 @@ vin-supply = <®_can_en>; }; + reg_cs42888: cs42888_supply { + compatible = "regulator-fixed"; + regulator-name = "cs42888_supply"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + + sound-cs42888 { + compatible = "fsl,imx6-sabreauto-cs42888", + "fsl,imx-audio-cs42888"; + model = "imx-cs42888"; + audio-cpu = <&esai>; + audio-asrc = <&asrc>; + audio-codec = <&cs42888>; + audio-routing = + "Line Out Jack", "AOUT1L", + "Line Out Jack", "AOUT1R", + "Line Out Jack", "AOUT2L", + "Line Out Jack", "AOUT2R", + "Line Out Jack", "AOUT3L", + "Line Out Jack", "AOUT3R", + "Line Out Jack", "AOUT4L", + "Line Out Jack", "AOUT4R", + "AIN1L", "Line In Jack", + "AIN1R", "Line In Jack", + "AIN2L", "Line In Jack", + "AIN2R", "Line In Jack"; + }; + sound-spdif { compatible = "fsl,imx-audio-spdif"; model = "imx-spdif";
@@ -79,6 +109,25 @@ clock-frequency = <24576000>; }; +&clks { + assigned-clocks = <&clks IMX6SX_PLL4_BYPASS_SRC>, + <&clks IMX6SX_PLL4_BYPASS>, + <&clks IMX6SX_CLK_PLL4_POST_DIV>; + assigned-clock-parents = <&clks IMX6SX_CLK_LVDS2_IN>, + <&clks IMX6SX_PLL4_BYPASS_SRC>; + assigned-clock-rates = <0>, <0>, <24576000>; +}; + +&esai { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_esai>; + assigned-clocks = <&clks IMX6SX_CLK_ESAI_SEL>, + <&clks IMX6SX_CLK_ESAI_EXTAL>; + assigned-clock-parents = <&clks IMX6SX_CLK_PLL4_AUDIO_DIV>; + assigned-clock-rates = <0>, <24576000>; + status = "okay"; +}; + &fec1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_enet1>;
@@ -200,6 +249,21 @@ >; }; + pinctrl_esai: esaigrp { + fsl,pins = < + MX6SX_PAD_CSI_DATA00__ESAI_TX_CLK 0x1b030 + MX6SX_PAD_CSI_DATA01__ESAI_TX_FS 0x1b030 + MX6SX_PAD_CSI_HSYNC__ESAI_TX0 0x1b030 + MX6SX_PAD_CSI_DATA04__ESAI_TX1 0x1b030 + MX6SX_PAD_CSI_DATA06__ESAI_TX2_RX3 0x1b030 + MX6SX_PAD_CSI_DATA07__ESAI_TX3_RX2 0x1b030 + MX6SX_PAD_CSI_DATA02__ESAI_RX_CLK 0x1b030 + MX6SX_PAD_CSI_DATA03__ESAI_RX_FS 0x1b030 + MX6SX_PAD_CSI_VSYNC__ESAI_TX5_RX0 0x1b030 + MX6SX_PAD_CSI_DATA05__ESAI_TX4_RX1 0x1b030 + >; + }; + pinctrl_flexcan1: flexcan1grp { fsl,pins = < MX6SX_PAD_QSPI1B_DQS__CAN1_TX 0x1b020
@@ -326,6 +390,17 @@ pinctrl-0 = <&pinctrl_i2c2>; status = "okay"; + cs42888: cs42888@48 { + compatible = "cirrus,cs42888"; + reg = <0x48>; + clocks = <&anaclk2 0>; + clock-names = "mclk"; + VA-supply = <®_cs42888>; + VD-supply = <®_cs42888>; + VLS-supply = <®_cs42888>; + VLC-supply = <®_cs42888>; + }; + touchscreen@4 { compatible = "eeti,egalax_ts"; reg = <0x04>;
arch/arm/boot/dts/imx6sx.dtsi +4 -0
@@ -341,6 +341,7 @@ }; esai: esai@2024000 { + compatible = "fsl,imx6sx-esai", "fsl,imx35-esai"; reg = <0x02024000 0x4000>; interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6SX_CLK_ESAI_IPG>,
@@ -350,6 +351,9 @@ <&clks IMX6SX_CLK_SPBA>; clock-names = "core", "mem", "extal", "fsys", "spba"; + dmas = <&sdma 23 21 0>, + <&sdma 24 21 0>; + dma-names = "rx", "tx"; status = "disabled"; };
Signature · 1 line
2.21.0
Shawn Guo
AppliedQuoted 6 lines · Shengjiu Wang
Add audio support for imx6sx platform.
Enable ASRC, ESAI, SPDIF, MQS.Shengjiu Wang (5):
ARM: dts: imx6sx: Enable ASRC device
ARM: dts: imx6sx-sdb: Add MQS support
Applied the series, except this one which doesn't apply to my branch.
Shawn
Quoted 15 lines
ARM: dts: imx6sx-sdb: Add SPDIF support
ARM: dts: imx6sx-sabreauto: Add SPDIF support
ARM: dts: imx6sx-sabreauto: Add cs42888 sound card supportarch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/imx6sx-sabreauto.dts | 96 ++++++++++++++++++++++++++ arch/arm/boot/dts/imx6sx-sdb-mqs.dts | 48 +++++++++++++ arch/arm/boot/dts/imx6sx-sdb.dtsi | 30 ++++++++ arch/arm/boot/dts/imx6sx.dtsi | 36 +++++++--- 5 files changed, 203 insertions(+), 8 deletions(-) create mode 100644 arch/arm/boot/dts/imx6sx-sdb-mqs.dtsSignature · 1 line
2.21.0