From 4929c227edf935b3d62cc9c4643f8dc5efa44fe5 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Mon, 28 Dec 2020 20:07:21 +0100 Subject: [PATCH] main/linux-postmarketos-allwinner: dts: add 'pine64,pinephone' to compat list (MR 1838) Add Dylan's patch from MR 1750, so the feedbackd configuration can use this for the device specific configuration. [ci:skip-build]: built locally --- ...-Add-pine64-pinephone-to-compat-list.patch | 56 +++++++++++++++++++ main/linux-postmarketos-allwinner/APKBUILD | 6 +- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 main/linux-postmarketos-allwinner/0010-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch diff --git a/main/linux-postmarketos-allwinner/0010-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch b/main/linux-postmarketos-allwinner/0010-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch new file mode 100644 index 000000000..e329ba796 --- /dev/null +++ b/main/linux-postmarketos-allwinner/0010-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch @@ -0,0 +1,56 @@ +From 05044b9e4e4ae03f66e1c504d6fef57a1d135897 Mon Sep 17 00:00:00 2001 +From: Dylan Van Assche +Date: Thu, 24 Dec 2020 19:57:12 +0100 +Subject: [PATCH] dts: pinephone: Add 'pine64,pinephone' to compat list + +Indicates that all PinePhone models share most of the hardware with each other. +Used for feedbackd configuration when retrieving a device specific config for +haptic feedbackd. +--- + arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts +index 0f6faa44c..2e0892b32 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.0.dts +@@ -7,7 +7,7 @@ + + / { + model = "Pine64 PinePhone Developer Batch (1.0)"; +- compatible = "pine64,pinephone-1.0", "allwinner,sun50i-a64"; ++ compatible = "pine64,pinephone-1.0", "pine64,pinephone", "allwinner,sun50i-a64"; + + reg_vbus: usb0-vbus { + compatible = "regulator-fixed"; +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts +index 95a880fdc..d6bad0838 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.1.dts +@@ -7,7 +7,7 @@ + + / { + model = "Pine64 PinePhone Braveheart (1.1)"; +- compatible = "pine64,pinephone-1.1", "allwinner,sun50i-a64"; ++ compatible = "pine64,pinephone-1.1", "pine64,pinephone", "allwinner,sun50i-a64"; + + reg_vbus: usb0-vbus { + compatible = "regulator-fixed"; +diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts +index 23ba72508..710493186 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone-1.2.dts +@@ -7,7 +7,7 @@ + + / { + model = "Pine64 PinePhone (1.2)"; +- compatible = "pine64,pinephone-1.2", "allwinner,sun50i-a64"; ++ compatible = "pine64,pinephone-1.2", "pine64,pinephone", "allwinner,sun50i-a64"; + }; + + &axp803 { +-- +2.26.2 + diff --git a/main/linux-postmarketos-allwinner/APKBUILD b/main/linux-postmarketos-allwinner/APKBUILD index b3776a225..73b407041 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.0_git20201214 -pkgrel=4 +pkgrel=5 _tag="orange-pi-5.10-20201214-0813" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64" @@ -36,6 +36,7 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar 0007-dts-pinephone-remove-bt-firmware-suffix.patch 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 " subpackages="$pkgname-dev" builddir="$srcdir/linux-$_tag" @@ -86,4 +87,5 @@ d92db05628de20c57f69edd0558fc56eb5a1c90f6dd3046813dc2b8c7393030f55e4980ae4135f9a 79f244794906b84f2033b04429f9bf187f171291c8f808a65f6d2c3a9b8a029eb0460f281148ff4a43c12be4fac3d78fcc4ddfa4c14e687a3f7fc310a5921048 0006-arm64-dts-allwinner-Add-bluetooth-node-to-the-PineTa.patch 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" +6dee374e8459279e2e61894ab9146574283dad61605e4547a1258dd09e02646e46712059431b4086aebb95d24ab44c8b5dc21aa9d004f0190f864045a20b336a 0009-leds-gpio-set-max_brightness-to-1.patch +27c091b4fd306b5f6fbadac5881ecc5465804ea910eb299445f7d4f04d09e05b8cb708bf4ac24f9ae2a77afa287bfbebe691f6d90db189896c6951ff8f30bcf5 0010-dts-pinephone-Add-pine64-pinephone-to-compat-list.patch"