From 6aa950616974bc20dc4a241de3562629dd1fd370 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Tue, 25 May 2021 17:17:37 -0700
Subject: [PATCH] linux-purism-librem5: upgrade to 5.12.2pureos2 (MR 2199)
Upstream changelog:
https://source.puri.sm/Librem5/linux-next/-/commit/fe856fdde196517cb0c7f564426574a95afb5835
[ci:skip-build]: already built successfully in CI
---
...90_charger-enter-ship-mode-on-power-off.patch | 10 +++++-----
...8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch | 8 ++++----
...5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch | 6 +++---
...8mq-disable-SuperSpeed-instances-in-par.patch | 6 +++---
device/main/linux-purism-librem5/APKBUILD | 16 ++++++++--------
.../config-purism-librem5.aarch64 | 2 +-
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/device/main/linux-purism-librem5/0001-bq25890_charger-enter-ship-mode-on-power-off.patch b/device/main/linux-purism-librem5/0001-bq25890_charger-enter-ship-mode-on-power-off.patch
index 8d2944ec478..8ebcaa7ef22 100644
--- a/device/main/linux-purism-librem5/0001-bq25890_charger-enter-ship-mode-on-power-off.patch
+++ b/device/main/linux-purism-librem5/0001-bq25890_charger-enter-ship-mode-on-power-off.patch
@@ -1,4 +1,4 @@
-From 27212841ea2b3a4ecf0463bb89c101941afcabf8 Mon Sep 17 00:00:00 2001
+From 27afc3e0e791b6dbf0fb2c1ee5073a646089eb59 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Fri, 5 Mar 2021 18:55:28 -0800
Subject: [PATCH] bq25890_charger: enter ship mode on power off
@@ -16,7 +16,7 @@ bq25890 is *not* used to power off system.
1 file changed, 56 insertions(+)
diff --git a/drivers/power/supply/bq25890_charger.c b/drivers/power/supply/bq25890_charger.c
-index c33885e4f48c..7360bc51ef64 100644
+index ef3f152e2ba8..4e31a137bcba 100644
--- a/drivers/power/supply/bq25890_charger.c
+++ b/drivers/power/supply/bq25890_charger.c
@@ -40,6 +40,10 @@ static const char *const bq25890_chip_name[] = {
@@ -30,7 +30,7 @@ index c33885e4f48c..7360bc51ef64 100644
enum bq25890_fields {
F_EN_HIZ, F_EN_ILIM, F_IILIM, /* Reg00 */
F_BHOT, F_BCOLD, F_VINDPM_OFS, /* Reg01 */
-@@ -837,6 +841,43 @@ static int bq25890_power_supply_init(struct bq25890_device *bq)
+@@ -928,6 +932,43 @@ static int bq25890_power_supply_init(struct bq25890_device *bq)
return PTR_ERR_OR_ZERO(bq->charger);
}
@@ -74,7 +74,7 @@ index c33885e4f48c..7360bc51ef64 100644
static void bq25890_usb_work(struct work_struct *data)
{
int ret;
-@@ -1141,6 +1182,17 @@ static int bq25890_probe(struct i2c_client *client,
+@@ -1232,6 +1273,17 @@ static int bq25890_probe(struct i2c_client *client,
goto battery_fail;
}
@@ -92,7 +92,7 @@ index c33885e4f48c..7360bc51ef64 100644
return 0;
battery_fail:
-@@ -1164,6 +1216,10 @@ static int bq25890_remove(struct i2c_client *client)
+@@ -1255,6 +1307,10 @@ static int bq25890_remove(struct i2c_client *client)
/* reset all registers to default values */
bq25890_chip_reset(bq);
diff --git a/device/main/linux-purism-librem5/0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch b/device/main/linux-purism-librem5/0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch
index 17646c0b682..8611b3479ae 100644
--- a/device/main/linux-purism-librem5/0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch
+++ b/device/main/linux-purism-librem5/0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch
@@ -1,4 +1,4 @@
-From 227faf14f8caabd3859f319bc686c9b04c752060 Mon Sep 17 00:00:00 2001
+From 8d4a1c39146442252ac5666889eab7f0160779b0 Mon Sep 17 00:00:00 2001
From: Angus Ainslie <angus@akkea.ca>
Date: Sun, 25 Apr 2021 07:49:49 -0700
Subject: [PATCH] arm64: dts: imx8mq-librem5.dtsi: adjust the usdhc bus speeds
@@ -12,10 +12,10 @@ Signed-off-by: Angus Ainslie <angus@akkea.ca>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
-index 23a853099b8d..1dd25f26b089 100644
+index b2345dd6cc17..8b3d310f976d 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
-@@ -1721,7 +1721,7 @@ mass-storage@1 {
+@@ -1723,7 +1723,7 @@ mass-storage@1 {
&usdhc1 {
assigned-clocks = <&clk IMX8MQ_CLK_USDHC1>;
@@ -24,7 +24,7 @@ index 23a853099b8d..1dd25f26b089 100644
pinctrl-names = "default", "state_100mhz", "state_200mhz";
pinctrl-0 = <&pinctrl_usdhc1>;
pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
-@@ -1748,6 +1748,7 @@ &usdhc2 {
+@@ -1750,6 +1750,7 @@ &usdhc2 {
cap-sdio-irq;
keep-power-in-suspend;
wakeup-source;
diff --git a/device/main/linux-purism-librem5/0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch b/device/main/linux-purism-librem5/0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch
index 18e200748e5..909092a028c 100644
--- a/device/main/linux-purism-librem5/0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch
+++ b/device/main/linux-purism-librem5/0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch
@@ -1,4 +1,4 @@
-From 8a8170ee8699943bfdc58e13e6f3222faa6011b3 Mon Sep 17 00:00:00 2001
+From 009aee6922803a9f21fd7d003676ebbfcfb92f4b Mon Sep 17 00:00:00 2001
From: Sebastian Krzyszkowiak <sebastian.krzyszkowiak@puri.sm>
Date: Thu, 30 Jul 2020 00:20:09 +0200
Subject: [PATCH] imx8mq-librem5-r3: Set the CPU voltage to 1.0V when running
@@ -9,10 +9,10 @@ Subject: [PATCH] imx8mq-librem5-r3: Set the CPU voltage to 1.0V when running
1 file changed, 6 insertions(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts b/arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts
-index 16e09c8851b1..62f1444e4c0d 100644
+index dda383ec81d3..e6c501f7f24c 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5-r3.dts
-@@ -79,3 +79,9 @@ MX8MQ_IOMUXC_UART4_TXD_GPIO5_IO29 0x83
+@@ -103,3 +103,9 @@ MX8MQ_IOMUXC_UART4_TXD_GPIO5_IO29 0x83
&proximity {
proximity-near-level = <25>;
};
diff --git a/device/main/linux-purism-librem5/0004-arm64-dts-imx8mq-disable-SuperSpeed-instances-in-par.patch b/device/main/linux-purism-librem5/0004-arm64-dts-imx8mq-disable-SuperSpeed-instances-in-par.patch
index f6deca9ccd5..6db685e8aa2 100644
--- a/device/main/linux-purism-librem5/0004-arm64-dts-imx8mq-disable-SuperSpeed-instances-in-par.patch
+++ b/device/main/linux-purism-librem5/0004-arm64-dts-imx8mq-disable-SuperSpeed-instances-in-par.patch
@@ -1,4 +1,4 @@
-From f90db476ea4681224510cee0b160c9d7de968fd2 Mon Sep 17 00:00:00 2001
+From 8675304fbfd15484c0ff9ecb7572596bf49449d2 Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Sun, 25 Apr 2021 18:57:45 -0700
Subject: [PATCH] arm64: dts: imx8mq: disable SuperSpeed instances in park mode
@@ -14,10 +14,10 @@ https://source.puri.sm/Librem5/linux-next/-/issues/197#note_114221
1 file changed, 1 insertion(+)
diff --git a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
-index 1dd25f26b089..07aa83b9370f 100644
+index 8b3d310f976d..8d346cfdfa07 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi
-@@ -1704,6 +1704,7 @@ &usb_dwc3_1 {
+@@ -1706,6 +1706,7 @@ &usb_dwc3_1 {
status = "okay";
#address-cells = <1>;
#size-cells = <0>;
diff --git a/device/main/linux-purism-librem5/APKBUILD b/device/main/linux-purism-librem5/APKBUILD
index 04e5047163d..799add3fd2b 100644
--- a/device/main/linux-purism-librem5/APKBUILD
+++ b/device/main/linux-purism-librem5/APKBUILD
@@ -3,8 +3,8 @@
# Co-Maintainer: Bhushan Shah <bshah@kde.org>
pkgname=linux-purism-librem5
pkgver=5.12.2
-pkgrel=0
-_purismrel=1
+pkgrel=1
+_purismrel=2
# <kernel ver>.<purism kernel release>
_purismver=${pkgver}pureos$_purismrel
pkgdesc="Purism Librem 5 phone kernel fork"
@@ -77,10 +77,10 @@ dev() {
INSTALL_HDR_PATH="$subpkgdir"/usr
}
sha512sums="
-b15616545a479c574d3f214cd3c1571998fe4663d4f4f03c2d88d701d5486ee97e4e742597e9d05a136d14141c4809c76cd28e436c2532179759818a6494e8e0 linux-purism-librem5-5.12.2pureos1.tar.gz
-c96ce17c2c90ba89e44aeca392d9df42d8d5f198bc86ec70ce7d112e3f01b6e74ce5805711b5006f48740c789a5368354c2c7fb484a6f5bbe6bc98d0e72758da 0001-bq25890_charger-enter-ship-mode-on-power-off.patch
-63ffa8e40990204f944ab67489fc57bc35e9f21f3c0c3a8d2f5eebba31eb1e4ed31d5973e21d83081f32289ad234e3a5d01c25ebdf5ade6d20595cba4106bf86 0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch
-333a2370d9663a162501338fca0fd7939d7b132ecb738d716047bb8cb0635f458d80ce0d758170211b2233361d0fb3c7266a51e68e7c2307eaba3e52f1084bfe 0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch
-35208c873b0dc3084a9b336ba4ad61afb20d63a7fdffe53be84e9c4da10734ba015b564d7d238df82919b30f52aac266cb3e78797a8304af61ddcd943a729e3c 0004-arm64-dts-imx8mq-disable-SuperSpeed-instances-in-par.patch
-114e005319e4596328c274ab2cf669082d772fc352d3cbfb17a736fe1799c70c607f6620379bdeff96c164a69ef3b0632f781aa33589cddc84118e03a07cff0e config-purism-librem5.aarch64
+e7821149a0c06b1df206597bfa98d0fa597bd93e42e70f09fa41878608c289a6082a67a6065ff3a4271a2f1d7befc0323a61e876682674dcb4618432f6d2f29c linux-purism-librem5-5.12.2pureos2.tar.gz
+0e3caf6275247e31b874b94330dc4f991837a4b62f3c15a1f8ad39a7edd02ae499679bcd7ddc9463bb1c1a5073ea5980fa144a2ece804d72a6b2fc8c76c50766 0001-bq25890_charger-enter-ship-mode-on-power-off.patch
+1dbf2adaf097bcce3ee179cd6b0f10d2ebefdc82191d34fffea8cb336c9dcbc66b717bf97a2e264b8068f178c0254f2b1281a09ae72d4825fd7b4a39916c0461 0002-arm64-dts-imx8mq-librem5.dtsi-adjust-the-usdhc-bus-s.patch
+c52f9e7e17f876697000a0c3b959a0d571ca506ba55ee5158e30ac00e148372097c88951a354190f669137a955405c87042a925c1bbe3cd91df40721650d45d3 0003-imx8mq-librem5-r3-Set-the-CPU-voltage-to-1.0V-when-r.patch
+0c6c92bf99ab4e45f623bf06d6f49b047556c4431e5bc416e9f5055a0b4d1a073b8e4e4c1c68435cd502defb42e4f77184de4f22ea834b2cbeeb17d64295a971 0004-arm64-dts-imx8mq-disable-SuperSpeed-instances-in-par.patch
+0c9efa81bb075b288c9f21d1b815553a7111b136908e34453296e4b24dae4315f0a2c0a4bad29ab578eb97a76de07dad0eec3a3b08672cbb33d6d07b6ff884f6 config-purism-librem5.aarch64
"
diff --git a/device/main/linux-purism-librem5/config-purism-librem5.aarch64 b/device/main/linux-purism-librem5/config-purism-librem5.aarch64
index db6edce9001..9194ec1f185 100644
--- a/device/main/linux-purism-librem5/config-purism-librem5.aarch64
+++ b/device/main/linux-purism-librem5/config-purism-librem5.aarch64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.12.0 Kernel Configuration
+# Linux/arm64 5.12.2 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.3.1_git20210424) 10.3.1 20210424"
CONFIG_CC_IS_GCC=y
--
GitLab