diff mbox series

ARM: dts: imx51-zii-rdu1: set name prefix for TPA6130A2

Message ID 20200313095829.18753-1-l.stach@pengutronix.de (mailing list archive)
State Mainlined
Commit ab569907137c112a784eb5a8d294f14934353850
Headers show
Series ARM: dts: imx51-zii-rdu1: set name prefix for TPA6130A2 | expand

Commit Message

Lucas Stach March 13, 2020, 9:58 a.m. UTC 
Set a sound name prefix for the HPA, as otherwise the sound controls
naming will clash with the controls of the DAC.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 arch/arm/boot/dts/imx51-zii-rdu1.dts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Shawn Guo March 16, 2020, 2:45 a.m. UTC | #1 
On Fri, Mar 13, 2020 at 10:58:29AM +0100, Lucas Stach wrote:
> Set a sound name prefix for the HPA, as otherwise the sound controls
> naming will clash with the controls of the DAC.
> 
> Signed-off-by: Lucas Stach <l.stach@pengutronix.de>

Applied, thanks.
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts
index 3596060f52e7..e559ab0c3645 100644
--- a/arch/arm/boot/dts/imx51-zii-rdu1.dts
+++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts
@@ -217,8 +217,8 @@ 
 		simple-audio-card,widgets =
 			"Headphone", "Headphone Jack";
 		simple-audio-card,routing =
-			"Headphone Jack", "HPLEFT",
-			"Headphone Jack", "HPRIGHT";
+			"Headphone Jack", "TPA6130A2 HPLEFT",
+			"Headphone Jack", "TPA6130A2 HPRIGHT";
 		simple-audio-card,aux-devs = <&hpa1>;
 
 		sound_cpu: simple-audio-card,cpu {
@@ -470,6 +470,7 @@ 
 		compatible = "ti,tpa6130a2";
 		reg = <0x60>;
 		Vdd-supply = <&reg_3p3v>;
+		sound-name-prefix = "TPA6130A2";
 	};
 
 	ds1341: rtc@68 {