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.
29 lines
1 KiB
Diff
29 lines
1 KiB
Diff
From 18ffb110c41738fb8661cd0c98749b89c26daa3d Mon Sep 17 00:00:00 2001
|
|
From: Martijn Braam <martijn@brixit.nl>
|
|
Date: Mon, 15 Feb 2021 13:10:37 -0800
|
|
Subject: [PATCH] pinephone: fix pogopin i2c
|
|
|
|
---
|
|
arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi | 6 +-----
|
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
|
index 1a096576d258..4abda4fac41f 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
|
|
@@ -645,11 +645,7 @@ &pio {
|
|
vcc-pb-supply = <®_dcdc1>;
|
|
vcc-pc-supply = <®_dcdc1>;
|
|
vcc-pd-supply = <®_dcdc1>;
|
|
- /* pinctrl would enable this even if no camera is powered,
|
|
- * which is wrong/not necessary
|
|
- *
|
|
- * vcc-pe-supply = <®_aldo1>; (also used by pogo pins i2c)
|
|
- */
|
|
+ vcc-pe-supply = <®_aldo1>; /* (also used by pogo pins i2c) */
|
|
vcc-pf-supply = <®_dcdc1>;
|
|
vcc-pg-supply = <®_dldo4>;
|
|
vcc-ph-supply = <®_dcdc1>;
|
|
--
|
|
2.31.1
|
|
|