3ebca14608
I rebased all of the patches (only 2 needed some changes, the rest I
just did for good measure).
These two patches were dropped since they are already merged in the new
kernel:
0008-leds-gpio-Set-max-brightness-to-1.patch
0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch was dropped
The kconfig changes are just after running kconfig edit, and making no
changes so that it would generate a config with any new options in 5.12,
to make maintenance easier moving forward.
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From 77f6107336aa2171c4b3086f8a98af42b93f65f5 Mon Sep 17 00:00:00 2001
|
|
From: Martijn Braam <martijn@brixit.nl>
|
|
Date: Tue, 20 Oct 2020 14:44:51 +0200
|
|
Subject: [PATCH] dts: pinetab: make audio routing consistent with pinephone
|
|
|
|
---
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 11 ++++++-----
|
|
1 file changed, 6 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
|
|
index ac66fd12f59f..1923c6d0debe 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
|
|
@@ -460,19 +460,20 @@ ®_rtc_ldo {
|
|
|
|
&sound {
|
|
status = "okay";
|
|
+ simple-audio-card,name = "PineTab";
|
|
simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>;
|
|
simple-audio-card,widgets = "Microphone", "Internal Microphone Left",
|
|
"Microphone", "Internal Microphone Right",
|
|
"Headphone", "Headphone Jack",
|
|
"Speaker", "Internal Speaker";
|
|
simple-audio-card,routing =
|
|
- "Left DAC", "DACL",
|
|
- "Right DAC", "DACR",
|
|
- "Speaker Amp INL", "LINEOUT",
|
|
- "Speaker Amp INR", "LINEOUT",
|
|
+ "Headphone Jack", "HP",
|
|
"Internal Speaker", "Speaker Amp OUTL",
|
|
"Internal Speaker", "Speaker Amp OUTR",
|
|
- "Headphone Jack", "HP",
|
|
+ "Speaker Amp INL", "LINEOUT",
|
|
+ "Speaker Amp INR", "LINEOUT",
|
|
+ "Left DAC", "DACL",
|
|
+ "Right DAC", "DACR",
|
|
"ADCL", "Left ADC",
|
|
"ADCR", "Right ADC",
|
|
"Internal Microphone Left", "MBIAS",
|
|
--
|
|
2.31.1
|
|
|