arm64: tegra: Consolidate audio card names

The current scheme for audio card names is suboptimal because it causes
the automatically generated names (for ID and driver) to be truncated,
which in turn can cause conflicts.

Introduce a new scheme which reuses the board model for the names and
appends the "HDA" and "APE" suffixes for the HDA and APE, respectively.
As a side-effect these suffixes end up being used as the ID of the SoC
sound cards which makes it easy for users to select them when using the
ALSA command-line utilities, for example.

As a separate measure, the driver name for the cards is now set by the
corresponding audio driver (either tegra-hda or tegra-ape), making it a
more useful identifier than the currently normalized card name.

Signed-off-by: Thierry Reding <treding@nvidia.com>

diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
index 683743f81849acf2c4cb3e9f6d4d5253f0fa20c3..74c1a5df3fdb756f2f0a14ebf99bf9b3d754071d 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
@@ -817,7 +817,7 @@
        };
 
        hda@3510000 {
-               nvidia,model = "jetson-tx2-hda";
+               nvidia,model = "NVIDIA Jetson TX2 HDA";
                status = "okay";
        };
 
@@ -1109,6 +1109,6 @@
                       <&i2s5_port>, <&i2s6_port>, <&dmic1_port>, <&dmic2_port>,
                       <&dmic3_port>, <&dspk1_port>, <&dspk2_port>;
 
-               label = "jetson-tx2-ape";
+               label = "NVIDIA Jetson TX2 APE";
        };
 };

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
index d618f197a1d3cd6aa015f5baf4d3c21fb2f62149..96bd01cadb187d4b3f50a847e644fc6d3fbc075c 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
@@ -554,7 +554,7 @@
                };
 
                hda@3510000 {
-                       nvidia,model = "jetson-xavier-hda";
+                       nvidia,model = "NVIDIA Jetson AGX Xavier HDA";
                        status = "okay";
                };
 
@@ -831,7 +831,7 @@
                       <&i2s1_port>, <&i2s2_port>, <&i2s4_port>, <&i2s6_port>,
                       <&dmic3_port>;
 
-               label = "jetson-xavier-ape";
+               label = "NVIDIA Jetson AGX Xavier APE";
 
                widgets =
                        "Microphone",   "CVB-RT MIC Jack",

diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi
index d1d77220154f0c4acdbce2a5c5e1745f395ce292..a717d2b6613148397ee71d061f16aa9d334f2bb4 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi
@@ -36,7 +36,7 @@
                };
 
                hda@3510000 {
-                       nvidia,model = "jetson-xavier-nx-hda";
+                       nvidia,model = "NVIDIA Jetson Xavier NX HDA";
                        status = "okay";
                };
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts b/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts
index 497635af7fab90116054cc155e9f58752cb7c9e4..7d3e3634743ee7041db9f1ff998e873ba0a7209f 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts
@@ -424,6 +424,6 @@
                       <&i2s1_port>, <&i2s2_port>, <&i2s3_port>, <&i2s4_port>,
                       <&i2s5_port>, <&dmic1_port>, <&dmic2_port>, <&dmic3_port>;
 
-               label = "jetson-tx1-ape";
+               label = "NVIDIA Jetson TX1 APE";
        };
 };

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
index a9caaf7c0d67eb082e5f71671d2a20433cfbc47d..d8409c1b43800d929e25788a78db886cbc7f39dc 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
@@ -1345,7 +1345,7 @@
        };
 
        hda@70030000 {
-               nvidia,model = "jetson-tx1-hda";
+               nvidia,model = "NVIDIA Jetson TX1 HDA";
                status = "okay";
        };
 

diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
index 14c128a5e248d60018d69bd9b22e97a9f3f11f07..7dbb13f20de760232245ffbdf556371a0b13912b 100644 (file)
--- a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
@@ -441,7 +441,7 @@
        };
 
        hda@70030000 {
-               nvidia,model = "jetson-nano-hda";
+               nvidia,model = "NVIDIA Jetson Nano HDA";
 
                status = "okay";
        };
@@ -1043,6 +1043,6 @@
                       <&i2s3_port>, <&i2s4_port>,
                       <&dmic1_port>, <&dmic2_port>;
 
-               label = "jetson-nano-ape";
+               label = "NVIDIA Jetson Nano APE";
        };
 };