linux-postmarketos-omap: re-add twl for basic soc reset (MR 4321)

Fix shutdown regression introduced with 3e737241ba ("linux-postmarketos-omap:
N900: disable twl off idle features"). After that commit, shutdown never
completes.

[ci:skip-build]: Already built successfully in CI
This commit is contained in:
Sicelo A. Mhlongo 2023-08-09 21:51:51 +02:00 committed by Stefan Hansson
parent b6f0cfda68
commit 56ad1cd821
No known key found for this signature in database
GPG key ID: 990600ED1DB95E02
2 changed files with 12 additions and 9 deletions

View file

@ -1,17 +1,20 @@
From 31f6c1e43a1287747861b812d850b656deb92f5f Mon Sep 17 00:00:00 2001 From 3653ae0bb94f6166fb0091c39ab1f30d8542c46d Mon Sep 17 00:00:00 2001
From: "Sicelo A. Mhlongo" <absicsz@gmail.com> From: "Sicelo A. Mhlongo" <absicsz@gmail.com>
Date: Tue, 8 Aug 2023 21:52:14 +0200 Date: Wed, 9 Aug 2023 21:35:12 +0200
Subject: [PATCH] ARM: dts: disable twl off-idle configuration for N900 Subject: [PATCH] ARM: dts: disable twl off-idle configuration for N900
This is a restore of commit d937678ab625b0f6 (:ARM: dts: Revert enabling of twl Disable idling features of the TWL4030 in Nokia N900, while keeping basic power
configuration for n900"), and partially reverts daebabd57864744 ("mfd: reset features (reboot, poweroff).
twl4030-power: Fix PM idle pin configuration to not conflict with regulators").
Related upstream linux commits:
d937678ab625b0f6 (:ARM: dts: Revert enabling of twl configuration for n900")
daebabd57864744 ("mfd: twl4030-power: Fix PM idle pin configuration to not conflict with regulators").
--- ---
arch/arm/boot/dts/omap3-n900.dts | 2 +- arch/arm/boot/dts/omap3-n900.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts diff --git a/arch/arm/boot/dts/omap3-n900.dts b/arch/arm/boot/dts/omap3-n900.dts
index f9f9eca0c56c..2f0b24897afd 100644 index f9f9eca0c56c..31fd8177fbb1 100644
--- a/arch/arm/boot/dts/omap3-n900.dts --- a/arch/arm/boot/dts/omap3-n900.dts
+++ b/arch/arm/boot/dts/omap3-n900.dts +++ b/arch/arm/boot/dts/omap3-n900.dts
@@ -508,7 +508,7 @@ twl_audio: audio { @@ -508,7 +508,7 @@ twl_audio: audio {
@ -19,7 +22,7 @@ index f9f9eca0c56c..2f0b24897afd 100644
twl_power: power { twl_power: power {
- compatible = "ti,twl4030-power-n900", "ti,twl4030-power-idle-osc-off"; - compatible = "ti,twl4030-power-n900", "ti,twl4030-power-idle-osc-off";
+ compatible = "ti,twl4030-power-n900"; + compatible = "ti,twl4030-power-n900", "ti,twl4030-power";
ti,use_poweroff; ti,use_poweroff;
}; };
}; };

View file

@ -4,7 +4,7 @@
pkgname=linux-postmarketos-omap pkgname=linux-postmarketos-omap
pkgver=6.4.3 pkgver=6.4.3
pkgrel=2 pkgrel=3
pkgdesc="Mainline kernel fork for OMAP devices" pkgdesc="Mainline kernel fork for OMAP devices"
arch="armv7" arch="armv7"
url="https://kernel.org/" url="https://kernel.org/"
@ -80,5 +80,5 @@ b2c2d81bdfb4095a87d6821342127cc7c74bbc12a70786a81d64fd264b5487d522effab349fc1de2
1aa4521deb4e6d0977f8e704dd7f38ca3a861212c0ced34145713c72a68d8f255f3631a82c5ef2006f4c8b954fce6198e5d0870392cd4db6b6fb9610abe50c4c 0006-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch 1aa4521deb4e6d0977f8e704dd7f38ca3a861212c0ced34145713c72a68d8f255f3631a82c5ef2006f4c8b954fce6198e5d0870392cd4db6b6fb9610abe50c4c 0006-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
c3af9715b3559c2d593f4fcfa078730722c7deeec132c5b83e085ff4d9815d85ef349384097c580efe1bbc37c60f42e18ef559f0abccfe236080670e4403fa77 0008-hsi-ssi_port-force-pio-path.patch c3af9715b3559c2d593f4fcfa078730722c7deeec132c5b83e085ff4d9815d85ef349384097c580efe1bbc37c60f42e18ef559f0abccfe236080670e4403fa77 0008-hsi-ssi_port-force-pio-path.patch
af26c754ef2892251abfd085a1a0729df2bceb8a6c15d14ab3fdf4716fb897b3dcb43f4efe98009a48e9023af608c293ecd86dce9f31f0f090cfd9f78a97cd84 0009-n900-dts-volume-keys.patch af26c754ef2892251abfd085a1a0729df2bceb8a6c15d14ab3fdf4716fb897b3dcb43f4efe98009a48e9023af608c293ecd86dce9f31f0f090cfd9f78a97cd84 0009-n900-dts-volume-keys.patch
d55071c176ed6b02cc4596b279dcfdccaf8360d7f0133427e23b1ca8a7f36f37ac7e0ecefa276b3005cd685f117e7fb282ff0f2f41eebd59de8bff25c989c07a 0010-ARM-dts-disable-twl-off-idle-configuration-for-N900.patch 352b98eead4a0395e74e358865002c69373271bf60d73d97fcb006d90bc9a2b5edd692ca199d5a21d2e3e2f6e84b012d44434042c9919f0e885034974d018c7a 0010-ARM-dts-disable-twl-off-idle-configuration-for-N900.patch
" "