Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: imx6: RDU2: adjust audio devices nomenclature

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>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Cory Tusar and committed by
Shawn Guo
498f8aee 07aa5cf3

+12 -10
+12 -10
arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
··· 112 112 113 113 sound1 { 114 114 compatible = "simple-audio-card"; 115 - simple-audio-card,name = "Front"; 115 + simple-audio-card,name = "front"; 116 116 simple-audio-card,format = "i2s"; 117 117 simple-audio-card,bitclock-master = <&sound1_codec>; 118 118 simple-audio-card,frame-master = <&sound1_codec>; 119 119 simple-audio-card,widgets = 120 120 "Headphone", "Headphone Jack"; 121 121 simple-audio-card,routing = 122 - "Headphone Jack", "HPLEFT", 123 - "Headphone Jack", "HPRIGHT", 124 - "LEFTIN", "HPL", 125 - "RIGHTIN", "HPR"; 122 + "Headphone Jack", "HPA1 HPLEFT", 123 + "Headphone Jack", "HPA1 HPRIGHT", 124 + "HPA1 LEFTIN", "HPL", 125 + "HPA1 RIGHTIN", "HPR"; 126 126 simple-audio-card,aux-devs = <&hpa1>; 127 127 128 128 sound1_cpu: simple-audio-card,cpu { ··· 137 137 138 138 sound2 { 139 139 compatible = "simple-audio-card"; 140 - simple-audio-card,name = "Back"; 140 + simple-audio-card,name = "periph"; 141 141 simple-audio-card,format = "i2s"; 142 142 simple-audio-card,bitclock-master = <&sound2_codec>; 143 143 simple-audio-card,frame-master = <&sound2_codec>; 144 144 simple-audio-card,widgets = 145 145 "Headphone", "Headphone Jack"; 146 146 simple-audio-card,routing = 147 - "Headphone Jack", "HPLEFT", 148 - "Headphone Jack", "HPRIGHT", 149 - "LEFTIN", "HPL", 150 - "RIGHTIN", "HPR"; 147 + "Headphone Jack", "HPA1 HPLEFT", 148 + "Headphone Jack", "HPA1 HPRIGHT", 149 + "HPA1 LEFTIN", "HPL", 150 + "HPA1 RIGHTIN", "HPR"; 151 151 simple-audio-card,aux-devs = <&hpa2>; 152 152 153 153 sound2_cpu: simple-audio-card,cpu { ··· 399 399 reg = <0x60>; 400 400 power-gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; 401 401 Vdd-supply = <&reg_5p0v_main>; 402 + sound-name-prefix = "HPA1"; 402 403 }; 403 404 404 405 edp-bridge@68 { ··· 640 639 reg = <0x60>; 641 640 power-gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>; 642 641 Vdd-supply = <&reg_5p0v_main>; 642 + sound-name-prefix = "HPA1"; 643 643 }; 644 644 }; 645 645