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.
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From dd617215e43671c0ba88dbd25c99fa42de9be69c Mon Sep 17 00:00:00 2001
|
|
From: Martijn Braam <martijn@brixit.nl>
|
|
Date: Mon, 15 Feb 2021 13:18:02 -0800
|
|
Subject: [PATCH] dts: pinephone: jack detection
|
|
|
|
---
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
|
index 3cf2f3e6a41a..1a096576d258 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
|
@@ -355,11 +355,13 @@ &codec {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&aif2_pins>, <&aif3_pins>;
|
|
status = "okay";
|
|
+ allwinner,inverted-jack-detection;
|
|
};
|
|
|
|
&codec_analog {
|
|
cpvdd-supply = <®_eldo1>;
|
|
status = "okay";
|
|
+ allwinner,internal-bias-resistor;
|
|
};
|
|
|
|
&cpu0 {
|
|
@@ -818,11 +820,11 @@ &sound {
|
|
simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>;
|
|
simple-audio-card,widgets = "Microphone", "Headset Microphone",
|
|
"Microphone", "Internal Microphone",
|
|
- "Headphone", "Headphone Jack",
|
|
+ "Headphone", "Headphone",
|
|
"Speaker", "Internal Earpiece",
|
|
"Speaker", "Internal Speaker";
|
|
simple-audio-card,routing =
|
|
- "Headphone Jack", "HP",
|
|
+ "Headphone", "HP",
|
|
"Internal Earpiece", "EARPIECE",
|
|
"Internal Speaker", "Speaker Amp OUTL",
|
|
"Internal Speaker", "Speaker Amp OUTR",
|
|
--
|
|
2.31.1
|
|
|