korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-09 07:14:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Cory Tusar 2021-01-25 19:47:31 +01:00 committed by Shawn Guo
parent 07aa5cf3af
commit 498f8aee6e
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi
View File

@ -112,17 +112,17 @@
sound1 { sound1 {
compatible = "simple-audio-card"; compatible = "simple-audio-card";
simple-audio-card,name = "Front"; simple-audio-card,name = "front";
simple-audio-card,format = "i2s"; simple-audio-card,format = "i2s";
simple-audio-card,bitclock-master = <&sound1_codec>; simple-audio-card,bitclock-master = <&sound1_codec>;
simple-audio-card,frame-master = <&sound1_codec>; simple-audio-card,frame-master = <&sound1_codec>;
simple-audio-card,widgets = simple-audio-card,widgets =
"Headphone", "Headphone Jack"; "Headphone", "Headphone Jack";
simple-audio-card,routing = simple-audio-card,routing =
"Headphone Jack", "HPLEFT", "Headphone Jack", "HPA1 HPLEFT",
"Headphone Jack", "HPRIGHT", "Headphone Jack", "HPA1 HPRIGHT",
"LEFTIN", "HPL", "HPA1 LEFTIN", "HPL",
"RIGHTIN", "HPR"; "HPA1 RIGHTIN", "HPR";
simple-audio-card,aux-devs = <&hpa1>; simple-audio-card,aux-devs = <&hpa1>;
sound1_cpu: simple-audio-card,cpu { sound1_cpu: simple-audio-card,cpu {
@ -137,17 +137,17 @@
sound2 { sound2 {
compatible = "simple-audio-card"; compatible = "simple-audio-card";
simple-audio-card,name = "Back"; simple-audio-card,name = "periph";
simple-audio-card,format = "i2s"; simple-audio-card,format = "i2s";
simple-audio-card,bitclock-master = <&sound2_codec>; simple-audio-card,bitclock-master = <&sound2_codec>;
simple-audio-card,frame-master = <&sound2_codec>; simple-audio-card,frame-master = <&sound2_codec>;
simple-audio-card,widgets = simple-audio-card,widgets =
"Headphone", "Headphone Jack"; "Headphone", "Headphone Jack";
simple-audio-card,routing = simple-audio-card,routing =
"Headphone Jack", "HPLEFT", "Headphone Jack", "HPA1 HPLEFT",
"Headphone Jack", "HPRIGHT", "Headphone Jack", "HPA1 HPRIGHT",
"LEFTIN", "HPL", "HPA1 LEFTIN", "HPL",
"RIGHTIN", "HPR"; "HPA1 RIGHTIN", "HPR";
simple-audio-card,aux-devs = <&hpa2>; simple-audio-card,aux-devs = <&hpa2>;
sound2_cpu: simple-audio-card,cpu { sound2_cpu: simple-audio-card,cpu {
@ -399,6 +399,7 @@
reg = <0x60>; reg = <0x60>;
power-gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>; power-gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
Vdd-supply = <&reg_5p0v_main>; Vdd-supply = <&reg_5p0v_main>;
sound-name-prefix = "HPA1";
}; };
edp-bridge@68 { edp-bridge@68 {
@ -639,6 +640,7 @@
reg = <0x60>; reg = <0x60>;
power-gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>; power-gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>;
Vdd-supply = <&reg_5p0v_main>; Vdd-supply = <&reg_5p0v_main>;
sound-name-prefix = "HPA1";
}; };
}; };