From: Adrien Grassein <adrien.grassein@gmail.com> To: unlisted-recipients:; (no To-header on input) Cc: krzk@kernel.org, robh+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, catalin.marinas@arm.com, will@kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Adrien Grassein <adrien.grassein@gmail.com> Subject: [PATCH v2 7/8] arm64: dts: imx8mm-nitrogen-r2: add audio Date: Wed, 17 Feb 2021 17:10:51 +0100 [thread overview] Message-ID: <20210217161052.877877-8-adrien.grassein@gmail.com> (raw) In-Reply-To: <20210217161052.877877-1-adrien.grassein@gmail.com> Add audio description and pin muxing. Signed-off-by: Adrien Grassein <adrien.grassein@gmail.com> --- .../boot/dts/freescale/imx8mm-nitrogen-r2.dts | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts b/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts index bdadc70acac6..6a90ef77b25b 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts @@ -28,6 +28,29 @@ reg_wlan_vmmc: regulator-wlan-vmmc { gpio = <&gpio3 20 GPIO_ACTIVE_HIGH>; enable-active-high; }; + + sound-wm8960 { + audio-cpu = <&sai1>; + audio-codec = <&wm8960>; + audio-routing = + "Headphone Jack", "HP_L", + "Headphone Jack", "HP_R", + "Ext Spk", "SPK_LP", + "Ext Spk", "SPK_LN", + "Ext Spk", "SPK_RP", + "Ext Spk", "SPK_RN", + "RINPUT1", "Mic Jack", + "Mic Jack", "MICB"; + codec-master; + compatible = "fsl,imx-audio-wm8960"; + /* JD2: hp detect high for headphone*/ + hp-det-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>; + /* Jack is not stuffed */ + mic-det-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + model = "wm8960-audio"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sound_wm8960>; + }; }; &A53_0 { @@ -211,6 +234,22 @@ rtc@68 { }; }; +&i2c4 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c4>; + status = "okay"; + + wm8960: codec@1a { + compatible = "wlf,wm8960"; + reg = <0x1a>; + clocks = <&clk IMX8MM_CLK_SAI1_ROOT>; + clock-names = "mclk1"; + wlf,shared-lrclk; + #sound-dai-cells = <0>; + }; +}; + &pwm1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm1>; @@ -238,6 +277,18 @@ &pwm4 { status = "okay"; }; +&sai1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai1>; + status = "okay"; +}; + +&sai2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai2>; + status = "okay"; +}; + /* BT */ &uart1 { pinctrl-names = "default"; @@ -406,6 +457,13 @@ MX8MM_IOMUXC_I2C3_SDA_I2C3_SDA 0x400001c3 >; }; + pinctrl_i2c4: i2c4grp { + fsl,pins = < + MX8MM_IOMUXC_I2C4_SCL_I2C4_SCL 0x400001c3 + MX8MM_IOMUXC_I2C4_SDA_I2C4_SDA 0x400001c3 + >; + }; + pinctrl_i2c3a_rv4162: i2c3a-rv4162grp { fsl,pins = < MX8MM_IOMUXC_SAI2_RXC_GPIO4_IO22 0x1c0 @@ -442,6 +500,34 @@ MX8MM_IOMUXC_SAI5_RXC_GPIO3_IO20 0x16 >; }; + pinctrl_sai1: sai1grp { + fsl,pins = < + /* wm8960 */ + MX8MM_IOMUXC_SAI1_MCLK_SAI1_MCLK 0xd6 + MX8MM_IOMUXC_SAI1_TXFS_SAI1_TX_SYNC 0xd6 + MX8MM_IOMUXC_SAI1_TXC_SAI1_TX_BCLK 0xd6 + MX8MM_IOMUXC_SAI1_TXD0_SAI1_TX_DATA0 0xd6 + MX8MM_IOMUXC_SAI1_RXD0_SAI1_RX_DATA0 0xd6 + >; + }; + + pinctrl_sai2: sai2grp { + fsl,pins = < + /* Bluetooth PCM */ + MX8MM_IOMUXC_SAI2_TXFS_SAI2_TX_SYNC 0xd6 + MX8MM_IOMUXC_SAI2_TXC_SAI2_TX_BCLK 0xd6 + MX8MM_IOMUXC_SAI2_TXD0_SAI2_TX_DATA0 0xd6 + MX8MM_IOMUXC_SAI2_RXD0_SAI2_RX_DATA0 0xd6 + >; + }; + + pinctrl_sound_wm8960: sound-wm8960grp { + fsl,pins = < + MX8MM_IOMUXC_GPIO1_IO10_GPIO1_IO10 0x80 + MX8MM_IOMUXC_SAI3_RXFS_GPIO4_IO28 0x80 + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX8MM_IOMUXC_UART1_RXD_UART1_DCE_RX 0x140 -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Adrien Grassein <adrien.grassein@gmail.com> Cc: devicetree@vger.kernel.org, will@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de, linux-kernel@vger.kernel.org, krzk@kernel.org, robh+dt@kernel.org, linux-imx@nxp.com, kernel@pengutronix.de, catalin.marinas@arm.com, festevam@gmail.com, linux-arm-kernel@lists.infradead.org, Adrien Grassein <adrien.grassein@gmail.com> Subject: [PATCH v2 7/8] arm64: dts: imx8mm-nitrogen-r2: add audio Date: Wed, 17 Feb 2021 17:10:51 +0100 [thread overview] Message-ID: <20210217161052.877877-8-adrien.grassein@gmail.com> (raw) In-Reply-To: <20210217161052.877877-1-adrien.grassein@gmail.com> Add audio description and pin muxing. Signed-off-by: Adrien Grassein <adrien.grassein@gmail.com> --- .../boot/dts/freescale/imx8mm-nitrogen-r2.dts | 86 +++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts b/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts index bdadc70acac6..6a90ef77b25b 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts +++ b/arch/arm64/boot/dts/freescale/imx8mm-nitrogen-r2.dts @@ -28,6 +28,29 @@ reg_wlan_vmmc: regulator-wlan-vmmc { gpio = <&gpio3 20 GPIO_ACTIVE_HIGH>; enable-active-high; }; + + sound-wm8960 { + audio-cpu = <&sai1>; + audio-codec = <&wm8960>; + audio-routing = + "Headphone Jack", "HP_L", + "Headphone Jack", "HP_R", + "Ext Spk", "SPK_LP", + "Ext Spk", "SPK_LN", + "Ext Spk", "SPK_RP", + "Ext Spk", "SPK_RN", + "RINPUT1", "Mic Jack", + "Mic Jack", "MICB"; + codec-master; + compatible = "fsl,imx-audio-wm8960"; + /* JD2: hp detect high for headphone*/ + hp-det-gpios = <&gpio4 28 GPIO_ACTIVE_HIGH>; + /* Jack is not stuffed */ + mic-det-gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; + model = "wm8960-audio"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sound_wm8960>; + }; }; &A53_0 { @@ -211,6 +234,22 @@ rtc@68 { }; }; +&i2c4 { + clock-frequency = <100000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c4>; + status = "okay"; + + wm8960: codec@1a { + compatible = "wlf,wm8960"; + reg = <0x1a>; + clocks = <&clk IMX8MM_CLK_SAI1_ROOT>; + clock-names = "mclk1"; + wlf,shared-lrclk; + #sound-dai-cells = <0>; + }; +}; + &pwm1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_pwm1>; @@ -238,6 +277,18 @@ &pwm4 { status = "okay"; }; +&sai1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai1>; + status = "okay"; +}; + +&sai2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_sai2>; + status = "okay"; +}; + /* BT */ &uart1 { pinctrl-names = "default"; @@ -406,6 +457,13 @@ MX8MM_IOMUXC_I2C3_SDA_I2C3_SDA 0x400001c3 >; }; + pinctrl_i2c4: i2c4grp { + fsl,pins = < + MX8MM_IOMUXC_I2C4_SCL_I2C4_SCL 0x400001c3 + MX8MM_IOMUXC_I2C4_SDA_I2C4_SDA 0x400001c3 + >; + }; + pinctrl_i2c3a_rv4162: i2c3a-rv4162grp { fsl,pins = < MX8MM_IOMUXC_SAI2_RXC_GPIO4_IO22 0x1c0 @@ -442,6 +500,34 @@ MX8MM_IOMUXC_SAI5_RXC_GPIO3_IO20 0x16 >; }; + pinctrl_sai1: sai1grp { + fsl,pins = < + /* wm8960 */ + MX8MM_IOMUXC_SAI1_MCLK_SAI1_MCLK 0xd6 + MX8MM_IOMUXC_SAI1_TXFS_SAI1_TX_SYNC 0xd6 + MX8MM_IOMUXC_SAI1_TXC_SAI1_TX_BCLK 0xd6 + MX8MM_IOMUXC_SAI1_TXD0_SAI1_TX_DATA0 0xd6 + MX8MM_IOMUXC_SAI1_RXD0_SAI1_RX_DATA0 0xd6 + >; + }; + + pinctrl_sai2: sai2grp { + fsl,pins = < + /* Bluetooth PCM */ + MX8MM_IOMUXC_SAI2_TXFS_SAI2_TX_SYNC 0xd6 + MX8MM_IOMUXC_SAI2_TXC_SAI2_TX_BCLK 0xd6 + MX8MM_IOMUXC_SAI2_TXD0_SAI2_TX_DATA0 0xd6 + MX8MM_IOMUXC_SAI2_RXD0_SAI2_RX_DATA0 0xd6 + >; + }; + + pinctrl_sound_wm8960: sound-wm8960grp { + fsl,pins = < + MX8MM_IOMUXC_GPIO1_IO10_GPIO1_IO10 0x80 + MX8MM_IOMUXC_SAI3_RXFS_GPIO4_IO28 0x80 + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX8MM_IOMUXC_UART1_RXD_UART1_DCE_RX 0x140 -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-02-17 16:14 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-02-17 16:10 [PATCH v2 0/8] Add peripheral support for imx8mm-nitrogen-r2 board Adrien Grassein 2021-02-17 16:10 ` Adrien Grassein 2021-02-17 16:10 ` [PATCH v2 1/8] arm64: dts: imx8mm-nitrogen-r2: add wifi/bt chip Adrien Grassein 2021-02-17 16:10 ` Adrien Grassein 2021-02-19 13:18 ` Krzysztof Kozlowski 2021-02-19 13:18 ` Krzysztof Kozlowski 2021-02-19 14:03 ` Adrien Grassein 2021-02-19 14:03 ` Adrien Grassein 2021-02-20 19:19 ` Krzysztof Kozlowski 2021-02-20 19:19 ` Krzysztof Kozlowski 2021-02-21 23:46 ` Adrien Grassein 2021-02-21 23:46 ` Adrien Grassein 2021-02-22 18:40 ` Krzysztof Kozlowski 2021-02-22 18:40 ` Krzysztof Kozlowski 2021-02-23 10:44 ` Adrien Grassein 2021-02-23 10:44 ` Adrien Grassein 2021-02-23 19:03 ` Krzysztof Kozlowski 2021-02-23 19:03 ` Krzysztof Kozlowski 2021-02-17 16:10 ` [PATCH v2 2/8] arm64: dts: imx8mm-nitrogen-r2: add USB support Adrien Grassein 2021-02-17 16:10 ` Adrien Grassein 2021-02-17 16:10 ` [PATCH v2 3/8] arm64: dts: imx8mm-nitrogen-r2: add espi2 support Adrien Grassein 2021-02-17 16:10 ` Adrien Grassein 2021-02-19 13:19 ` Krzysztof Kozlowski 2021-02-19 13:19 ` Krzysztof Kozlowski 2021-02-19 14:02 ` Adrien Grassein 2021-02-19 14:02 ` Adrien Grassein 2021-02-20 19:20 ` Krzysztof Kozlowski 2021-02-20 19:20 ` Krzysztof Kozlowski 2021-02-17 16:10 ` [PATCH v2 4/8] arm64: dts: imx8mm-nitrogen-r2: add UARTs Adrien Grassein 2021-02-17 16:10 ` Adrien Grassein 2021-02-19 13:20 ` Krzysztof Kozlowski 2021-02-19 13:20 ` Krzysztof Kozlowski 2021-02-17 16:10 ` [PATCH v2 5/8] arm64: dts: imx8mm-nitrogen-r2: add PWMs Adrien Grassein 2021-02-17 16:10 ` Adrien Grassein 2021-02-17 16:10 ` [PATCH v2 6/8] arm64: dts: imx8mm-nitrogen-r2: add FlexSPI Adrien Grassein 2021-02-17 16:10 ` Adrien Grassein 2021-02-17 16:10 ` Adrien Grassein [this message] 2021-02-17 16:10 ` [PATCH v2 7/8] arm64: dts: imx8mm-nitrogen-r2: add audio Adrien Grassein 2021-02-17 16:10 ` [PATCH v2 8/8] arm64: defconfig: Enable wm8960 audio driver Adrien Grassein 2021-02-17 16:10 ` Adrien Grassein
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210217161052.877877-8-adrien.grassein@gmail.com \ --to=adrien.grassein@gmail.com \ --cc=catalin.marinas@arm.com \ --cc=devicetree@vger.kernel.org \ --cc=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=krzk@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=robh+dt@kernel.org \ --cc=s.hauer@pengutronix.de \ --cc=shawnguo@kernel.org \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.