From: Lucas Stach <l.stach@pengutronix.de> To: Shawn Guo <shawnguo@kernel.org> Cc: Fabio Estevam <festevam@gmail.com>, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de, patchwork-lst@pengutronix.de Subject: [PATCH 05/10] ARM: dts: imx6: RDU2: adjust audio devices nomenclature Date: Mon, 25 Jan 2021 19:47:31 +0100 [thread overview] Message-ID: <20210125184736.1226435-5-l.stach@pengutronix.de> (raw) In-Reply-To: <20210125184736.1226435-1-l.stach@pengutronix.de> From: Cory Tusar <cory.tusar@zii.aero> This adds a "HPA1" prefix to the amplifiers on both audio cards, this is done in order to get more consistency for userspace running on RDU2 and RDU3, where we have two amplifiers on a single card device in the "Zest" configuration. Also adjust the card names to the new standard expected by userspace. Signed-off-by: Cory Tusar <cory.tusar@zii.aero> [adjusted commit message] Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi index dcc97a84c88d..525ff62b47f5 100644 --- a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi @@ -112,17 +112,17 @@ sound1 { compatible = "simple-audio-card"; - simple-audio-card,name = "Front"; + simple-audio-card,name = "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"; simple-audio-card,routing = - "Headphone Jack", "HPLEFT", - "Headphone Jack", "HPRIGHT", - "LEFTIN", "HPL", - "RIGHTIN", "HPR"; + "Headphone Jack", "HPA1 HPLEFT", + "Headphone Jack", "HPA1 HPRIGHT", + "HPA1 LEFTIN", "HPL", + "HPA1 RIGHTIN", "HPR"; simple-audio-card,aux-devs = <&hpa1>; sound1_cpu: simple-audio-card,cpu { @@ -137,17 +137,17 @@ sound2 { compatible = "simple-audio-card"; - simple-audio-card,name = "Back"; + simple-audio-card,name = "periph"; 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"; simple-audio-card,routing = - "Headphone Jack", "HPLEFT", - "Headphone Jack", "HPRIGHT", - "LEFTIN", "HPL", - "RIGHTIN", "HPR"; + "Headphone Jack", "HPA1 HPLEFT", + "Headphone Jack", "HPA1 HPRIGHT", + "HPA1 LEFTIN", "HPL", + "HPA1 RIGHTIN", "HPR"; simple-audio-card,aux-devs = <&hpa2>; sound2_cpu: simple-audio-card,cpu { @@ -399,6 +399,7 @@ reg = <0x60>; power-gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; Vdd-supply = <®_5p0v_main>; + sound-name-prefix = "HPA1"; }; edp-bridge@68 { @@ -639,6 +640,7 @@ reg = <0x60>; power-gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>; Vdd-supply = <®_5p0v_main>; + sound-name-prefix = "HPA1"; }; }; -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Lucas Stach <l.stach@pengutronix.de> To: Shawn Guo <shawnguo@kernel.org> Cc: devicetree@vger.kernel.org, Fabio Estevam <festevam@gmail.com>, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org, patchwork-lst@pengutronix.de Subject: [PATCH 05/10] ARM: dts: imx6: RDU2: adjust audio devices nomenclature Date: Mon, 25 Jan 2021 19:47:31 +0100 [thread overview] Message-ID: <20210125184736.1226435-5-l.stach@pengutronix.de> (raw) In-Reply-To: <20210125184736.1226435-1-l.stach@pengutronix.de> From: Cory Tusar <cory.tusar@zii.aero> This adds a "HPA1" prefix to the amplifiers on both audio cards, this is done in order to get more consistency for userspace running on RDU2 and RDU3, where we have two amplifiers on a single card device in the "Zest" configuration. Also adjust the card names to the new standard expected by userspace. Signed-off-by: Cory Tusar <cory.tusar@zii.aero> [adjusted commit message] Signed-off-by: Lucas Stach <l.stach@pengutronix.de> --- arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi index dcc97a84c88d..525ff62b47f5 100644 --- a/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi +++ b/arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi @@ -112,17 +112,17 @@ sound1 { compatible = "simple-audio-card"; - simple-audio-card,name = "Front"; + simple-audio-card,name = "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"; simple-audio-card,routing = - "Headphone Jack", "HPLEFT", - "Headphone Jack", "HPRIGHT", - "LEFTIN", "HPL", - "RIGHTIN", "HPR"; + "Headphone Jack", "HPA1 HPLEFT", + "Headphone Jack", "HPA1 HPRIGHT", + "HPA1 LEFTIN", "HPL", + "HPA1 RIGHTIN", "HPR"; simple-audio-card,aux-devs = <&hpa1>; sound1_cpu: simple-audio-card,cpu { @@ -137,17 +137,17 @@ sound2 { compatible = "simple-audio-card"; - simple-audio-card,name = "Back"; + simple-audio-card,name = "periph"; 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"; simple-audio-card,routing = - "Headphone Jack", "HPLEFT", - "Headphone Jack", "HPRIGHT", - "LEFTIN", "HPL", - "RIGHTIN", "HPR"; + "Headphone Jack", "HPA1 HPLEFT", + "Headphone Jack", "HPA1 HPRIGHT", + "HPA1 LEFTIN", "HPL", + "HPA1 RIGHTIN", "HPR"; simple-audio-card,aux-devs = <&hpa2>; sound2_cpu: simple-audio-card,cpu { @@ -399,6 +399,7 @@ reg = <0x60>; power-gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; Vdd-supply = <®_5p0v_main>; + sound-name-prefix = "HPA1"; }; edp-bridge@68 { @@ -639,6 +640,7 @@ reg = <0x60>; power-gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>; Vdd-supply = <®_5p0v_main>; + sound-name-prefix = "HPA1"; }; }; -- 2.20.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-01-26 21:28 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-25 18:47 [PATCH 01/10] ARM: dts: imx6: rdu2: enable WDOG1 Lucas Stach 2021-01-25 18:47 ` Lucas Stach 2021-01-25 18:47 ` [PATCH 02/10] ARM: dts: imx6: RDU2: reduce i2c drive-strength Lucas Stach 2021-01-25 18:47 ` Lucas Stach 2021-01-25 18:47 ` [PATCH 03/10] ARM: dts: imx6: RDU2: enable RMI4 reduced reporting Lucas Stach 2021-01-25 18:47 ` Lucas Stach 2021-01-25 18:47 ` [PATCH 04/10] ARM: dts: imx6: RDU2: only trigger IRQ on falling edge ucs1002 ALERT pin Lucas Stach 2021-01-25 18:47 ` Lucas Stach 2021-01-25 18:47 ` Lucas Stach [this message] 2021-01-25 18:47 ` [PATCH 05/10] ARM: dts: imx6: RDU2: adjust audio devices nomenclature Lucas Stach 2021-01-25 18:47 ` [PATCH 06/10] arm64: dts: zii-ultra: add sound support Lucas Stach 2021-01-25 18:47 ` Lucas Stach 2021-01-25 18:47 ` [PATCH 07/10] arm64: dts: zii-ultra: fix i2c pin configuration Lucas Stach 2021-01-25 18:47 ` Lucas Stach 2021-01-25 18:47 ` [PATCH 08/10] arm64: dts: zii-ultra: limit USB ports to USB2 speed Lucas Stach 2021-01-25 18:47 ` Lucas Stach 2021-01-25 18:47 ` [PATCH 09/10] arm64: dts: zii-ultra: only trigger IRQ on falling edge ucs1002 ALERT pin Lucas Stach 2021-01-25 18:47 ` Lucas Stach 2021-01-25 18:47 ` [PATCH 10/10] arm64: dts: zii-rmb3: enable RMI4 reduced reporting Lucas Stach 2021-01-25 18:47 ` Lucas Stach 2021-01-30 13:55 ` [PATCH 01/10] ARM: dts: imx6: rdu2: enable WDOG1 Shawn Guo 2021-01-30 13:55 ` Shawn Guo
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=20210125184736.1226435-5-l.stach@pengutronix.de \ --to=l.stach@pengutronix.de \ --cc=devicetree@vger.kernel.org \ --cc=festevam@gmail.com \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=patchwork-lst@pengutronix.de \ --cc=shawnguo@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.