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

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

arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts

+4 −4
Original line number Diff line number Diff line
@@ -331,10 +331,10 @@ 
				    "Microphone", "Microphone Jack",

				    "Microphone", "Onboard Microphone";

	simple-audio-card,routing =

			"Left DAC", "AIF1 Slot 0 Left",

			"Right DAC", "AIF1 Slot 0 Right",

			"AIF1 Slot 0 Left ADC", "Left ADC",

			"AIF1 Slot 0 Right ADC", "Right ADC",

			"Left DAC", "DACL",

			"Right DAC", "DACR",

			"ADCL", "Left ADC",

			"ADCR", "Right ADC",

			"Headphone Jack", "HP",

			"MIC2", "Microphone Jack",

			"Onboard Microphone", "MBIAS",

arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts

+4 −4
Original line number Diff line number Diff line
@@ -330,10 +330,10 @@ 
				    "Microphone", "Microphone Jack",

				    "Microphone", "Onboard Microphone";

	simple-audio-card,routing =

			"Left DAC", "AIF1 Slot 0 Left",

			"Right DAC", "AIF1 Slot 0 Right",

			"AIF1 Slot 0 Left ADC", "Left ADC",

			"AIF1 Slot 0 Right ADC", "Right ADC",

			"Left DAC", "DACL",

			"Right DAC", "DACR",

			"ADCL", "Left ADC",

			"ADCR", "Right ADC",

			"Headphone Jack", "HP",

			"MIC2", "Microphone Jack",

			"Onboard Microphone", "MBIAS",

arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts

+4 −4
Original line number Diff line number Diff line
@@ -261,11 +261,11 @@ 
	simple-audio-card,widgets = "Microphone", "Microphone Jack",

				    "Headphone", "Headphone Jack";

	simple-audio-card,routing =

			"Left DAC", "AIF1 Slot 0 Left",

			"Right DAC", "AIF1 Slot 0 Right",

			"Left DAC", "DACL",

			"Right DAC", "DACR",

			"Headphone Jack", "HP",

			"AIF1 Slot 0 Left ADC", "Left ADC",

			"AIF1 Slot 0 Right ADC", "Right ADC",

			"ADCL", "Left ADC",

			"ADCR", "Right ADC",

			"MIC2", "Microphone Jack";

	status = "okay";

};

arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts

+4 −4
Original line number Diff line number Diff line
@@ -374,15 +374,15 @@ 
				    "Headphone", "Headphone Jack",

				    "Speaker", "Internal Speaker";

	simple-audio-card,routing =

			"Left DAC", "AIF1 Slot 0 Left",

			"Right DAC", "AIF1 Slot 0 Right",

			"Left DAC", "DACL",

			"Right DAC", "DACR",

			"Speaker Amp INL", "LINEOUT",

			"Speaker Amp INR", "LINEOUT",

			"Internal Speaker", "Speaker Amp OUTL",

			"Internal Speaker", "Speaker Amp OUTR",

			"Headphone Jack", "HP",

			"AIF1 Slot 0 Left ADC", "Left ADC",

			"AIF1 Slot 0 Right ADC", "Right ADC",

			"ADCL", "Left ADC",

			"ADCR", "Right ADC",

			"Internal Microphone Left", "MBIAS",

			"MIC1", "Internal Microphone Left",

			"Internal Microphone Right", "HBIAS",

arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -392,10 +392,10 @@ 
			"Internal Speaker", "Speaker Amp OUTR",

			"Speaker Amp INL", "LINEOUT",

			"Speaker Amp INR", "LINEOUT",

			"Left DAC", "AIF1 Slot 0 Left",

			"Right DAC", "AIF1 Slot 0 Right",

			"AIF1 Slot 0 Left ADC", "Left ADC",

			"AIF1 Slot 0 Right ADC", "Right ADC",

			"Left DAC", "DACL",

			"Right DAC", "DACR",

			"ADCL", "Left ADC",

			"ADCR", "Right ADC",

			"Internal Microphone", "MBIAS",

			"MIC1", "Internal Microphone",

			"Headset Microphone", "HBIAS",

CRA Git | Maintained and supported by SUSTech CRA and CCSE