3fd5a9a568
Update ov5640 autofocus related patch. We had it working with Martijn's patch in 5.9.1_git20201019-r2 (MR 1654), but then dropped the patch in favor of the patch that was added to megi's tree in 5.9.3_git20201101 (MR 1678). It turns out that the patch added to megi's tree was different than the patch we were carrying, it was a WIP version where loading the autofocus firmware did not work anymore. Megi decided to drop the autofocus patch from his tree for now, as the firmware uploader takes more time in Martijn's proper patch. According to Martijn it takes about a second, which seems reasonable for the postmarketOS use case. I've added the previous version again as out-of-tree patch. Martijn found that for some reason the continuous autofocus still doesn't want to start with this kernel and current patch version, as for some reason the firmware load fails. But he extended the patch to make autofocus work again with "tap to focus" at least. 0005-dts-pinephone-Disable-flash-led-in-OV5640-node.patch is not needed anymore, the same change is in megi's tree. Co-Authored-By: Martijn Braam <martijn@brixit.nl> [ci:skip-build]: already built successfully in CI
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From c068dec3d226160c71931dbd1fdb2287631776c3 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 20c368f00939..cc4fe685b922 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.25.4
|
|
|