diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2020-03-13 10:58:29 +0100 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2020-03-16 03:44:53 +0100 |
| commit | ab569907137c112a784eb5a8d294f14934353850 (patch) | |
| tree | af1f374bf521375268cd3ae2aa7a20a403ad1622 /arch/arm/boot/dts/imx51-zii-rdu1.dts | |
| parent | ARM: dts: imx6: RDU2: assign video PLL as input to LDB (diff) | |
| download | linux-ab569907137c112a784eb5a8d294f14934353850.tar.xz linux-ab569907137c112a784eb5a8d294f14934353850.zip | |
ARM: dts: imx51-zii-rdu1: set name prefix for TPA6130A2
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>
Diffstat (limited to 'arch/arm/boot/dts/imx51-zii-rdu1.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx51-zii-rdu1.dts | 5 |
1 files changed, 3 insertions, 2 deletions
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 = <®_3p3v>; + sound-name-prefix = "TPA6130A2"; }; ds1341: rtc@68 { |