Commit 933b80ed authored by Christian Hewitt's avatar Christian Hewitt Committed by Kevin Hilman
Browse files

arm64: dts: meson: shorten audio card names for alsa compatibility 

This patch shortens all audio card model names by dropping the SoC prefix
(for conformity) and rewording those that are still longer than alsa's 15
character name limit [0] to avoid userspace config issues.

[0] https://github.com/torvalds/linux/blob/master/Documentation/sound/alsa-configuration.rst#common-parameters-for-top-sound-card-modules



Signed-off-by: default avatarChristian Hewitt <christianshewitt@gmail.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
Link: https://lore.kernel.org/r/20210101063737.26635-1-christianshewitt@gmail.com
parent 93db2ce0

arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ wifi32k: wifi32k { 


	sound {

		compatible = "amlogic,axg-sound-card";

		model = "G12A-SEI510";

		model = "SEI510";

		audio-aux-devs = <&tdmout_a>, <&tdmout_b>,

				 <&tdmin_a>, <&tdmin_b>;

		audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",

arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ vddcpu: regulator-vddcpu { 


	sound {

		compatible = "amlogic,axg-sound-card";

		model = "G12A-X96-MAX";

		model = "X96-MAX";

		audio-aux-devs = <&tdmout_b>;

		audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",

				"TDMOUT_B IN 1", "FRDDR_B OUT 1",

arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ white { 


	sound {

		compatible = "amlogic,axg-sound-card";

		model = "G12B-GTKING-PRO";

		model = "GTKING-PRO";

		audio-aux-devs = <&tdmout_b>;

		audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",

				"TDMOUT_B IN 1", "FRDDR_B OUT 1",

arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ spdif_dit: audio-codec-1 { 


	sound {

		compatible = "amlogic,axg-sound-card";

		model = "G12B-GTKING";

		model = "GTKING";

		audio-aux-devs = <&tdmout_b>;

		audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1",

				"TDMOUT_B IN 1", "FRDDR_B OUT 1",

arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ hdmi_connector_in: endpoint { 


	sound {

		compatible = "amlogic,axg-sound-card";

		model = "G12B-ODROID-N2";

		model = "ODROID-N2";

		audio-widgets = "Line", "Lineout";

		audio-aux-devs = <&tdmout_b>, <&tdmout_c>, <&tdmin_a>,

				 <&tdmin_b>, <&tdmin_c>, <&tdmin_lb>,