Proxmox-Port/linux-loongson
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson synced 2025-09-06 13:09:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

arm64: tegra: Consolidate audio card names

Browse Source 
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>
This commit is contained in:
Thierry Reding 2021-03-30 20:18:31 +02:00
parent 9e79e58f33
commit b8928c2b5d
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
View File

@ -817,7 +817,7 @@ mmc@3400000 {
}; };
hda@3510000 { hda@3510000 {
nvidia,model = "jetson-tx2-hda"; nvidia,model = "NVIDIA Jetson TX2 HDA";
status = "okay"; status = "okay";
}; };
@ -1109,6 +1109,6 @@ sound {
<&i2s5_port>, <&i2s6_port>, <&dmic1_port>, <&dmic2_port>, <&i2s5_port>, <&i2s6_port>, <&dmic1_port>, <&dmic2_port>,
<&dmic3_port>, <&dspk1_port>, <&dspk2_port>; <&dmic3_port>, <&dspk1_port>, <&dspk2_port>;
label = "jetson-tx2-ape"; label = "NVIDIA Jetson TX2 APE";
}; };
}; };

4
arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts
View File

@ -554,7 +554,7 @@ mmc@3400000 {
}; };
hda@3510000 { hda@3510000 {
nvidia,model = "jetson-xavier-hda"; nvidia,model = "NVIDIA Jetson AGX Xavier HDA";
status = "okay"; status = "okay";
}; };
@ -831,7 +831,7 @@ sound {
<&i2s1_port>, <&i2s2_port>, <&i2s4_port>, <&i2s6_port>, <&i2s1_port>, <&i2s2_port>, <&i2s4_port>, <&i2s6_port>,
<&dmic3_port>; <&dmic3_port>;
label = "jetson-xavier-ape"; label = "NVIDIA Jetson AGX Xavier APE";
widgets = widgets =
"Microphone", "CVB-RT MIC Jack", "Microphone", "CVB-RT MIC Jack",

2
arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi
View File

@ -36,7 +36,7 @@ eeprom@57 {
}; };
hda@3510000 { hda@3510000 {
nvidia,model = "jetson-xavier-nx-hda"; nvidia,model = "NVIDIA Jetson Xavier NX HDA";
status = "okay"; status = "okay";
}; };

2
arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts
View File

@ -424,6 +424,6 @@ sound {
<&i2s1_port>, <&i2s2_port>, <&i2s3_port>, <&i2s4_port>, <&i2s1_port>, <&i2s2_port>, <&i2s3_port>, <&i2s4_port>,
<&i2s5_port>, <&dmic1_port>, <&dmic2_port>, <&dmic3_port>; <&i2s5_port>, <&dmic1_port>, <&dmic2_port>, <&dmic3_port>;
label = "jetson-tx1-ape"; label = "NVIDIA Jetson TX1 APE";
}; };
}; };

2
arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi
View File

@ -1345,7 +1345,7 @@ sata@70020000 {
}; };
hda@70030000 { hda@70030000 {
nvidia,model = "jetson-tx1-hda"; nvidia,model = "NVIDIA Jetson TX1 HDA";
status = "okay"; status = "okay";
}; };

4
arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts
View File

@ -441,7 +441,7 @@ pmc@7000e400 {
}; };
hda@70030000 { hda@70030000 {
nvidia,model = "jetson-nano-hda"; nvidia,model = "NVIDIA Jetson Nano HDA";
status = "okay"; status = "okay";
}; };
@ -1043,6 +1043,6 @@ sound {
<&i2s3_port>, <&i2s4_port>, <&i2s3_port>, <&i2s4_port>,
<&dmic1_port>, <&dmic2_port>; <&dmic1_port>, <&dmic2_port>;
label = "jetson-nano-ape"; label = "NVIDIA Jetson Nano APE";
}; };
}; };