Skip to content

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

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-modulesSigned-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
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 21 deletions
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
View file @ 933b80ed
......@@ -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
View file @ 933b80ed
......@@ -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
View file @ 933b80ed
......@@ -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
View file @ 933b80ed
......@@ -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
View file @ 933b80ed
......@@ -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>,
......
arch/arm64/boot/dts/amlogic/meson-g12b-ugoos-am6.dts
View file @ 933b80ed
......@@ -23,7 +23,7 @@ spdif_dit: audio-codec-1 {
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
View file @ 933b80ed
......@@ -186,7 +186,7 @@ vddio_card: regulator-vddio-card {
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
View file @ 933b80ed
......@@ -121,7 +121,7 @@ hdmi_connector_in: endpoint {
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
View file @ 933b80ed
......@@ -134,7 +134,7 @@ hdmi_connector_in: endpoint {
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
View file @ 933b80ed
......@@ -143,7 +143,7 @@ hdmi_connector_in: endpoint {
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
View file @ 933b80ed
......@@ -176,7 +176,7 @@ hdmi_connector_in: endpoint {
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
View file @ 933b80ed
......@@ -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
View file @ 933b80ed
......@@ -50,7 +50,7 @@ button@0 {
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
View file @ 933b80ed
......@@ -118,7 +118,7 @@ vddio_boot: regulator-vddio_boot {
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
View file @ 933b80ed
......@@ -66,7 +66,7 @@ hdmi_connector_in: endpoint {
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
View file @ 933b80ed
......@@ -159,7 +159,7 @@ vcc_1v8: regulator-vcc_1v8 {
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
View file @ 933b80ed
......@@ -135,7 +135,7 @@ vddio_boot: regulator-vddio_boot {
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
View file @ 933b80ed
......@@ -148,7 +148,7 @@ wifi32k: wifi32k {
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
View file @ 933b80ed
......@@ -170,7 +170,7 @@ hdmi_connector_in: endpoint {
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
View file @ 933b80ed
......@@ -190,7 +190,7 @@ hdmi_connector_in: endpoint {
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
View file @ 933b80ed
......@@ -220,7 +220,7 @@ sdio_pwrseq: sdio-pwrseq {
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",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7