Commit 498f8aee authored by Cory Tusar's avatar Cory Tusar Committed by Shawn Guo
Browse files

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: default avatarCory Tusar <cory.tusar@zii.aero>
[adjusted commit message]
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 07aa5cf3

arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi

+12 −10
Original line number Diff line number Diff line
@@ -112,17 +112,17 @@ reg_3p3v_ssd: regulator-3p3v-ssd { 


	sound1 {

		compatible = "simple-audio-card";

		simple-audio-card,name = "Front";

		simple-audio-card,name = "front";

		simple-audio-card,format = "i2s";

		simple-audio-card,bitclock-master = <&sound1_codec>;

		simple-audio-card,frame-master = <&sound1_codec>;

		simple-audio-card,widgets =

			"Headphone", "Headphone Jack";

		simple-audio-card,routing =

			"Headphone Jack", "HPLEFT",

			"Headphone Jack", "HPRIGHT",

			"LEFTIN", "HPL",

			"RIGHTIN", "HPR";

			"Headphone Jack", "HPA1 HPLEFT",

			"Headphone Jack", "HPA1 HPRIGHT",

			"HPA1 LEFTIN", "HPL",

			"HPA1 RIGHTIN", "HPR";

		simple-audio-card,aux-devs = <&hpa1>;



		sound1_cpu: simple-audio-card,cpu {
@@ -137,17 +137,17 @@ sound1_codec: simple-audio-card,codec { 


	sound2 {

		compatible = "simple-audio-card";

		simple-audio-card,name = "Back";

		simple-audio-card,name = "periph";

		simple-audio-card,format = "i2s";

		simple-audio-card,bitclock-master = <&sound2_codec>;

		simple-audio-card,frame-master = <&sound2_codec>;

		simple-audio-card,widgets =

			"Headphone", "Headphone Jack";

		simple-audio-card,routing =

			"Headphone Jack", "HPLEFT",

			"Headphone Jack", "HPRIGHT",

			"LEFTIN", "HPL",

			"RIGHTIN", "HPR";

			"Headphone Jack", "HPA1 HPLEFT",

			"Headphone Jack", "HPA1 HPRIGHT",

			"HPA1 LEFTIN", "HPL",

			"HPA1 RIGHTIN", "HPR";

		simple-audio-card,aux-devs = <&hpa2>;



		sound2_cpu: simple-audio-card,cpu {
@@ -399,6 +399,7 @@ hpa2: amp@60 { 
		reg = <0x60>;

		power-gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;

		Vdd-supply = <&reg_5p0v_main>;

		sound-name-prefix = "HPA1";

	};



	edp-bridge@68 {
@@ -639,6 +640,7 @@ hpa1: amp@60 { 
		reg = <0x60>;

		power-gpio = <&gpio1 4 GPIO_ACTIVE_HIGH>;

		Vdd-supply = <&reg_5p0v_main>;

		sound-name-prefix = "HPA1";

	};

};