From d415968dc9bc0243237ea49218fc07ff07e6b8ca Mon Sep 17 00:00:00 2001 From: Maxim Karasev Date: Wed, 23 Jun 2021 00:58:31 +0300 Subject: [PATCH] main/linux-postmarketos-allwinner: upgrade to 5.12.12 and add allwinner h6 support (MR 2268) --- .../0014-sunxi-mmc-h6-fix.patch | 38 +++++++++++++++++++ main/linux-postmarketos-allwinner/APKBUILD | 14 ++++--- .../config-postmarketos-allwinner.aarch64 | 18 +++++---- .../config-postmarketos-allwinner.armv7 | 3 +- 4 files changed, 59 insertions(+), 14 deletions(-) create mode 100644 main/linux-postmarketos-allwinner/0014-sunxi-mmc-h6-fix.patch diff --git a/main/linux-postmarketos-allwinner/0014-sunxi-mmc-h6-fix.patch b/main/linux-postmarketos-allwinner/0014-sunxi-mmc-h6-fix.patch new file mode 100644 index 000000000..55b2d4c00 --- /dev/null +++ b/main/linux-postmarketos-allwinner/0014-sunxi-mmc-h6-fix.patch @@ -0,0 +1,38 @@ +From 4d38ab8df68f04cc87eeba065c3d35df71c280e4 Mon Sep 17 00:00:00 2001 +From: Jernej Skrabec +Date: Sat, 24 Aug 2019 01:36:44 +0200 +Subject: [PATCH] eMMC workaround + +Signed-off-by: Jernej Skrabec +--- + drivers/mmc/host/sunxi-mmc.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c +index d577a6b0ceae..067d217bde42 100644 +--- a/drivers/mmc/host/sunxi-mmc.c ++++ b/drivers/mmc/host/sunxi-mmc.c +@@ -1394,15 +1394,17 @@ static int sunxi_mmc_probe(struct platform_device *pdev) + MMC_CAP_ERASE | MMC_CAP_SDIO_IRQ; + + /* +- * Some H5 devices do not have signal traces precise enough to +- * use HS DDR mode for their eMMC chips. ++ * Some H5 and H6 devices do not have signal traces precise ++ * enough to use HS DDR mode for their eMMC chips. + * + * We still enable HS DDR modes for all the other controller + * variants that support them. + */ + if ((host->cfg->clk_delays || host->use_new_timings) && + !of_device_is_compatible(pdev->dev.of_node, +- "allwinner,sun50i-h5-emmc")) ++ "allwinner,sun50i-h5-emmc") && ++ !of_device_is_compatible(pdev->dev.of_node, ++ "allwinner,sun50i-h6-emmc")) + mmc->caps |= MMC_CAP_1_8V_DDR | MMC_CAP_3_3V_DDR; + + ret = mmc_of_parse(mmc); +-- +2.23.0 + diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD index 037d0bdeb..07d51d893 100644 --- a/main/linux-postmarketos-allwinner/APKBUILD +++ b/main/linux-postmarketos-allwinner/APKBUILD @@ -6,9 +6,9 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor -pkgver=5.12.6_git20210523 -pkgrel=2 -_tag="orange-pi-5.12-20210523-1501" +pkgver=5.12.12_git20210620 +pkgrel=0 +_tag="orange-pi-5.12-20210620-0242" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" url="https://megous.com/git/linux/" @@ -45,6 +45,7 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar 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 + 0014-sunxi-mmc-h6-fix.patch " subpackages="$pkgname-dev" builddir="$srcdir/linux-$_tag" @@ -92,9 +93,9 @@ dev() { } sha512sums=" -1340be62c1a7b805e20d54383b98ef3bc1cfe2a8ed790f8368c75d195f00fe9d80a0ad32357452793296c9d817794febc6c4d704cfd22a20bc586689f39e8ebc linux-postmarketos-allwinner-orange-pi-5.12-20210523-1501.tar.gz -389506881c7c8ad2182f94305358a71b0007b43903bd524aaeea4e7f3db8223de0312b62d2d109b706eea6e696500a217f9222a0e131f785af2deac283d5cf63 config-postmarketos-allwinner.aarch64 -85629ceed46b67c6c0428e55b37bf9a2de2c660aed01f49b7dfca9ee603e4f5b0dcfb9a4a528689fd4cff82d12b309709947de8eb9ae0466d0f086761ffe8f5b config-postmarketos-allwinner.armv7 +27f6b010841b912641cd470ffc9371e93bcee023f595eec79b04810bf3ca313b7b8cb2104e1f133ee84c17c987b739a5fe87ffaba2d0127fc3b087cf3f9be34f linux-postmarketos-allwinner-orange-pi-5.12-20210620-0242.tar.gz +029958dd8dcbbaaa07c6c0c431e918d3ef1742c791ecebed980ed717be5b900a562ea9997d2306d9eddb345e75ca54f8ac70b41277e55c7b0e70dd33bf1a64c2 config-postmarketos-allwinner.aarch64 +8f7695bbc04e50e83f2a4d405030d7edd124c0f6169be4bddac28b78bf7f4787676b22429f4a7d8d966033cdd469f3d095c1e213a1beaba1bdc215d08b351fc4 config-postmarketos-allwinner.armv7 126e0a65e04f22f14eac1281a69000d9d5b107ed8fd1b52f37e812751f55e6c45b0240ceac61c9d95ae7f0543aaf9d96b85a8532baf59283c077b9945e615367 0001-dts-add-dontbeevil-pinephone-devkit.patch 1dc710f5abacdd5698169d5e985efeca8114986c774c3d65e89812d08ceb3db5ebdc6dd64dd76a262c761f3bfc3ffb6bc237fd5236bd1f89c5975d12e42eda04 0002-dts-add-pinetab-dev-old-display-panel.patch 96849f40f6defc4ad7646256814bea5ac353c4e0479fd069365ff27456d63da801541ec616f6db736d60f3134384321a9eeb5bfbd555363bf1259c8de63d17fa 0003-dts-pinetab-add-missing-bma223-ohci1.patch @@ -108,4 +109,5 @@ c61d4f86eddecca99df1ea1323f988e575f9c49130b64a0c50d61028ff96e24aaa3131fb3731e62e 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 +2aec51b4cbe6349193c5db705b6788282844623930135be26dc62abf1a56c33e42538fde65c43cf0fb23677a71c9a929220baf3ba2ec89b2c485ffd9a6b1683f 0014-sunxi-mmc-h6-fix.patch " diff --git a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 index 11b61eb38..1856f202c 100644 --- a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 +++ b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.12.3 Kernel Configuration +# Linux/arm64 5.12.12 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 @@ -552,7 +552,7 @@ CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y # CONFIG_CPUFREQ_DT=y CONFIG_CPUFREQ_DT_PLATDEV=y -# CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set +CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=y CONFIG_ARM_SCPI_CPUFREQ=y # end of CPU Frequency scaling # end of CPU Power Management @@ -1543,6 +1543,7 @@ CONFIG_BLK_DEV_NBD=m # NVME Support # # CONFIG_NVME_FC is not set +# CONFIG_NVME_TCP is not set # CONFIG_NVME_TARGET is not set # end of NVME Support @@ -2696,7 +2697,7 @@ CONFIG_MFD_CORE=y # CONFIG_MFD_BD9571MWV is not set CONFIG_MFD_AC100=m CONFIG_MFD_AXP20X=y -# CONFIG_MFD_AXP20X_I2C is not set +CONFIG_MFD_AXP20X_I2C=y CONFIG_MFD_AXP20X_RSB=y # CONFIG_MFD_MADERA is not set # CONFIG_PMIC_DA903X is not set @@ -3311,7 +3312,7 @@ CONFIG_DRM_PANEL_BRIDGE=y # CONFIG_DRM_CDNS_MHDP8546 is not set CONFIG_DRM_DW_HDMI=y # CONFIG_DRM_DW_HDMI_AHB_AUDIO is not set -# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set +CONFIG_DRM_DW_HDMI_I2S_AUDIO=m # CONFIG_DRM_DW_HDMI_CEC is not set # end of Display Interface Bridges @@ -3323,7 +3324,7 @@ CONFIG_DRM_DW_HDMI=y # CONFIG_DRM_PL111 is not set # CONFIG_DRM_XEN is not set CONFIG_DRM_LIMA=y -# CONFIG_DRM_PANFROST is not set +CONFIG_DRM_PANFROST=y # CONFIG_DRM_TIDSS is not set # CONFIG_DRM_LEGACY is not set CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y @@ -3410,6 +3411,8 @@ CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_PCM=m +CONFIG_SND_PCM_ELD=y +CONFIG_SND_PCM_IEC958=y CONFIG_SND_DMAENGINE_PCM=m CONFIG_SND_HWDEP=m CONFIG_SND_RAWMIDI=m @@ -3546,6 +3549,7 @@ CONFIG_SND_SOC_BT_SCO=m # CONFIG_SND_SOC_CX2072X is not set # CONFIG_SND_SOC_DA7213 is not set CONFIG_SND_SOC_DMIC=m +CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_EC25=m # CONFIG_SND_SOC_ES7134 is not set # CONFIG_SND_SOC_ES7241 is not set @@ -4596,7 +4600,7 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set CONFIG_OF_IOMMU=y CONFIG_IOMMU_DMA=y -# CONFIG_SUN50I_IOMMU is not set +CONFIG_SUN50I_IOMMU=y CONFIG_ARM_SMMU=y # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y @@ -5099,7 +5103,7 @@ CONFIG_PHY_XGENE=y CONFIG_PHY_SUN4I_USB=y CONFIG_PHY_SUN6I_MIPI_DPHY=y # CONFIG_PHY_SUN9I_USB is not set -# CONFIG_PHY_SUN50I_USB3 is not set +CONFIG_PHY_SUN50I_USB3=y # CONFIG_BCM_KONA_USB2_PHY is not set # CONFIG_PHY_CADENCE_TORRENT is not set # CONFIG_PHY_CADENCE_DPHY is not set diff --git a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 index 88f8119ce..99a364a65 100644 --- a/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 +++ b/main/linux-postmarketos-allwinner/config-postmarketos-allwinner.armv7 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.12.6 Kernel Configuration +# Linux/arm 5.12.12 Kernel Configuration # CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 10.3.1_git20210424) 10.3.1 20210424" CONFIG_CC_IS_GCC=y @@ -1295,6 +1295,7 @@ CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # NVME Support # # CONFIG_NVME_FC is not set +# CONFIG_NVME_TCP is not set # CONFIG_NVME_TARGET is not set # end of NVME Support