From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 13195C43603 for ; Mon, 9 Dec 2019 07:48:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D055E20721 for ; Mon, 9 Dec 2019 07:48:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575877730; bh=d1Pp4Lr9cGlyispGinW/IqgmD5e80dpxTxb0aexWs6Y=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=0fi7LBfzQgoL1JdrUp5VEIyDW79QpyJECXHvBinoyJsK3PWf/sIMEI8julFTitIOs 4WelttzakX9HsAXLvucHDwv0ZRomVxzDeEaLVeU2IjJpTmiFVXPqCSyzqNfo7hd7gl JyllxN94MjAjO6W4WueZpDoudXqZHJu3nKHLaiV0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727163AbfLIHsu (ORCPT ); Mon, 9 Dec 2019 02:48:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:40846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727143AbfLIHsu (ORCPT ); Mon, 9 Dec 2019 02:48:50 -0500 Received: from dragon (98.142.130.235.16clouds.com [98.142.130.235]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 536412071E; Mon, 9 Dec 2019 07:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575877728; bh=d1Pp4Lr9cGlyispGinW/IqgmD5e80dpxTxb0aexWs6Y=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=iWSdOOi19LvM2r2yRbISglvojY+VJzc8YAI+HvFIDpcF1bpaa2EdxfSBuC0G0QYYM DLE01JMRi5opdMr6lrsyKgD0AFgkwHX8YM+C1txtuFK7O+cIEoxUO7Ut/wDKOJ0IF2 SJoa93nODtje/ESHouQGQqQu9qDBPD6g0ABXp6KA= Date: Mon, 9 Dec 2019 15:48:29 +0800 From: Shawn Guo To: Lucas Stach Cc: Fabio Estevam , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, NXP Linux Team , Rob Herring , kernel@pengutronix.de, patchwork-lst@pengutronix.de Subject: Re: [PATCH 2/2] arm64: dts: zii-ultra: add sound support Message-ID: <20191209074828.GH3365@dragon> References: <20191127182127.1204-1-l.stach@pengutronix.de> <20191127182127.1204-2-l.stach@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191127182127.1204-2-l.stach@pengutronix.de> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Wed, Nov 27, 2019 at 07:21:27PM +0100, Lucas Stach wrote: > This adds all the necessary device nodes to get audio support on both the > RMB3 and Zest boards. > > Signed-off-by: Lucas Stach > --- > .../dts/freescale/imx8mq-zii-ultra-rmb3.dts | 87 ++++++++++++++++ > .../dts/freescale/imx8mq-zii-ultra-zest.dts | 30 ++++++ > .../boot/dts/freescale/imx8mq-zii-ultra.dtsi | 98 +++++++++++++++++++ > 3 files changed, 215 insertions(+) > > diff --git a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts > index 6b3581366d67..d5e06885c683 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts > +++ b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts > @@ -10,6 +10,56 @@ > / { > model = "ZII Ultra RMB3 Board"; > compatible = "zii,imx8mq-ultra-rmb3", "zii,imx8mq-ultra", "fsl,imx8mq"; > + > + sound1 { > + compatible = "simple-audio-card"; > + simple-audio-card,name = "RMB3 audio front"; > + simple-audio-card,format = "i2s"; > + simple-audio-card,bitclock-master = <&sound1_codec>; > + simple-audio-card,frame-master = <&sound1_codec>; > + simple-audio-card,widgets = > + "Headphone", "Headphone Jack Front"; > + simple-audio-card,routing = > + "Headphone Jack Front", "HPA1 HPLEFT", > + "Headphone Jack Front", "HPA1 HPRIGHT", > + "HPA1 LEFTIN", "HPL", > + "HPA1 RIGHTIN", "HPR"; > + simple-audio-card,aux-devs = <&hpa1>; > + > + sound1_cpu: simple-audio-card,cpu { > + sound-dai = <&sai2>; > + }; > + > + sound1_codec: simple-audio-card,codec { > + sound-dai = <&codec1>; > + clocks = <&cs2000>; > + }; > + }; > + > + sound2 { > + compatible = "simple-audio-card"; > + simple-audio-card,name = "RMB3 audio back"; > + simple-audio-card,format = "i2s"; > + simple-audio-card,bitclock-master = <&sound2_codec>; > + simple-audio-card,frame-master = <&sound2_codec>; > + simple-audio-card,widgets = > + "Headphone", "Headphone Jack Back"; > + simple-audio-card,routing = > + "Headphone Jack Back", "HPA2 HPLEFT", > + "Headphone Jack Back", "HPA2 HPRIGHT", > + "HPA2 LEFTIN", "HPL", > + "HPA2 RIGHTIN", "HPR"; > + simple-audio-card,aux-devs = <&hpa2>; > + > + sound2_cpu: simple-audio-card,cpu { > + sound-dai = <&sai3>; > + }; > + > + sound2_codec: simple-audio-card,codec { > + sound-dai = <&codec2>; > + clocks = <&cs2000>; > + }; > + }; > }; > > &ecspi1 { > @@ -27,6 +77,23 @@ > }; > }; > > +&i2c1 { > + codec2: codec@18 { > + compatible = "ti,tlv320dac3100"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_codec2>; > + reg = <0x18>; > + #sound-dai-cells = <0>; > + HPVDD-supply = <®_3p3v>; > + SPRVDD-supply = <®_3p3v>; > + SPLVDD-supply = <®_3p3v>; > + AVDD-supply = <®_3p3v>; > + IOVDD-supply = <®_3p3v>; > + DVDD-supply = <&vgen4_reg>; > + gpio-reset = <&gpio3 4 GPIO_ACTIVE_HIGH>; This property is deprecated. Shawn > + }; > +}; > + > &i2c2 { > temp-sense@48 { > compatible = "national,lm75"; > @@ -79,11 +146,23 @@ > }; > }; > > +&sai3 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_sai3>; > + status = "okay"; > +}; > + > &usbhub { > swap-dx-lanes = <0>; > }; > > &iomuxc { > + pinctrl_codec2: dac2grp { > + fsl,pins = < > + MX8MQ_IOMUXC_NAND_CE3_B_GPIO3_IO4 0x41 > + >; > + }; > + > pinctrl_ecspi1: ecspi1grp { > fsl,pins = < > MX8MQ_IOMUXC_ECSPI1_SS0_GPIO5_IO9 0x19 > @@ -92,4 +171,12 @@ > MX8MQ_IOMUXC_ECSPI1_MOSI_ECSPI1_MOSI 0x82 > >; > }; > + > + pinctrl_sai3: sai3grp { > + fsl,pins = < > + MX8MQ_IOMUXC_SAI3_TXFS_SAI3_TX_SYNC 0xd6 > + MX8MQ_IOMUXC_SAI3_TXC_SAI3_TX_BCLK 0xd6 > + MX8MQ_IOMUXC_SAI3_TXD_SAI3_TX_DATA0 0xd6 > + >; > + }; > }; > diff --git a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-zest.dts b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-zest.dts > index 173b9e9b2bbd..cf8cdc5935c6 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-zest.dts > +++ b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-zest.dts > @@ -10,6 +10,36 @@ > / { > model = "ZII Ultra Zest Board"; > compatible = "zii,imx8mq-ultra-zest", "zii,imx8mq-ultra", "fsl,imx8mq"; > + > + sound { > + compatible = "simple-audio-card"; > + simple-audio-card,name = "Zest audio"; > + simple-audio-card,format = "i2s"; > + simple-audio-card,bitclock-master = <&sound_codec>; > + simple-audio-card,frame-master = <&sound_codec>; > + simple-audio-card,widgets = > + "Headphone", "Headphone Jack Front", > + "Headphone", "Headphone Jack Back"; > + simple-audio-card,routing = > + "Headphone Jack Front", "HPA1 HPLEFT", > + "Headphone Jack Front", "HPA1 HPRIGHT", > + "Headphone Jack Back", "HPA2 HPLEFT", > + "Headphone Jack Back", "HPA2 HPRIGHT", > + "HPA1 LEFTIN", "HPL", > + "HPA1 RIGHTIN", "HPR", > + "HPA2 LEFTIN", "HPL", > + "HPA2 RIGHTIN", "HPR"; > + simple-audio-card,aux-devs = <&hpa1>, <&hpa2>; > + > + sound_cpu: simple-audio-card,cpu { > + sound-dai = <&sai2>; > + }; > + > + sound_codec: simple-audio-card,codec { > + sound-dai = <&codec1>; > + clocks = <&cs2000>; > + }; > + }; > }; > > &i2c4 { > diff --git a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi > index 32ce14936b01..c6a57dfe3ea9 100644 > --- a/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi > +++ b/arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi > @@ -68,6 +68,15 @@ > regulator-always-on; > }; > > + reg_3p3v: regulator-3p3v { > + compatible = "regulator-fixed"; > + vin-supply = <®_3p3_main>; > + regulator-name = "GEN_3V3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > reg_usdhc2_vmmc: regulator-vsd-3v3 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_reg_usdhc2>; > @@ -93,6 +102,18 @@ > 900000 0x0>; > regulator-always-on; > }; > + > + cs2000_ref: cs2000-ref { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <24576000>; > + }; > + > + cs2000_in_dummy: cs2000-in-dummy { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <0>; > + }; > }; > > &A53_0 { > @@ -263,6 +284,16 @@ > <18 IRQ_TYPE_EDGE_BOTH>; > interrupt-names = "a_det", "alert"; > }; > + > + hpa2: amp@60 { > + compatible = "ti,tpa6130a2"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_tpa2>; > + reg = <0x60>; > + power-gpio = <&gpio1 8 GPIO_ACTIVE_HIGH>; > + Vdd-supply = <®_5p0_main>; > + sound-name-prefix = "HPA2"; > + }; > }; > > &i2c2 { > @@ -355,11 +386,36 @@ > }; > }; > > + codec1: codec@18 { > + compatible = "ti,tlv320dac3100"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_codec1>; > + reg = <0x18>; > + #sound-dai-cells = <0>; > + HPVDD-supply = <®_3p3v>; > + SPRVDD-supply = <®_3p3v>; > + SPLVDD-supply = <®_3p3v>; > + AVDD-supply = <®_3p3v>; > + IOVDD-supply = <®_3p3v>; > + DVDD-supply = <&vgen4_reg>; > + reset-gpios = <&gpio3 3 GPIO_ACTIVE_LOW>; > + }; > + > eeprom@54 { > compatible = "atmel,24c128"; > reg = <0x54>; > }; > > + hpa1: amp@60 { > + compatible = "ti,tpa6130a2"; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_tpa1>; > + reg = <0x60>; > + power-gpio = <&gpio4 10 GPIO_ACTIVE_HIGH>; > + Vdd-supply = <®_5p0_main>; > + sound-name-prefix = "HPA1"; > + }; > + > ds1341: rtc@68 { > compatible = "dallas,ds1341"; > reg = <0x68>; > @@ -379,6 +435,16 @@ > reg = <0x2c>; > reset-gpios = <&gpio3 25 GPIO_ACTIVE_LOW>; > }; > + > + cs2000: clkgen@4e { > + compatible = "cirrus,cs2000-cp"; > + reg = <0x4e>; > + #clock-cells = <0>; > + clock-names = "clk_in", "ref_clk"; > + clocks = <&cs2000_in_dummy>, <&cs2000_ref>; > + assigned-clocks = <&cs2000>; > + assigned-clock-rates = <24000000>; > + }; > }; > > &i2c4 { > @@ -388,6 +454,12 @@ > status = "okay"; > }; > > +&sai2 { > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_sai2>; > + status = "okay"; > +}; > + > &uart1 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_uart1>; > @@ -513,6 +585,12 @@ > }; > > &iomuxc { > + pinctrl_codec1: dac1grp { > + fsl,pins = < > + MX8MQ_IOMUXC_NAND_CE2_B_GPIO3_IO3 0x41 > + >; > + }; > + > pinctrl_fec1: fec1grp { > fsl,pins = < > MX8MQ_IOMUXC_ENET_MDC_ENET1_MDC 0x3 > @@ -604,12 +682,32 @@ > >; > }; > > + pinctrl_sai2: sai2grp { > + fsl,pins = < > + MX8MQ_IOMUXC_SAI2_TXFS_SAI2_TX_SYNC 0xd6 > + MX8MQ_IOMUXC_SAI2_TXC_SAI2_TX_BCLK 0xd6 > + MX8MQ_IOMUXC_SAI2_TXD0_SAI2_TX_DATA0 0xd6 > + >; > + }; > + > pinctrl_switch_irq: switchgrp { > fsl,pins = < > MX8MQ_IOMUXC_GPIO1_IO15_GPIO1_IO15 0x41 > >; > }; > > + pinctrl_tpa1: tpa6130-1grp { > + fsl,pins = < > + MX8MQ_IOMUXC_SAI1_TXFS_GPIO4_IO10 0x41 > + >; > + }; > + > + pinctrl_tpa2: tpa6130-2grp { > + fsl,pins = < > + MX8MQ_IOMUXC_GPIO1_IO08_GPIO1_IO8 0x41 > + >; > + }; > + > pinctrl_ts: tsgrp { > fsl,pins = < > MX8MQ_IOMUXC_GPIO1_IO11_GPIO1_IO11 0x96 > -- > 2.20.1 >