linux-postmarketos-omap: upgrade to 6.2.1 (MR 3911)
- upgrade to 6.2.1 - drop musb patch (not needed since linux mainline commit ffbe2feac59b37c8dc536727552b4f375e1b9aec) - enable LRU_GEN [ci:skip-build]: Already built successfully in CI
This commit is contained in:
parent
8e77cdd287
commit
ab8767a08f
4 changed files with 232 additions and 174 deletions
|
@ -67,10 +67,10 @@ diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
|
||||||
index b92c53a6b..03531e525 100644
|
index b92c53a6b..03531e525 100644
|
||||||
--- a/drivers/input/misc/Makefile
|
--- a/drivers/input/misc/Makefile
|
||||||
+++ b/drivers/input/misc/Makefile
|
+++ b/drivers/input/misc/Makefile
|
||||||
@@ -77,7 +77,7 @@ obj-$(CONFIG_INPUT_SOC_BUTTON_ARRAY) += soc_button_array.o
|
@@ -78,7 +78,7 @@ obj-$(CONFIG_INPUT_SOC_BUTTON_ARRAY) += soc_button_array.o
|
||||||
obj-$(CONFIG_INPUT_SPARCSPKR) += sparcspkr.o
|
|
||||||
obj-$(CONFIG_INPUT_STPMIC1_ONKEY) += stpmic1_onkey.o
|
obj-$(CONFIG_INPUT_STPMIC1_ONKEY) += stpmic1_onkey.o
|
||||||
obj-$(CONFIG_INPUT_TPS65218_PWRBUTTON) += tps65218-pwrbutton.o
|
obj-$(CONFIG_INPUT_TPS65218_PWRBUTTON) += tps65218-pwrbutton.o
|
||||||
|
obj-$(CONFIG_INPUT_TPS65219_PWRBUTTON) += tps65219-pwrbutton.o
|
||||||
-obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON) += twl4030-pwrbutton.o
|
-obj-$(CONFIG_INPUT_TWL4030_PWRBUTTON) += twl4030-pwrbutton.o
|
||||||
+obj-$(CONFIG_INPUT_TWL_PWRBUTTON) += twl-pwrbutton.o
|
+obj-$(CONFIG_INPUT_TWL_PWRBUTTON) += twl-pwrbutton.o
|
||||||
obj-$(CONFIG_INPUT_TWL4030_VIBRA) += twl4030-vibra.o
|
obj-$(CONFIG_INPUT_TWL4030_VIBRA) += twl4030-vibra.o
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
From 954e4768ff5cfcc55974a3a3e684a458ebe7fec2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: dartvader316 <dartvader316-dev@pm.me>
|
|
||||||
Date: Thu, 3 Nov 2022 18:43:14 +0300
|
|
||||||
Subject: [PATCH] Revert "partially Revert "usb: musb: Set the DT node on the
|
|
||||||
child device""
|
|
||||||
|
|
||||||
espresso10 musb fix
|
|
||||||
|
|
||||||
This reverts commit 239071064732bc4a30308cbba11014aa1aab550a.
|
|
||||||
---
|
|
||||||
drivers/usb/musb/omap2430.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
|
|
||||||
index f571a65ae6ee..4a963cfa385b 100644
|
|
||||||
--- a/drivers/usb/musb/omap2430.c
|
|
||||||
+++ b/drivers/usb/musb/omap2430.c
|
|
||||||
@@ -327,6 +327,7 @@ static int omap2430_probe(struct platform_device *pdev)
|
|
||||||
musb->dev.parent = &pdev->dev;
|
|
||||||
musb->dev.dma_mask = &omap2430_dmamask;
|
|
||||||
musb->dev.coherent_dma_mask = omap2430_dmamask;
|
|
||||||
+ device_set_of_node_from_dev(&musb->dev, &pdev->dev);
|
|
||||||
|
|
||||||
glue->dev = &pdev->dev;
|
|
||||||
glue->musb = musb;
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
# Kernel config based on: arch/arm64/configs/omap2plus_defconfig
|
# Kernel config based on: arch/arm64/configs/omap2plus_defconfig
|
||||||
|
|
||||||
pkgname=linux-postmarketos-omap
|
pkgname=linux-postmarketos-omap
|
||||||
pkgver=6.1
|
pkgver=6.2.1
|
||||||
|
_pkgver=6.2.1
|
||||||
pkgrel=0
|
pkgrel=0
|
||||||
pkgdesc="Mainline kernel fork for OMAP devices"
|
pkgdesc="Mainline kernel fork for OMAP devices"
|
||||||
arch="armv7"
|
arch="armv7"
|
||||||
|
@ -15,11 +16,13 @@ makedepends="bash bison findutils flex openssl-dev perl gmp-dev mpc1-dev mpfr-de
|
||||||
_carch="arm"
|
_carch="arm"
|
||||||
_flavor="postmarketos-omap"
|
_flavor="postmarketos-omap"
|
||||||
_config="config-$_flavor.armv7"
|
_config="config-$_flavor.armv7"
|
||||||
|
|
||||||
|
|
||||||
case $pkgver in
|
case $pkgver in
|
||||||
*.*_rc*) _kernver=$_pkgver
|
*.*rc*) _kernver=$_pkgver
|
||||||
_rc=1;;
|
_rc=1;;
|
||||||
*.*.0) _kernver=${pkgver%.0};;
|
*.*.0) _kernver=${pkgver%.0};;
|
||||||
*.*.*) _kernver=${pkgver%.*};;
|
*.*.*) _kernver=$pkgver;;
|
||||||
*.*) _kernver=$pkgver;;
|
*.*) _kernver=$pkgver;;
|
||||||
esac
|
esac
|
||||||
if [ $_rc ]
|
if [ $_rc ]
|
||||||
|
@ -28,9 +31,9 @@ then
|
||||||
else
|
else
|
||||||
_kernsrc="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz"
|
_kernsrc="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
source="
|
source="
|
||||||
$_kernsrc
|
$_kernsrc
|
||||||
$_patch
|
|
||||||
$_config
|
$_config
|
||||||
0001-Add-TWL6032-dtsi.patch
|
0001-Add-TWL6032-dtsi.patch
|
||||||
0002-arm-dts-Add-common-dtsi-for-espresso.patch
|
0002-arm-dts-Add-common-dtsi-for-espresso.patch
|
||||||
|
@ -38,9 +41,8 @@ source="
|
||||||
0004-arm-dts-Add-espresso10-support.patch
|
0004-arm-dts-Add-espresso10-support.patch
|
||||||
0005-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
|
0005-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
|
||||||
0006-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
|
0006-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
|
||||||
0007-Revert-partially-Revert-usb-musb-Set-the-DT-node-on-the-child-device.patch
|
|
||||||
"
|
"
|
||||||
builddir="$srcdir/linux-$_kernver"
|
builddir="$srcdir/linux-$_pkgver"
|
||||||
replaces="linux-samsung-espresso3g"
|
replaces="linux-samsung-espresso3g"
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
|
@ -67,15 +69,13 @@ package() {
|
||||||
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
|
"$pkgdir/usr/share/kernel/$_flavor/kernel.release"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
sha512sums="
|
sha512sums="
|
||||||
6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68 linux-6.1.tar.xz
|
79d3465955dd557dc599fa1c18c7a68699f4febdd7264fe4e223c694e879ef5bb65fff9fad1ec5599f894ad6519bad292efbd5b9990dac3223d843f5c22c65f2 linux-6.2.1.tar.xz
|
||||||
65da1e6bb7324fdd29ee2c954755b322ef99776dc39c4d7225f6415b5c6d682ca38ad96cec737980133c575241fdf53d12858496f0db742619fd385ea4e3cdca config-postmarketos-omap.armv7
|
b4d2e70255e4798840485602daeecf3784e81ac25c629fc5c218b6add25648fe4efe7fc1d3c9ce82b6abcac814328cbbf4d52a67279d8f7ac184ca7149552b25 config-postmarketos-omap.armv7
|
||||||
727ff96d7d4701e93bf43db5d7bd872b4fbf1a8439edb4d84987a8f89e669d65b7a413740172b4a84df711b990d7e30b7880df5b9365496b7894d129cd4ebfa6 0001-Add-TWL6032-dtsi.patch
|
727ff96d7d4701e93bf43db5d7bd872b4fbf1a8439edb4d84987a8f89e669d65b7a413740172b4a84df711b990d7e30b7880df5b9365496b7894d129cd4ebfa6 0001-Add-TWL6032-dtsi.patch
|
||||||
cbabba85dc1e4de5ad2faaea8d87595ceef5af740a9b06f20aeb5ac5bff37747e17a11f77d66e3cde42e3fdb48134a37a98205e32109464a87ac7bb5e91fb34c 0002-arm-dts-Add-common-dtsi-for-espresso.patch
|
cbabba85dc1e4de5ad2faaea8d87595ceef5af740a9b06f20aeb5ac5bff37747e17a11f77d66e3cde42e3fdb48134a37a98205e32109464a87ac7bb5e91fb34c 0002-arm-dts-Add-common-dtsi-for-espresso.patch
|
||||||
b2c2d81bdfb4095a87d6821342127cc7c74bbc12a70786a81d64fd264b5487d522effab349fc1de2b01752cce494bf782d59021d4e95740aa1e3ff5de12632f7 0003-arm-dts-Add-espresso7-support.patch
|
b2c2d81bdfb4095a87d6821342127cc7c74bbc12a70786a81d64fd264b5487d522effab349fc1de2b01752cce494bf782d59021d4e95740aa1e3ff5de12632f7 0003-arm-dts-Add-espresso7-support.patch
|
||||||
1029debd9fa9fe357f725c42e901bcabb9a364f8b3fcf7986cc5506a078a075e22db3351dcbb607014af8a87a84d13b780e1e613924c8ad6a767ac8b8b763a94 0004-arm-dts-Add-espresso10-support.patch
|
1029debd9fa9fe357f725c42e901bcabb9a364f8b3fcf7986cc5506a078a075e22db3351dcbb607014af8a87a84d13b780e1e613924c8ad6a767ac8b8b763a94 0004-arm-dts-Add-espresso10-support.patch
|
||||||
9dc84421cbc2ea7c2c37847d8704ff46dd4a485485bfa4a671167fdef4ac6f53a4e8f787aa774f3748299c374e7c7dc5d36fd4ba9b1a1a9697e0526f2bf3ece4 0005-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
|
9dc84421cbc2ea7c2c37847d8704ff46dd4a485485bfa4a671167fdef4ac6f53a4e8f787aa774f3748299c374e7c7dc5d36fd4ba9b1a1a9697e0526f2bf3ece4 0005-Add-TWL6030-power-driver-with-minimal-support-for-power-off.patch
|
||||||
fdf62d90b1381541743e9502160854a920c05050cc6f530769071e2eb362ba3c1f5c84afd140533d7aa3f318205e1b0b1c55387edc99a643e1593e634e740c10 0006-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
|
1aa4521deb4e6d0977f8e704dd7f38ca3a861212c0ced34145713c72a68d8f255f3631a82c5ef2006f4c8b954fce6198e5d0870392cd4db6b6fb9610abe50c4c 0006-Add-TWL6030-power-button-support-to-twl-pwrbutton.patch
|
||||||
5dea3463f13ebdaf17535a59ee5ffd98ad6d9d3750f6bcafc527699ead6cc4e6a3cf2aa161419c56d4bcec3a51ac2e3427a7883ce26137bec91440239645ec1e 0007-Revert-partially-Revert-usb-musb-Set-the-DT-node-on-the-child-device.patch
|
|
||||||
"
|
"
|
||||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue