Commit 631e6a35 authored by Samuel Holland's avatar Samuel Holland Committed by Maxime Ripard

arm64: dts: allwinner: a64: Update codec widget names

The sun8i-codec driver introduced a new set of DAPM widgets that more
accurately describe the hardware topology. Update the various device
trees to use the new widget names.
Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20200726012557.38282-7-samuel@sholland.org
parent 44967e81
...@@ -331,10 +331,10 @@ &sound { ...@@ -331,10 +331,10 @@ &sound {
"Microphone", "Microphone Jack", "Microphone", "Microphone Jack",
"Microphone", "Onboard Microphone"; "Microphone", "Onboard Microphone";
simple-audio-card,routing = simple-audio-card,routing =
"Left DAC", "AIF1 Slot 0 Left", "Left DAC", "DACL",
"Right DAC", "AIF1 Slot 0 Right", "Right DAC", "DACR",
"AIF1 Slot 0 Left ADC", "Left ADC", "ADCL", "Left ADC",
"AIF1 Slot 0 Right ADC", "Right ADC", "ADCR", "Right ADC",
"Headphone Jack", "HP", "Headphone Jack", "HP",
"MIC2", "Microphone Jack", "MIC2", "Microphone Jack",
"Onboard Microphone", "MBIAS", "Onboard Microphone", "MBIAS",
......
...@@ -330,10 +330,10 @@ &sound { ...@@ -330,10 +330,10 @@ &sound {
"Microphone", "Microphone Jack", "Microphone", "Microphone Jack",
"Microphone", "Onboard Microphone"; "Microphone", "Onboard Microphone";
simple-audio-card,routing = simple-audio-card,routing =
"Left DAC", "AIF1 Slot 0 Left", "Left DAC", "DACL",
"Right DAC", "AIF1 Slot 0 Right", "Right DAC", "DACR",
"AIF1 Slot 0 Left ADC", "Left ADC", "ADCL", "Left ADC",
"AIF1 Slot 0 Right ADC", "Right ADC", "ADCR", "Right ADC",
"Headphone Jack", "HP", "Headphone Jack", "HP",
"MIC2", "Microphone Jack", "MIC2", "Microphone Jack",
"Onboard Microphone", "MBIAS", "Onboard Microphone", "MBIAS",
......
...@@ -261,11 +261,11 @@ &sound { ...@@ -261,11 +261,11 @@ &sound {
simple-audio-card,widgets = "Microphone", "Microphone Jack", simple-audio-card,widgets = "Microphone", "Microphone Jack",
"Headphone", "Headphone Jack"; "Headphone", "Headphone Jack";
simple-audio-card,routing = simple-audio-card,routing =
"Left DAC", "AIF1 Slot 0 Left", "Left DAC", "DACL",
"Right DAC", "AIF1 Slot 0 Right", "Right DAC", "DACR",
"Headphone Jack", "HP", "Headphone Jack", "HP",
"AIF1 Slot 0 Left ADC", "Left ADC", "ADCL", "Left ADC",
"AIF1 Slot 0 Right ADC", "Right ADC", "ADCR", "Right ADC",
"MIC2", "Microphone Jack"; "MIC2", "Microphone Jack";
status = "okay"; status = "okay";
}; };
......
...@@ -374,15 +374,15 @@ &sound { ...@@ -374,15 +374,15 @@ &sound {
"Headphone", "Headphone Jack", "Headphone", "Headphone Jack",
"Speaker", "Internal Speaker"; "Speaker", "Internal Speaker";
simple-audio-card,routing = simple-audio-card,routing =
"Left DAC", "AIF1 Slot 0 Left", "Left DAC", "DACL",
"Right DAC", "AIF1 Slot 0 Right", "Right DAC", "DACR",
"Speaker Amp INL", "LINEOUT", "Speaker Amp INL", "LINEOUT",
"Speaker Amp INR", "LINEOUT", "Speaker Amp INR", "LINEOUT",
"Internal Speaker", "Speaker Amp OUTL", "Internal Speaker", "Speaker Amp OUTL",
"Internal Speaker", "Speaker Amp OUTR", "Internal Speaker", "Speaker Amp OUTR",
"Headphone Jack", "HP", "Headphone Jack", "HP",
"AIF1 Slot 0 Left ADC", "Left ADC", "ADCL", "Left ADC",
"AIF1 Slot 0 Right ADC", "Right ADC", "ADCR", "Right ADC",
"Internal Microphone Left", "MBIAS", "Internal Microphone Left", "MBIAS",
"MIC1", "Internal Microphone Left", "MIC1", "Internal Microphone Left",
"Internal Microphone Right", "HBIAS", "Internal Microphone Right", "HBIAS",
......
...@@ -392,10 +392,10 @@ &sound { ...@@ -392,10 +392,10 @@ &sound {
"Internal Speaker", "Speaker Amp OUTR", "Internal Speaker", "Speaker Amp OUTR",
"Speaker Amp INL", "LINEOUT", "Speaker Amp INL", "LINEOUT",
"Speaker Amp INR", "LINEOUT", "Speaker Amp INR", "LINEOUT",
"Left DAC", "AIF1 Slot 0 Left", "Left DAC", "DACL",
"Right DAC", "AIF1 Slot 0 Right", "Right DAC", "DACR",
"AIF1 Slot 0 Left ADC", "Left ADC", "ADCL", "Left ADC",
"AIF1 Slot 0 Right ADC", "Right ADC", "ADCR", "Right ADC",
"Internal Microphone", "MBIAS", "Internal Microphone", "MBIAS",
"MIC1", "Internal Microphone", "MIC1", "Internal Microphone",
"Headset Microphone", "HBIAS", "Headset Microphone", "HBIAS",
......
...@@ -421,15 +421,15 @@ &sound { ...@@ -421,15 +421,15 @@ &sound {
"Headphone", "Headphone Jack", "Headphone", "Headphone Jack",
"Speaker", "Internal Speaker"; "Speaker", "Internal Speaker";
simple-audio-card,routing = simple-audio-card,routing =
"Left DAC", "AIF1 Slot 0 Left", "Left DAC", "DACL",
"Right DAC", "AIF1 Slot 0 Right", "Right DAC", "DACR",
"Speaker Amp INL", "LINEOUT", "Speaker Amp INL", "LINEOUT",
"Speaker Amp INR", "LINEOUT", "Speaker Amp INR", "LINEOUT",
"Internal Speaker", "Speaker Amp OUTL", "Internal Speaker", "Speaker Amp OUTL",
"Internal Speaker", "Speaker Amp OUTR", "Internal Speaker", "Speaker Amp OUTR",
"Headphone Jack", "HP", "Headphone Jack", "HP",
"AIF1 Slot 0 Left ADC", "Left ADC", "ADCL", "Left ADC",
"AIF1 Slot 0 Right ADC", "Right ADC", "ADCR", "Right ADC",
"Internal Microphone Left", "MBIAS", "Internal Microphone Left", "MBIAS",
"MIC1", "Internal Microphone Left", "MIC1", "Internal Microphone Left",
"Internal Microphone Right", "HBIAS", "Internal Microphone Right", "HBIAS",
......
...@@ -159,11 +159,11 @@ &sound { ...@@ -159,11 +159,11 @@ &sound {
simple-audio-card,widgets = "Microphone", "Microphone Jack", simple-audio-card,widgets = "Microphone", "Microphone Jack",
"Headphone", "Headphone Jack"; "Headphone", "Headphone Jack";
simple-audio-card,routing = simple-audio-card,routing =
"Left DAC", "AIF1 Slot 0 Left", "Left DAC", "DACL",
"Right DAC", "AIF1 Slot 0 Right", "Right DAC", "DACR",
"Headphone Jack", "HP", "Headphone Jack", "HP",
"AIF1 Slot 0 Left ADC", "Left ADC", "ADCL", "Left ADC",
"AIF1 Slot 0 Right ADC", "Right ADC", "ADCR", "Right ADC",
"MIC2", "Microphone Jack"; "MIC2", "Microphone Jack";
status = "okay"; status = "okay";
}; };
......
...@@ -340,10 +340,10 @@ &sound { ...@@ -340,10 +340,10 @@ &sound {
"Microphone", "Internal Microphone", "Microphone", "Internal Microphone",
"Speaker", "Internal Speaker"; "Speaker", "Internal Speaker";
simple-audio-card,routing = simple-audio-card,routing =
"Left DAC", "AIF1 Slot 0 Left", "Left DAC", "DACL",
"Right DAC", "AIF1 Slot 0 Right", "Right DAC", "DACR",
"AIF1 Slot 0 Left ADC", "Left ADC", "ADCL", "Left ADC",
"AIF1 Slot 0 Right ADC", "Right ADC", "ADCR", "Right ADC",
"Headphone Jack", "HP", "Headphone Jack", "HP",
"Speaker Amp INL", "LINEOUT", "Speaker Amp INL", "LINEOUT",
"Speaker Amp INR", "LINEOUT", "Speaker Amp INR", "LINEOUT",
......
...@@ -139,10 +139,10 @@ sound: sound { ...@@ -139,10 +139,10 @@ sound: sound {
simple-audio-card,mclk-fs = <128>; simple-audio-card,mclk-fs = <128>;
simple-audio-card,aux-devs = <&codec_analog>; simple-audio-card,aux-devs = <&codec_analog>;
simple-audio-card,routing = simple-audio-card,routing =
"Left DAC", "AIF1 Slot 0 Left", "Left DAC", "DACL",
"Right DAC", "AIF1 Slot 0 Right", "Right DAC", "DACR",
"AIF1 Slot 0 Left ADC", "Left ADC", "ADCL", "Left ADC",
"AIF1 Slot 0 Right ADC", "Right ADC"; "ADCR", "Right ADC";
status = "disabled"; status = "disabled";
cpudai: simple-audio-card,cpu { cpudai: simple-audio-card,cpu {
......
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