arm64: dts: meson: shorten audio card names for alsa compatibility
Subsystems (2)
PATCH 1/1 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.
---
I've been experimenting with alsa conf files to ensure alsa handles multi-channel audio properly (else channels are messed up) and it's been bugging me why an Odroid N2 showed surroundXX devices (defined in a common alsa conf) while a VIM3 only showed sysdefault devices. The eureka moment is discovering alsa enforces a 15-character limit on model names, so G12B-ODROID-N2 (14) works while longer names like G12B-KHADAS-VIM3 (16) truncate to e.g. G12B-KHADAS-VIM causing mismatch with the strings alsa-lib matches conf(s) against.
VIM3:~ # cat /proc/asound/cards
0 [G12BKHADASVIM3 ]: G12B-KHADAS-VIM - G12B-KHADAS-VIM3
G12B-KHADAS-VIM3
I'm using aliases.conf with alsa-lib to map 20+ card names back to two confs so I _could_ just map the truncated names, but this is not obvious for users and other maintainers so the better solution is shortening the names.
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 2 +- arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 2 +- arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-)
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +1 -1
@@ -181,7 +181,7 @@ 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
@@ -150,7 +150,7 @@ 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
@@ -44,7 +44,7 @@ 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
@@ -28,7 +28,7 @@ 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
@@ -211,7 +211,7 @@ 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>,
arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts +1 -1
@@ -23,7 +23,7 @@ sound { compatible = "amlogic,axg-sound-card"; - model = "G12B-UGOOS-AM6"; + model = "UGOOS-AM6"; 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-gx-libretech-pc.dtsi +1 -1
@@ -186,7 +186,7 @@ sound { compatible = "amlogic,gx-sound-card"; - model = "GXL-LIBRETECH-S9XX-PC"; + model = "LIBRETECH-PC"; audio-aux-devs = <&dio2133>; audio-widgets = "Speaker", "7J4-14 LEFT", "Speaker", "7J4-11 RIGHT";
arch/arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi +1 -1
@@ -121,7 +121,7 @@ sound { compatible = "amlogic,gx-sound-card"; - model = "GX-P230-Q200"; + model = "P230-Q200"; audio-aux-devs = <&dio2133>; audio-widgets = "Line", "Lineout"; audio-routing = "AU2 INL", "ACODEC LOLP",
arch/arm64/boot/dts/amlogic/meson-gxbb-nanopi-k2.dts +1 -1
@@ -134,7 +134,7 @@ sound { compatible = "amlogic,gx-sound-card"; - model = "GXBB-NANOPI-K2"; + model = "NANOPI-K2"; assigned-clocks = <&clkc CLKID_MPLL0>, <&clkc CLKID_MPLL1>, <&clkc CLKID_MPLL2>;
arch/arm64/boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts +1 -1
@@ -143,7 +143,7 @@ sound { compatible = "amlogic,gx-sound-card"; - model = "GXBB-NEXBOX-A95X"; + model = "NEXBOX-A95X"; assigned-clocks = <&clkc CLKID_MPLL0>, <&clkc CLKID_MPLL1>, <&clkc CLKID_MPLL2>;
arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts +1 -1
@@ -176,7 +176,7 @@ sound { compatible = "amlogic,gx-sound-card"; - model = "GXBB-ODROID-C2"; + model = "ODROID-C2"; assigned-clocks = <&clkc CLKID_MPLL0>, <&clkc CLKID_MPLL1>, <&clkc CLKID_MPLL2>;
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-hub.dts +1 -1
@@ -15,7 +15,7 @@ sound { compatible = "amlogic,gx-sound-card"; - model = "GXBB-WETEK-HUB"; + model = "WETEK-HUB"; assigned-clocks = <&clkc CLKID_MPLL0>, <&clkc CLKID_MPLL1>, <&clkc CLKID_MPLL2>;
arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts +1 -1
@@ -50,7 +50,7 @@ sound { compatible = "amlogic,gx-sound-card"; - model = "GXBB-WETEK-PLAY2"; + model = "WETEK-PLAY2"; assigned-clocks = <&clkc CLKID_MPLL0>, <&clkc CLKID_MPLL1>, <&clkc CLKID_MPLL2>;
arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts +1 -1
@@ -118,7 +118,7 @@ sound { compatible = "amlogic,gx-sound-card"; - model = "GXL-LIBRETECH-S805X-AC"; + model = "LIBRETECH-AC"; audio-widgets = "Speaker", "9J5-3 LEFT", "Speaker", "9J5-2 RIGHT"; audio-routing = "9J5-3 LEFT", "ACODEC LOLN",
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +1 -1
@@ -66,7 +66,7 @@ sound { compatible = "amlogic,gx-sound-card"; - model = "GXL-KHADAS-VIM1"; + model = "KHADAS-VIM"; assigned-clocks = <&clkc CLKID_MPLL0>, <&clkc CLKID_MPLL1>, <&clkc CLKID_MPLL2>;
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc-v2.dts +1 -1
@@ -159,7 +159,7 @@ sound { compatible = "amlogic,gx-sound-card"; - model = "GXL-LIBRETECH-S905X-CC-V2"; + model = "LIBRETECH-CC-V2"; assigned-clocks = <&clkc CLKID_MPLL0>, <&clkc CLKID_MPLL1>, <&clkc CLKID_MPLL2>;
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts +1 -1
@@ -135,7 +135,7 @@ sound { compatible = "amlogic,gx-sound-card"; - model = "GXL-LIBRETECH-S905X-CC"; + model = "LIBRETECH-CC"; audio-aux-devs = <&dio2133>; audio-widgets = "Line", "Lineout"; audio-routing = "AU2 INL", "ACODEC LOLN",
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +1 -1
@@ -148,7 +148,7 @@ sound { compatible = "amlogic,gx-sound-card"; - model = "GXM-KHADAS-VIM2"; + model = "KHADAS-VIM2"; assigned-clocks = <&clkc CLKID_MPLL0>, <&clkc CLKID_MPLL1>, <&clkc CLKID_MPLL2>;
arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi +1 -1
@@ -170,7 +170,7 @@ sound { compatible = "amlogic,axg-sound-card"; - model = "G12B-KHADAS-VIM3"; + model = "KHADAS-VIM3"; audio-aux-devs = <&tdmout_a>; audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0", "TDMOUT_A IN 1", "FRDDR_B OUT 0",
arch/arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts +1 -1
@@ -190,7 +190,7 @@ sound { compatible = "amlogic,axg-sound-card"; - model = "SM1-ODROID-C4"; + model = "ODROID-C4"; 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-sm1-sei610.dts +1 -1
@@ -220,7 +220,7 @@ sound { compatible = "amlogic,axg-sound-card"; - model = "SM1-SEI610"; + model = "SEI610"; audio-aux-devs = <&tdmout_a>, <&tdmout_b>, <&tdmin_a>, <&tdmin_b>; audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
Signature · 7 lines
2.17.1 _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic
Quoted 5 lines · Christian Hewitt
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.
Applied, thanks!
[1/1] arm64: dts: meson: shorten audio card names for alsa compatibility
commit: cf21697a8c5bf65eb4e05717ca5caee8215c3797
Best regards,
Signature · 6 lines
Kevin Hilman <[email protected]> _______________________________________________ linux-amlogic mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-amlogic