]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ARM: dts: imx51-zii-rdu1: set name prefix for TPA6130A2
authorLucas Stach <l.stach@pengutronix.de>
Fri, 13 Mar 2020 09:58:29 +0000 (10:58 +0100)
committerShawn Guo <shawnguo@kernel.org>
Mon, 16 Mar 2020 02:44:53 +0000 (10:44 +0800)
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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx51-zii-rdu1.dts

index 3596060f52e78e52f0c3197888e98f943f629d38..e559ab0c3645365595c1a3351f2921ba79deb4e5 100644 (file)
                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 {
                compatible = "ti,tpa6130a2";
                reg = <0x60>;
                Vdd-supply = <&reg_3p3v>;
+               sound-name-prefix = "TPA6130A2";
        };
 
        ds1341: rtc@68 {