From 32532c7530dad2436d949cac7633b99ce8ecd4a1 Mon Sep 17 00:00:00 2001 From: Mithil Bavishi Date: Mon, 12 Dec 2022 13:38:44 +0530 Subject: [PATCH] linux-postmarketos-omap: upgrade to 6.1 (MR 3716) Update the omap kernel to stable 6.1 release. This commit also contains a patch that fixes broken usb, which should only be needed for versions 5.19 to 6.1 as later releases will have a proper fix merged. [ci:skip-build]: already built successfully in CI --- ...-Set-the-DT-node-on-the-child-device.patch | 28 +++++++++++++++++++ .../linux-postmarketos-omap/APKBUILD | 27 +++++++++++------- 2 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 device/community/linux-postmarketos-omap/0007-Revert-partially-Revert-usb-musb-Set-the-DT-node-on-the-child-device.patch diff --git a/device/community/linux-postmarketos-omap/0007-Revert-partially-Revert-usb-musb-Set-the-DT-node-on-the-child-device.patch b/device/community/linux-postmarketos-omap/0007-Revert-partially-Revert-usb-musb-Set-the-DT-node-on-the-child-device.patch new file mode 100644 index 000000000..062494aff --- /dev/null +++ b/device/community/linux-postmarketos-omap/0007-Revert-partially-Revert-usb-musb-Set-the-DT-node-on-the-child-device.patch @@ -0,0 +1,28 @@ +From 954e4768ff5cfcc55974a3a3e684a458ebe7fec2 Mon Sep 17 00:00:00 2001 +From: dartvader316 +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 + diff --git a/device/community/linux-postmarketos-omap/APKBUILD b/device/community/linux-postmarketos-omap/APKBUILD index 2c05586e4..808500655 100644 --- a/device/community/linux-postmarketos-omap/APKBUILD +++ b/device/community/linux-postmarketos-omap/APKBUILD @@ -3,8 +3,8 @@ # Kernel config based on: arch/arm64/configs/omap2plus_defconfig pkgname=linux-postmarketos-omap -pkgver=6.0.2 -pkgrel=3 +pkgver=6.1 +pkgrel=0 pkgdesc="Mainline kernel fork for OMAP devices" arch="armv7" url="https://kernel.org/" @@ -16,14 +16,20 @@ _carch="arm" _flavor="postmarketos-omap" _config="config-$_flavor.armv7" case $pkgver in - *.*.0) _kernver=${pkgver%.0};; - *.*.*) _kernver=${pkgver%.*} - _patch=" - linux-$pkgver.patch.xz::https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/patch-$pkgver.xz";; - *.*) _kernver=$pkgver;; + *.*_rc*) _kernver=$_pkgver + _rc=1;; + *.*.0) _kernver=${pkgver%.0};; + *.*.*) _kernver=${pkgver%.*};; + *.*) _kernver=$pkgver;; esac +if [ $_rc ] +then + _kernsrc="https://git.kernel.org/torvalds/t/linux-$_kernver.tar.gz" +else + _kernsrc="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz" +fi source=" - https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz + $_kernsrc $_patch $_config 0001-Add-TWL6032-dtsi.patch @@ -32,6 +38,7 @@ source=" 0004-arm-dts-Add-espresso10-support.patch 0005-Add-TWL6030-power-driver-with-minimal-support-for-power-off.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" replaces="linux-samsung-espresso3g" @@ -62,8 +69,7 @@ package() { sha512sums=" -bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714 linux-6.0.tar.xz -10b2c1af9cbf2335a1b449de3ee674c68ae2ae1ac4bdc27b6e7692c5152fb3cd096388044c0e0ee6054b106d6eface9af41d746adf8f8264d738e9c8f73a3784 linux-6.0.2.patch.xz +6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68 linux-6.1.tar.xz 65da1e6bb7324fdd29ee2c954755b322ef99776dc39c4d7225f6415b5c6d682ca38ad96cec737980133c575241fdf53d12858496f0db742619fd385ea4e3cdca config-postmarketos-omap.armv7 727ff96d7d4701e93bf43db5d7bd872b4fbf1a8439edb4d84987a8f89e669d65b7a413740172b4a84df711b990d7e30b7880df5b9365496b7894d129cd4ebfa6 0001-Add-TWL6032-dtsi.patch cbabba85dc1e4de5ad2faaea8d87595ceef5af740a9b06f20aeb5ac5bff37747e17a11f77d66e3cde42e3fdb48134a37a98205e32109464a87ac7bb5e91fb34c 0002-arm-dts-Add-common-dtsi-for-espresso.patch @@ -71,4 +77,5 @@ b2c2d81bdfb4095a87d6821342127cc7c74bbc12a70786a81d64fd264b5487d522effab349fc1de2 1029debd9fa9fe357f725c42e901bcabb9a364f8b3fcf7986cc5506a078a075e22db3351dcbb607014af8a87a84d13b780e1e613924c8ad6a767ac8b8b763a94 0004-arm-dts-Add-espresso10-support.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 +5dea3463f13ebdaf17535a59ee5ffd98ad6d9d3750f6bcafc527699ead6cc4e6a3cf2aa161419c56d4bcec3a51ac2e3427a7883ce26137bec91440239645ec1e 0007-Revert-partially-Revert-usb-musb-Set-the-DT-node-on-the-child-device.patch "