diff --git a/main/linux-postmarketos-allwinner/0009-dts-pinephone-jack-detection.patch b/main/linux-postmarketos-allwinner/0009-dts-pinephone-jack-detection.patch deleted file mode 100644 index 268b61903..000000000 --- a/main/linux-postmarketos-allwinner/0009-dts-pinephone-jack-detection.patch +++ /dev/null @@ -1,44 +0,0 @@ -From dd617215e43671c0ba88dbd25c99fa42de9be69c Mon Sep 17 00:00:00 2001 -From: Martijn Braam -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 3cf2f3e6a41a..1a096576d258 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi -@@ -355,11 +355,13 @@ &codec { - pinctrl-names = "default"; - pinctrl-0 = <&aif2_pins>, <&aif3_pins>; - status = "okay"; -+ allwinner,inverted-jack-detection; - }; - - &codec_analog { - cpvdd-supply = <®_eldo1>; - status = "okay"; -+ allwinner,internal-bias-resistor; - }; - - &cpu0 { -@@ -818,11 +820,11 @@ &sound { - simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>; - simple-audio-card,widgets = "Microphone", "Headset Microphone", - "Microphone", "Internal Microphone", -- "Headphone", "Headphone Jack", -+ "Headphone", "Headphone", - "Speaker", "Internal Earpiece", - "Speaker", "Internal Speaker"; - simple-audio-card,routing = -- "Headphone Jack", "HP", -+ "Headphone", "HP", - "Internal Earpiece", "EARPIECE", - "Internal Speaker", "Speaker Amp OUTL", - "Internal Speaker", "Speaker Amp OUTR", --- -2.31.1 - diff --git a/main/linux-postmarketos-allwinner/0010-pinephone-fix-pogopin-i2c.patch b/main/linux-postmarketos-allwinner/0009-pinephone-fix-pogopin-i2c.patch similarity index 100% rename from main/linux-postmarketos-allwinner/0010-pinephone-fix-pogopin-i2c.patch rename to main/linux-postmarketos-allwinner/0009-pinephone-fix-pogopin-i2c.patch diff --git a/main/linux-postmarketos-allwinner/0011-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch b/main/linux-postmarketos-allwinner/0010-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch similarity index 100% rename from main/linux-postmarketos-allwinner/0011-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch rename to main/linux-postmarketos-allwinner/0010-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch diff --git a/main/linux-postmarketos-allwinner/0012-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch b/main/linux-postmarketos-allwinner/0011-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch similarity index 100% rename from main/linux-postmarketos-allwinner/0012-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch rename to main/linux-postmarketos-allwinner/0011-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch diff --git a/main/linux-postmarketos-allwinner/0013-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch b/main/linux-postmarketos-allwinner/0012-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch similarity index 100% rename from main/linux-postmarketos-allwinner/0013-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch rename to main/linux-postmarketos-allwinner/0012-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch diff --git a/main/linux-postmarketos-allwinner/0014-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch b/main/linux-postmarketos-allwinner/0013-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch similarity index 100% rename from main/linux-postmarketos-allwinner/0014-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch rename to main/linux-postmarketos-allwinner/0013-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD index 25d1e3644..3bb8135f0 100644 --- a/main/linux-postmarketos-allwinner/APKBUILD +++ b/main/linux-postmarketos-allwinner/APKBUILD @@ -7,7 +7,7 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=5.12.6_git20210523 -pkgrel=0 +pkgrel=1 _tag="orange-pi-5.12-20210523-1501" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" @@ -39,12 +39,11 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar 0006-dts-pinephone-remove-bt-firmware-suffix.patch 0007-media-ov5640-Implement-autofocus.patch 0008-dts-pinephone-drop-modem-power-node.patch - 0009-dts-pinephone-jack-detection.patch - 0010-pinephone-fix-pogopin-i2c.patch - 0011-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch - 0012-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch - 0013-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch - 0014-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch + 0009-pinephone-fix-pogopin-i2c.patch + 0010-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch + 0011-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch + 0012-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch + 0013-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch " subpackages="$pkgname-dev" builddir="$srcdir/linux-$_tag" @@ -103,10 +102,9 @@ bd0bf2ab037e70a826f26a0ef1c441f0d5bada458128b676b2de0102d05c72961f0be9f00974c7df f6b35e61e88d933b612ee3212d71bb3e1aba8590c4985d9c17817426283df578476c00f3297683e43b570599384e78bb1fe76c506b3df93428e2101c4ccb1f3d 0006-dts-pinephone-remove-bt-firmware-suffix.patch 5e0566074fcb18b95c8ea079178f5d6716eb1ea325a25176e67f80eff1e5b10f90e282c8059a0a3315606546c61f05bd9ebad06adb67086cd123f0276cccbdc8 0007-media-ov5640-Implement-autofocus.patch 62809ac84db9d684b02d56dfc543451a1a13f319287466cfe913a847b945584ec60f7f556b1259ad3e26a44259a3fe587eeabeef6333f73a77204c3d3573f2ab 0008-dts-pinephone-drop-modem-power-node.patch -55d9bcd712c7b5402ec470e8c37d724348896b3b47136490a134e6ed305a2ec7734d977426952486537071098c8b64ebbe2f16b2f9e4b3f5796072734d7d4b89 0009-dts-pinephone-jack-detection.patch -0a9a97ae044c6aecdd1e28fa41065df4017f9925ff2e3448b5afc4f54739c57350a28cf5eb2e1eaa9fb0535a7e144c4d566a0516f37dc70d4e1d6a1d764e6c31 0010-pinephone-fix-pogopin-i2c.patch -c61d4f86eddecca99df1ea1323f988e575f9c49130b64a0c50d61028ff96e24aaa3131fb3731e62e9b07db67019104d98933e31457891a5ce1e6010e06232875 0011-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch -7f57e4ebc0b0cebb624f340c568f22e93116f2753b634d9bc75eea1a1bc013b8f9375e1efd24a20bff79c3725166df210a3a30bb7643a4525e3d40b63b91c536 0012-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch -71fad7ecff66a2cb692f3dd3d02301c4b419873f27693de81f50226b8ab93c229299e7dc663fdd07a7e8f03a6541527f3bb449626f865fcfde6a780ef1b91976 0013-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch -902708a5a8dd8a815d3d1793933d307c551e3c10368d1805431b70691ee5d4438b7146c466549f457468e365f94073a35ae3304928af7581e5dc91ba5c8fa682 0014-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch +0a9a97ae044c6aecdd1e28fa41065df4017f9925ff2e3448b5afc4f54739c57350a28cf5eb2e1eaa9fb0535a7e144c4d566a0516f37dc70d4e1d6a1d764e6c31 0009-pinephone-fix-pogopin-i2c.patch +c61d4f86eddecca99df1ea1323f988e575f9c49130b64a0c50d61028ff96e24aaa3131fb3731e62e9b07db67019104d98933e31457891a5ce1e6010e06232875 0010-drm-panel-simple-Add-Hannstar-TQTM070CB501.patch +7f57e4ebc0b0cebb624f340c568f22e93116f2753b634d9bc75eea1a1bc013b8f9375e1efd24a20bff79c3725166df210a3a30bb7643a4525e3d40b63b91c536 0011-ARM-dts-sun6i-Add-GoClever-Orion-70L-tablet.patch +71fad7ecff66a2cb692f3dd3d02301c4b419873f27693de81f50226b8ab93c229299e7dc663fdd07a7e8f03a6541527f3bb449626f865fcfde6a780ef1b91976 0012-drm-panel-simple-Add-Hannstar-HSD070IDW1-A.patch +902708a5a8dd8a815d3d1793933d307c551e3c10368d1805431b70691ee5d4438b7146c466549f457468e365f94073a35ae3304928af7581e5dc91ba5c8fa682 0013-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch "