forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

linux-postmarketos-allwinner: upgrade to 5.11.0 (MR 1955)

Browse source 
Upgrades to megi's 5.11 orange-pi-5.11-20210218-0749 tag.

All patches were rebased.
This commit is contained in:
Clayton Craft 2021-02-15 13:24:48 -08:00
parent f25b49af0b
commit a2524184ed
No known key found for this signature in database
GPG key ID: 7A3461CA187CEA54
13 changed files with 124 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main/linux-postmarketos-allwinner/0001-dts-add-dontbeevil-pinephone-devkit.patch
View file

@ -1,4 +1,4 @@
From 57b473e72d59c4c5cb2cc45432d4d5d10aca5003 Mon Sep 17 00:00:00 2001
From 99cd186fc2084dc91553b72c2560ec57d76ec96d Mon Sep 17 00:00:00 2001
From: Martijn Braam <martijn@brixit.nl>
Date: Sat, 20 Apr 2019 01:19:48 +0200
Subject: [PATCH] dts: add dontbeevil (pinephone devkit)
@ -17,7 +17,7 @@ Subject: [PATCH] dts: add dontbeevil (pinephone devkit)
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-dontbeevil.dts
diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
index 916d10d5b87c..a21cfdd8924d 100644
index 211d1e9d4701..9ab527d81dd8 100644
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -1,6 +1,8 @@
@ -532,5 +532,5 @@ index 000000000000..15a91f2d6202
+ status = "disabled";
+};
--
2.25.4
2.30.1

8
main/linux-postmarketos-allwinner/0002-dts-add-pinetab-dev-old-display-panel.patch
View file

@ -1,4 +1,4 @@
From 33212e529708fd480eaf9cc76579f8e7044c0505 Mon Sep 17 00:00:00 2001
From 1df366384bb44a1c4b5bf76cd3b541f81c7fa5aa Mon Sep 17 00:00:00 2001
From: Martijn Braam <martijn@brixit.nl>
Date: Tue, 20 Oct 2020 14:42:01 +0200
Subject: [PATCH] dts: add pinetab-dev (old display panel)
@ -10,7 +10,7 @@ Subject: [PATCH] dts: add pinetab-dev (old display panel)
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts
diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
index a21cfdd8924d..2936092002b5 100644
index 9ab527d81dd8..94c901f1b57a 100644
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinephone-1.0.dtb
@ -20,7 +20,7 @@ index a21cfdd8924d..2936092002b5 100644
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-pinetab-dev.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-sopine-baseboard.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a64-teres-i.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-bananapi-m2-plus.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-a100-allwinner-perf1.dtb
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab-dev.dts
new file mode 100644
index 000000000000..1e287f2fb9f3
@ -57,5 +57,5 @@ index 000000000000..1e287f2fb9f3
+ };
+};
--
2.25.4
2.30.1

6
main/linux-postmarketos-allwinner/0004-dts-pinetab-add-missing-bma223-ohci1.patch → main/linux-postmarketos-allwinner/0003-dts-pinetab-add-missing-bma223-ohci1.patch
View file

@ -1,4 +1,4 @@
From c40b6c20e60a52ab3d507793676bbdcadd80ff27 Mon Sep 17 00:00:00 2001
From 2be6bdc7b80171a3b78c6e5d81decba2469e1cd2 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Tue, 20 Oct 2020 11:11:48 +0200
Subject: [PATCH] dts: pinetab: add missing bma223, ohci1
@ -13,7 +13,7 @@ https://gitlab.com/pine64-org/linux/-/commit/69ae7087ec51b09bb6a0afb53dddb5eb030
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
index a87790df94b3..20c368f00939 100644
index 91134608770a..fc7a3b895d5e 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
@@ -225,7 +225,15 @@ &i2c0_pins {
@ -45,5 +45,5 @@ index a87790df94b3..20c368f00939 100644
status = "okay";
};
--
2.25.4
2.30.1

8
main/linux-postmarketos-allwinner/0006-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch → main/linux-postmarketos-allwinner/0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
View file

@ -1,4 +1,4 @@
From 34023e3ddf56fc9fb8003e0ceded116b20285c4d Mon Sep 17 00:00:00 2001
From 56bb010ca6473c16b1b801be0008071223fbb27e Mon Sep 17 00:00:00 2001
From: Martijn Braam <martijn@brixit.nl>
Date: Tue, 20 Oct 2020 16:12:08 +0200
Subject: [PATCH] arm64: dts: allwinner: Add bluetooth node to the PineTab
@ -8,10 +8,10 @@ Subject: [PATCH] arm64: dts: allwinner: Add bluetooth node to the PineTab
1 file changed, 13 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
index cc4fe685b922..72ad4fb30803 100644
index fc7a3b895d5e..d335b38954c8 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
@@ -488,6 +488,19 @@ &uart0 {
@@ -487,6 +487,19 @@ &uart0 {
status = "okay";
};
@ -32,5 +32,5 @@ index cc4fe685b922..72ad4fb30803 100644
dr_mode = "otg";
status = "okay";
--
2.25.4
2.30.1

6
main/linux-postmarketos-allwinner/0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
View file

@ -1,4 +1,4 @@
From c068dec3d226160c71931dbd1fdb2287631776c3 Mon Sep 17 00:00:00 2001
From 9ca231eadf446d91ad09a8fdb6b702f5585d10bb 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
@ -8,7 +8,7 @@ Subject: [PATCH] dts: pinetab: make audio routing consistent with pinephone
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
index d335b38954c8..ba62412747f1 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 @@ &reg_rtc_ldo {
@ -38,5 +38,5 @@ index 20c368f00939..cc4fe685b922 100644
"ADCR", "Right ADC",
"Internal Microphone Left", "MBIAS",
--
2.25.4
2.30.1

10
main/linux-postmarketos-allwinner/0007-dts-pinephone-remove-bt-firmware-suffix.patch → main/linux-postmarketos-allwinner/0006-dts-pinephone-remove-bt-firmware-suffix.patch
View file

@ -1,4 +1,4 @@
From f04b2bf8d1bd81ac99dfc8c95fcadb9a7af64b8a Mon Sep 17 00:00:00 2001
From 4c739a5ecb381c174286ae5b375a14dbf9fdb094 Mon Sep 17 00:00:00 2001
From: Martijn Braam <martijn@brixit.nl>
Date: Tue, 20 Oct 2020 17:58:00 +0200
Subject: [PATCH] dts: pinephone: remove bt firmware suffix
@ -8,17 +8,17 @@ Subject: [PATCH] dts: pinephone: remove bt firmware suffix
1 file changed, 1 deletion(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
index 6bc0e9d6d847..d897b6a28cc4 100644
index 41bc8612756f..98f94c7577ee 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
@@ -822,7 +822,6 @@ bluetooth {
reset-gpios = <&r_pio 0 4 GPIO_ACTIVE_LOW>; /* PL4 */
@@ -866,7 +866,6 @@ bluetooth {
device-wake-gpios = <&pio 7 6 GPIO_ACTIVE_LOW>; /* PH6 */
enable-gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
host-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
- firmware-postfix = "pinephone";
};
};
--
2.25.4
2.30.1

36
main/linux-postmarketos-allwinner/0008-media-ov5640-Implement-autofocus.patch → main/linux-postmarketos-allwinner/0007-media-ov5640-Implement-autofocus.patch
View file

@ -1,4 +1,4 @@
From f062022f2a2781d6b8ca63c460b0e72ebac30870 Mon Sep 17 00:00:00 2001
From 4ff393c2bf25a3be0464c85696f6501a701bbf9c Mon Sep 17 00:00:00 2001
From: Martijn Braam <martijn@brixit.nl>
Date: Mon, 28 Sep 2020 14:26:11 +0200
Subject: [PATCH] media: ov5640: Implement autofocus
@ -11,11 +11,11 @@ this at least makes it possible to focus on the center of the sensor.
Signed-off-by: Martijn Braam <martijn@brixit.nl>
---
drivers/media/i2c/ov5640.c | 254 +++++++++++++++++++++++++++++++++++++
1 file changed, 254 insertions(+)
drivers/media/i2c/ov5640.c | 273 +++++++++++++++++++++++++++++++++++++
1 file changed, 273 insertions(+)
diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c
index df0a507c211f..08a5304c0e95 100644
index 7764e755bd05..65ab69f6b71a 100644
--- a/drivers/media/i2c/ov5640.c
+++ b/drivers/media/i2c/ov5640.c
@@ -9,6 +9,7 @@
@ -61,7 +61,7 @@ index df0a507c211f..08a5304c0e95 100644
#define OV5640_REG_TIMING_DVPHO 0x3808
#define OV5640_REG_TIMING_DVPVO 0x380a
#define OV5640_REG_TIMING_HTS 0x380c
@@ -95,6 +109,20 @@
@@ -96,6 +110,20 @@
#define OV5640_REG_SDE_CTRL4 0x5584
#define OV5640_REG_SDE_CTRL5 0x5585
#define OV5640_REG_AVG_READOUT 0x56a1
@ -81,8 +81,8 @@ index df0a507c211f..08a5304c0e95 100644
+#define OV5640_FW_CMD_DEFAULT_ZONES 0x80
enum ov5640_mode_id {
OV5640_MODE_QCIF_176_144 = 0,
@@ -218,6 +246,12 @@ struct ov5640_ctrls {
OV5640_MODE_QQVGA_160_120 = 0,
@@ -220,6 +248,12 @@ struct ov5640_ctrls {
struct v4l2_ctrl *auto_gain;
struct v4l2_ctrl *gain;
};
@ -95,7 +95,7 @@ index df0a507c211f..08a5304c0e95 100644
struct v4l2_ctrl *brightness;
struct v4l2_ctrl *light_freq;
struct v4l2_ctrl *saturation;
@@ -261,6 +295,8 @@ struct ov5640_dev {
@@ -263,6 +297,8 @@ struct ov5640_dev {
bool pending_mode_change;
bool streaming;
@ -104,7 +104,7 @@ index df0a507c211f..08a5304c0e95 100644
};
static inline struct ov5640_dev *to_ov5640_dev(struct v4l2_subdev *sd)
@@ -1967,6 +2003,118 @@ static void ov5640_reset(struct ov5640_dev *sensor)
@@ -1927,6 +1963,118 @@ static void ov5640_reset(struct ov5640_dev *sensor)
usleep_range(20000, 25000);
}
@ -223,7 +223,7 @@ index df0a507c211f..08a5304c0e95 100644
static int ov5640_set_power_on(struct ov5640_dev *sensor)
{
struct i2c_client *client = sensor->i2c_client;
@@ -1988,6 +2117,8 @@ static int ov5640_set_power_on(struct ov5640_dev *sensor)
@@ -1948,6 +2096,8 @@ static int ov5640_set_power_on(struct ov5640_dev *sensor)
goto xclk_off;
}
@ -232,7 +232,7 @@ index df0a507c211f..08a5304c0e95 100644
ov5640_reset(sensor);
ov5640_power(sensor, true);
@@ -2416,6 +2547,35 @@ static int ov5640_set_framefmt(struct ov5640_dev *sensor,
@@ -2463,6 +2613,35 @@ static int ov5640_set_framefmt(struct ov5640_dev *sensor,
is_jpeg ? (BIT(5) | BIT(3)) : 0);
}
@ -268,7 +268,7 @@ index df0a507c211f..08a5304c0e95 100644
/*
* Sensor Controls.
*/
@@ -2532,6 +2692,41 @@ static int ov5640_set_ctrl_exposure(struct ov5640_dev *sensor,
@@ -2579,6 +2758,41 @@ static int ov5640_set_ctrl_exposure(struct ov5640_dev *sensor,
return ret;
}
@ -310,7 +310,7 @@ index df0a507c211f..08a5304c0e95 100644
static int ov5640_set_ctrl_gain(struct ov5640_dev *sensor, bool auto_gain)
{
struct ov5640_ctrls *ctrls = &sensor->ctrls;
@@ -2638,6 +2833,32 @@ static int ov5640_set_ctrl_vflip(struct ov5640_dev *sensor, int value)
@@ -2685,6 +2899,32 @@ static int ov5640_set_ctrl_vflip(struct ov5640_dev *sensor, int value)
(BIT(2) | BIT(1)) : 0);
}
@ -343,7 +343,7 @@ index df0a507c211f..08a5304c0e95 100644
static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
{
struct v4l2_subdev *sd = ctrl_to_sd(ctrl);
@@ -2659,6 +2880,12 @@ static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
@@ -2706,6 +2946,12 @@ static int ov5640_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
return val;
sensor->ctrls.exposure->val = val;
break;
@ -356,7 +356,7 @@ index df0a507c211f..08a5304c0e95 100644
}
return 0;
@@ -2690,6 +2917,18 @@ static int ov5640_s_ctrl(struct v4l2_ctrl *ctrl)
@@ -2737,6 +2983,18 @@ static int ov5640_s_ctrl(struct v4l2_ctrl *ctrl)
case V4L2_CID_AUTO_WHITE_BALANCE:
ret = ov5640_set_ctrl_white_balance(sensor, ctrl->val);
break;
@ -375,7 +375,7 @@ index df0a507c211f..08a5304c0e95 100644
case V4L2_CID_HUE:
ret = ov5640_set_ctrl_hue(sensor, ctrl->val);
break;
@@ -2762,6 +3001,20 @@ static int ov5640_init_controls(struct ov5640_dev *sensor)
@@ -2809,6 +3067,20 @@ static int ov5640_init_controls(struct ov5640_dev *sensor)
ctrls->gain = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAIN,
0, 1023, 1, 0);
@ -396,7 +396,7 @@ index df0a507c211f..08a5304c0e95 100644
ctrls->saturation = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SATURATION,
0, 255, 1, 64);
ctrls->hue = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_HUE,
@@ -2795,6 +3048,7 @@ static int ov5640_init_controls(struct ov5640_dev *sensor)
@@ -2842,6 +3114,7 @@ static int ov5640_init_controls(struct ov5640_dev *sensor)
v4l2_ctrl_auto_cluster(3, &ctrls->auto_wb, 0, false);
v4l2_ctrl_auto_cluster(2, &ctrls->auto_gain, 0, true);
v4l2_ctrl_auto_cluster(2, &ctrls->auto_exp, 1, true);
@ -405,5 +405,5 @@ index df0a507c211f..08a5304c0e95 100644
sensor->sd.ctrl_handler = hdl;
return 0;
--
2.25.4
2.30.1

4
main/linux-postmarketos-allwinner/0009-leds-gpio-set-max_brightness-to-1.patch → main/linux-postmarketos-allwinner/0008-leds-gpio-Set-max-brightness-to-1.patch
View file

@ -1,4 +1,4 @@
From ecc1613977400f117a4f399d46404b399547ee18 Mon Sep 17 00:00:00 2001
From 9a4733f7b64738942086b6ddef7975550460c989 Mon Sep 17 00:00:00 2001
From: Dylan Van Assche <me@dylanvanassche.be>
Date: Tue, 29 Dec 2020 14:59:23 +0100
Subject: [PATCH] leds: gpio: Set max brightness to 1
@ -32,5 +32,5 @@ index 93f5b1b60fde..0d66f19d71ba 100644
led_dat->cdev.flags |= LED_CORE_SUSPENDRESUME;
if (template->panic_indicator)
--
2.26.2
2.30.1

14
main/linux-postmarketos-allwinner/0010-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch → main/linux-postmarketos-allwinner/0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch
View file

@ -1,4 +1,4 @@
From 05044b9e4e4ae03f66e1c504d6fef57a1d135897 Mon Sep 17 00:00:00 2001
From e7a18f2a7f00700dd27ccd2254b6c2c5a7a8ae45 Mon Sep 17 00:00:00 2001
From: Dylan Van Assche <me@dylanvanassche.be>
Date: Thu, 24 Dec 2020 19:57:12 +0100
Subject: [PATCH] dts: pinephone: Add 'pine64,pinephone' to compat list
@ -13,7 +13,7 @@ haptic feedbackd.
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
index 0f6faa44c..2e0892b32 100644
index c7ff4b7c193b..a21c6d78a0ef 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
@@ -7,7 +7,7 @@
@ -26,7 +26,7 @@ index 0f6faa44c..2e0892b32 100644
reg_vbus: usb0-vbus {
compatible = "regulator-fixed";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
index 95a880fdc..d6bad0838 100644
index 85b50a2a4d4f..d67f31ef529e 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
@@ -7,7 +7,7 @@
@ -39,7 +39,7 @@ index 95a880fdc..d6bad0838 100644
reg_vbus: usb0-vbus {
compatible = "regulator-fixed";
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
index 23ba72508..710493186 100644
index 05bb42023b30..9b33186c7e7d 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
@@ -7,7 +7,7 @@
@ -48,9 +48,9 @@ index 23ba72508..710493186 100644
model = "Pine64 PinePhone (1.2)";
- compatible = "pine64,pinephone-1.2", "allwinner,sun50i-a64";
+ compatible = "pine64,pinephone-1.2", "pine64,pinephone", "allwinner,sun50i-a64";
};
&axp803 {
wifi_pwrseq: wifi-pwrseq {
compatible = "mmc-pwrseq-simple";
--
2.26.2
2.30.1

46
main/linux-postmarketos-allwinner/0011-dts-pinephone-drop-modem-power-node.patch → main/linux-postmarketos-allwinner/0010-dts-pinephone-drop-modem-power-node.patch
View file

@ -1,4 +1,4 @@
From 5da6a7e3f4d6e11f4887893672f849d2d4fa5b58 Mon Sep 17 00:00:00 2001
From f846c719096012c9af482e8945cc01731ac7f31f Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Wed, 16 Dec 2020 20:16:14 -0800
Subject: [PATCH] dts: pinephone: drop modem-power node
@ -11,7 +11,7 @@ Subject: [PATCH] dts: pinephone: drop modem-power node
4 files changed, 24 insertions(+), 68 deletions(-)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
index 0f6faa44ce3e..2cc513772172 100644
index a21c6d78a0ef..7f0cfdafed15 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts
@@ -86,28 +86,6 @@ &reg_drivevbus {
@ -52,14 +52,14 @@ index 0f6faa44ce3e..2cc513772172 100644
+};
+
&sgm3140 {
flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
enable-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
index 95a880fdc9ce..5f3b6a1a142f 100644
index d67f31ef529e..e7b636299d15 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts
@@ -109,29 +109,6 @@ &reg_drivevbus {
status = "okay";
@@ -114,29 +114,6 @@ &sgm3140 {
flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
};
-&uart3 {
@ -88,23 +88,20 @@ index 95a880fdc9ce..5f3b6a1a142f 100644
&usbphy {
usb-role-switch;
@@ -142,6 +119,10 @@ usb0_drd_sw: endpoint {
@@ -146,3 +123,7 @@ usb0_drd_sw: endpoint {
};
};
};
+
+&ring_indicator {
+ gpios = <&pio 1 2 GPIO_ACTIVE_LOW>; /* PB2 */
+};
+
&sgm3140 {
flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
index 23ba72508cfc..889841ca5b8a 100644
index 9b33186c7e7d..44b3d6555ff7 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts
@@ -93,29 +93,6 @@ &reg_anx1v0 {
enable-active-high;
@@ -107,29 +107,6 @@ &sgm3140 {
flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
};
-&uart3 {
@ -133,23 +130,20 @@ index 23ba72508cfc..889841ca5b8a 100644
&usbphy {
usb-role-switch;
@@ -126,6 +103,10 @@ usb0_drd_sw: endpoint {
@@ -139,3 +116,7 @@ usb0_drd_sw: endpoint {
};
};
};
+
+&ring_indicator {
+ gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL6 */
+};
+
&sgm3140 {
flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
index 02d82980cf39..979d01de8d84 100644
index 98f94c7577ee..67c58907ae1b 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
@@ -192,6 +192,17 @@ ec25_codec: ec25-codec {
compatible = "quectel,ec25";
@@ -191,6 +191,17 @@ ec25_codec: ec25-codec {
sound-name-prefix = "Modem";
};
+ gpio-keys {
@ -166,7 +160,7 @@ index 02d82980cf39..979d01de8d84 100644
i2c_csi: i2c-csi {
compatible = "i2c-gpio";
sda-gpios = <&pio 4 13 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; /* PE13 */
@@ -256,6 +267,7 @@ reg_usb_5v: usb-5v {
@@ -255,6 +266,7 @@ reg_usb_5v: usb-5v {
reg_vbat_bb: vbat-bb {
compatible = "regulator-fixed";
regulator-name = "vbat-bb";
@ -175,5 +169,5 @@ index 02d82980cf39..979d01de8d84 100644
regulator-max-microvolt = <3500000>;
gpio = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
--
2.29.2
2.30.1

18
main/linux-postmarketos-allwinner/0012-dts-headphone-jack-detection.patch → main/linux-postmarketos-allwinner/0011-dts-pinephone-jack-detection.patch
View file

@ -1,8 +1,17 @@
From e2a0d1f3af7b051890cb003c9b0df18651b44f42 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 086b5ebfa512..b4a71b02c474 100644
index 67c58907ae1b..39fdf96fe95d 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
@@ -304,11 +304,13 @@ &codec {
@@ -346,11 +346,13 @@ &codec {
pinctrl-names = "default";
pinctrl-0 = <&aif2_pins>, <&aif3_pins>;
status = "okay";
@ -16,7 +25,7 @@ index 086b5ebfa512..b4a71b02c474 100644
};
&cpu0 {
@@ -758,11 +760,11 @@ &sound {
@@ -808,11 +810,11 @@ &sound {
simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>;
simple-audio-card,widgets = "Microphone", "Headset Microphone",
"Microphone", "Internal Microphone",
@ -30,3 +39,6 @@ index 086b5ebfa512..b4a71b02c474 100644
"Internal Earpiece", "EARPIECE",
"Internal Speaker", "Speaker Amp OUTL",
"Internal Speaker", "Speaker Amp OUTR",
--
2.30.1

16
main/linux-postmarketos-allwinner/0013-fix-pogopin-i2c.patch → main/linux-postmarketos-allwinner/0012-pinephone-fix-pogopin-i2c.patch
View file

@ -1,8 +1,17 @@
From d753557c64f6e85f63cffab53496d6271d724074 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 086b5ebfa512..f929af5c34bb 100644
index 39fdf96fe95d..7d0dd52e2f9d 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
@@ -592,11 +592,7 @@ &pio {
@@ -635,11 +635,7 @@ &pio {
vcc-pb-supply = <&reg_dcdc1>;
vcc-pc-supply = <&reg_dcdc1>;
vcc-pd-supply = <&reg_dcdc1>;
@ -15,3 +24,6 @@ index 086b5ebfa512..f929af5c34bb 100644
vcc-pf-supply = <&reg_dcdc1>;
vcc-pg-supply = <&reg_dldo4>;
vcc-ph-supply = <&reg_dcdc1>;
--
2.30.1

51
main/linux-postmarketos-allwinner/APKBUILD
View file

@ -2,12 +2,13 @@
# Co-Maintainer: Luca Weiss <luca@z3ntu.xyz>
# Co-Maintainer: Bart Ribbers <bribbers@disroot.org>
# Co-Maintainer: Oliver Smith <ollieparanoid@postmarketos.org>
# Co-Maintainer: Clayton Craft <clayton@craftyguy.net>
_flavor=postmarketos-allwinner
_config="config-$_flavor.$CARCH"
pkgname=linux-$_flavor
pkgver=5.10.12_git20210130
pkgrel=4
_tag="orange-pi-5.10-20210130-2109"
pkgver=5.11.0_git20210218
pkgrel=0
_tag="orange-pi-5.11-20210218-0749"
pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
arch="aarch64"
_carch="arm64"
@ -29,16 +30,16 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar
config-$_flavor.aarch64
0001-dts-add-dontbeevil-pinephone-devkit.patch
0002-dts-add-pinetab-dev-old-display-panel.patch
0004-dts-pinetab-add-missing-bma223-ohci1.patch
0003-dts-pinetab-add-missing-bma223-ohci1.patch
0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
0006-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
0007-dts-pinephone-remove-bt-firmware-suffix.patch
0008-media-ov5640-Implement-autofocus.patch
0009-leds-gpio-set-max_brightness-to-1.patch
0010-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch
0011-dts-pinephone-drop-modem-power-node.patch
0012-dts-headphone-jack-detection.patch
0013-fix-pogopin-i2c.patch
0006-dts-pinephone-remove-bt-firmware-suffix.patch
0007-media-ov5640-Implement-autofocus.patch
0008-leds-gpio-Set-max-brightness-to-1.patch
0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch
0010-dts-pinephone-drop-modem-power-node.patch
0011-dts-pinephone-jack-detection.patch
0012-pinephone-fix-pogopin-i2c.patch
"
subpackages="$pkgname-dev"
builddir="$srcdir/linux-$_tag"
@ -79,17 +80,17 @@ dev() {
INSTALL_HDR_PATH="$subpkgdir"/usr
}
sha512sums="3cbab8dfc280cdbdfb84f028a41c649e43d57841e4cf9dd8c1476f07b733fc3975587ca9930612aa0151c1d543b28636378c363f06b7ed8a2c1ac97efebf7bc9 linux-postmarketos-allwinner-orange-pi-5.10-20210130-2109.tar.gz
sha512sums="aadf630887b39a27bbe1cd088532f1244f690f5590620317364252e8f2b29d681bc33545cb3070dcf593bee4ee5a94923db8cf7c1056173135c87530603f1c19 linux-postmarketos-allwinner-orange-pi-5.11-20210218-0749.tar.gz
3a8ccd45317f49ad7416b499a4c766bfffecc3449518e2c7be809d3537ece2d0c7d3da6bbdfb85f7494c294563497f84f1f311cbfded056018248cee31c6fed2 config-postmarketos-allwinner.aarch64
6b96dcdca84f0581d1f6354dfb752ef382b2a70793e881233e71c2af0c58d0eed965be7a494308a639e2e9035e46535f659e0c1721c0e3b8444a2ac981d7dc99 0001-dts-add-dontbeevil-pinephone-devkit.patch
5cd62667ebe1d5213d5d89423fe2a810c55fa84a238790af5f087b31cee3a3db66bcaba14001c345731bc1212060f74c0629433403be2485a5bbd4f0dd1c4f65 0002-dts-add-pinetab-dev-old-display-panel.patch
10eb10fe09258e524b8770961e44bcda55189f86b0f21cf12c831beb94e9b81c66857771bbe75833d56a7bd44907efceb0e1c4022fcaaf8f1d106a83ec8a19eb 0004-dts-pinetab-add-missing-bma223-ohci1.patch
26bd19eb7849ad59ac73a002edeb5d015630c0f802b4da1ec75a01581aeb406350097b5e37ef5c0981cc503cdbfc4d24d446c193a533f01e3e4b51426c9e192e 0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
79f244794906b84f2033b04429f9bf187f171291c8f808a65f6d2c3a9b8a029eb0460f281148ff4a43c12be4fac3d78fcc4ddfa4c14e687a3f7fc310a5921048 0006-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
11e3210958afcd9a04885f364d9ce707845173430581601cc8d08451529f80aab137f1c578ab3453e7249fe38001eb6aafe728ba5e34e39b65c7e47a3ecd9fda 0007-dts-pinephone-remove-bt-firmware-suffix.patch
510e1cf463485315f99dfc86511fb7271591159c39cf1bbeecbc1056f8861c35603d61946f3488bfbb7a779ce9324c69d230fa159386b7920f866b47ada444a4 0008-media-ov5640-Implement-autofocus.patch
6dee374e8459279e2e61894ab9146574283dad61605e4547a1258dd09e02646e46712059431b4086aebb95d24ab44c8b5dc21aa9d004f0190f864045a20b336a 0009-leds-gpio-set-max_brightness-to-1.patch
27c091b4fd306b5f6fbadac5881ecc5465804ea910eb299445f7d4f04d09e05b8cb708bf4ac24f9ae2a77afa287bfbebe691f6d90db189896c6951ff8f30bcf5 0010-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch
1d0683871027bd13e03e469fc23c3394b3dbfb48115e19b03638f68970ccfa9583b70ab21d76e68973af803d5387f474f4fe58c90e58985f96c6aec8489aa96a 0011-dts-pinephone-drop-modem-power-node.patch
c93490ebfd7405df2784d78b45bc7ddf985cfa270d0d94c054002f582541f11d28fe216db849cae99d78c3250187d667f305f8a4848d505d0a69a0cbc559be82 0012-dts-headphone-jack-detection.patch
e64d06272ce1e295d8bd444611216ac33c99ad200bdffa2c3e777e9045a744ec66f7908355c1d4a1a85a94f2c4dbc4c1e6ba0e0054348aef52dc8dd6350be444 0013-fix-pogopin-i2c.patch"
b174532e356dcb2144c2629c1747dcb0026a40aa8e4deca5bde67344d271e519ff90f6fa287633b1dec857855331e4aa1d1bd5fd0d73044309f98e8d829e2be0 0001-dts-add-dontbeevil-pinephone-devkit.patch
898e5e6dbdfa5b2f2154818bf006f2ae4d162a246c58dab5c43534e7630a35faf48ba74f6d2493d7500ad956a0e71c0b85ca9d7a51044c21d7d87b6f27b055f5 0002-dts-add-pinetab-dev-old-display-panel.patch
55f8bc826d7958d8fd16c59663746529be80daacdca9425e5678ee175bf0b93e4c1e0d2b5878ee58b488dde7eb7a05e438ec16c97c4298d3f272957a5caf183d 0003-dts-pinetab-add-missing-bma223-ohci1.patch
6135bffc2ab948169f6fb27b925ca64a4f2ad8cb58d66123f2bcb1c6e64ac68a92ab419bc1b19eaac64d508de46e4a2de639251f92f78596dece5941ded39e5d 0004-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch
f63ce49ef59fe2650d52e73e5ecbee3c2b2a3b4cb5c95703d19960a1775f7bf25e3f0ffee55201418019b911aa114277c0b04a8b19b8786ae4af4a734ea3d11a 0005-dts-pinetab-make-audio-routing-consistent-with-pinep.patch
e8eca7814daf76ebe658bdf988a062c4ed433cee5fde522b8d64492267716a5e7ae91b55877253ccedb44f5365b8a085989410a64371728189e444aee4f54655 0006-dts-pinephone-remove-bt-firmware-suffix.patch
22058627fd8e8d591d14d22e3ff5a19b8118e78f6bc620044ed68413fdac6cf1adeb77c75f4a2bae509b2294fe62b9c3fd18fb096e758dcd1bef47b515258ab5 0007-media-ov5640-Implement-autofocus.patch
662641bcb112d0568de3436269969d12a607820ea422554d8b7dfd3c5dbcef7e5ac60d47218a0d8a3c05044792b20ca22240a1007282472eade443670780b99a 0008-leds-gpio-Set-max-brightness-to-1.patch
95335f5755f8385c824cc8fb55af8b11ab02196ea6f49a80fe1ed964c0287fd6e41b597d50de615308e2cd53e0b0a471d452ea3ff8503caccfc17561c393c7f2 0009-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch
e9cfb545c216c061da243b0eeb2169ff11e80898270a87f432cec937057d585313109d4ae9487a6641eeb5de1b0be69b7615bfca99fb64ab7227d941e6f129c1 0010-dts-pinephone-drop-modem-power-node.patch
789ae2e405f00e897c357427c587cb7a4a3d3a68b77b9700fb6f6a67d92314fcf75f2ad8b65c0d046215bb7bd5fcf65e4e8e31748170ed595bef1ba3010dd0bf 0011-dts-pinephone-jack-detection.patch
611bab79b36ee3a9ff8504fa5c56964a0ff1bcd65eacc692d8d991a9bc300e2b16c6d69f4bcad3a35315e848653c2969a985446c385081f019d3e4e74521f42c 0012-pinephone-fix-pogopin-i2c.patch"