646e0b50df
- 0003-dts-pinetab-add-missing-bma223-ohci1.patch
The original patch added a node for BMA223 and a node for ohci1.
The former is already present in upstream, so the new patch
0003-dts-pinetab-add-missing-ohci1.patch only adds the latter.
- 0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
The patch is now present in upstream so it has been removed.
However it's worth noting that upstream's node has the wake GPIOs
reversed from the original patch. The original patch added:
device-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
host-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
... while upstream has:
device-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_LOW>; /* PL5 */
host-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
This has not been tested on a PineTab.
- 0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
The first hunk of the patch is in upstream and has been removed.
- 0013-Revert-usb-quirks-Add-USB_QUIRK_RESET-for-Quectel-EG25G-Modem.patch
This patch reverted upstream commit that was present until v6.7
( f9e3e7ea4e )
but is not present in v6.8, so the patch has been removed.
- 0014-usb-serial-option-add-reset-resume-callback-for-WWAN.patch
The patch is now present in upstream so it has been removed.
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
From 519162978ba8641c53c7d3ea5fa62f53ac3b6793 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 | 10 +++++-----
|
|
1 file changed, 5 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 29e527e499db..230eedb39d50 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
|
|
@@ -494,13 +494,13 @@ &sound {
|
|
"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.44.0
|
|
|