From ce8dcc54a2fef520d7417b9b26a36e26cc49433a Mon Sep 17 00:00:00 2001 From: Martijn Braam Date: Wed, 6 Jan 2021 03:13:52 +0100 Subject: [PATCH] main/linux-postmarketos-allwinner: Fix mmc numbering for the PineTab (MR 1856) [ci:skip-build] already built on CI twice and locally --- ...011-dts-pinetab-hardcode-mmc-numbers.patch | 29 +++++++++++++++++++ main/linux-postmarketos-allwinner/APKBUILD | 6 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 main/linux-postmarketos-allwinner/0011-dts-pinetab-hardcode-mmc-numbers.patch diff --git a/main/linux-postmarketos-allwinner/0011-dts-pinetab-hardcode-mmc-numbers.patch b/main/linux-postmarketos-allwinner/0011-dts-pinetab-hardcode-mmc-numbers.patch new file mode 100644 index 000000000..0d35af834 --- /dev/null +++ b/main/linux-postmarketos-allwinner/0011-dts-pinetab-hardcode-mmc-numbers.patch @@ -0,0 +1,29 @@ +From c965cb8a004c6cc370b4bf297c61fe5ac8ab0583 Mon Sep 17 00:00:00 2001 +From: Martijn Braam +Date: Wed, 6 Jan 2021 03:11:17 +0100 +Subject: [PATCH] arm64: dts: sunxi: Add mmc aliases for the PineTab + +The order for the mmc devices changed in the kernel without this change. + +Signed-off-by: Martijn Braam +--- + arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts +index a87790df94b3..1cf3c3a9ad7f 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts +@@ -18,6 +18,9 @@ / { + compatible = "pine64,pinetab", "allwinner,sun50i-a64"; + + aliases { ++ mmc0 = &mmc0; ++ mmc1 = &mmc1; ++ mmc2 = &mmc2; + serial0 = &uart0; + ethernet0 = &rtl8723cs; + }; +-- +2.29.2 + diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD index 96139fdc0..939056a4c 100644 --- a/main/linux-postmarketos-allwinner/APKBUILD +++ b/main/linux-postmarketos-allwinner/APKBUILD @@ -6,7 +6,7 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=5.10.4_git20210102 -pkgrel=0 +pkgrel=1 _tag="orange-pi-5.10-20210102-0145" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64" @@ -37,6 +37,7 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar 0008-media-ov5640-Implement-autofocus.patch 0009-leds-gpio-set-max_brightness-to-1.patch 0010-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch + 0011-dts-pinetab-hardcode-mmc-numbers.patch " subpackages="$pkgname-dev" builddir="$srcdir/linux-$_tag" @@ -88,4 +89,5 @@ d92db05628de20c57f69edd0558fc56eb5a1c90f6dd3046813dc2b8c7393030f55e4980ae4135f9a 11e3210958afcd9a04885f364d9ce707845173430581601cc8d08451529f80aab137f1c578ab3453e7249fe38001eb6aafe728ba5e34e39b65c7e47a3ecd9fda 0007-dts-pinephone-remove-bt-firmware-suffix.patch 510e1cf463485315f99dfc86511fb7271591159c39cf1bbeecbc1056f8861c35603d61946f3488bfbb7a779ce9324c69d230fa159386b7920f866b47ada444a4 0008-media-ov5640-Implement-autofocus.patch 6dee374e8459279e2e61894ab9146574283dad61605e4547a1258dd09e02646e46712059431b4086aebb95d24ab44c8b5dc21aa9d004f0190f864045a20b336a 0009-leds-gpio-set-max_brightness-to-1.patch -27c091b4fd306b5f6fbadac5881ecc5465804ea910eb299445f7d4f04d09e05b8cb708bf4ac24f9ae2a77afa287bfbebe691f6d90db189896c6951ff8f30bcf5 0010-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch" +27c091b4fd306b5f6fbadac5881ecc5465804ea910eb299445f7d4f04d09e05b8cb708bf4ac24f9ae2a77afa287bfbebe691f6d90db189896c6951ff8f30bcf5 0010-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch +79c5e48445672a8b33c556363dcd07b23271d4a8433287f1263dbd7d113c3c7a42c89708b08413c491622ede05bf9ad0296112f725626a88c44da9f99c251465 0011-dts-pinetab-hardcode-mmc-numbers.patch"