ipq806x: use qcom-ipq8064.dtsi from upstream
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>
Fri, 3 Jul 2020 09:12:10 +0000 (11:12 +0200)
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>
Wed, 5 Aug 2020 21:08:03 +0000 (23:08 +0200)
commitb7b7c2a6adf96ff8186509fc1bef550c82d5fc26
tree925aac6f3caebcfcc048ba83a3f16d2a8d7a2b42
parent3d167ed805a9300e60f8edcccfd740786b67e671
ipq806x: use qcom-ipq8064.dtsi from upstream

Though a qcom-ipq8064.dtsi file exists upstream, we still do overwrite
it with a full version of our own in the ipq806x target. About half of
the contents of our file are upstream content, the other half are local
improvements.

To prevent us from having a lot of code maintained twice in parallel,
this adjusts the target to use the upstream qcom-ipq8064.dtsi. Our
local changes are arranged into three patches, the first pulling a
commit from upstream, the second doing a few small adjustments, and
the third adding all additional stuff.

This should get us the best of both worlds.

The property "ports-implemented" on sata@29000000 is moved to
2nd-level DTSI files as kernel defines it there as well.

While at, rename 080-ARM-dts-qcom-add-gpio-ranges-property.patch to
include the kernel version where it's added upstream.

Even though this might look more complicated in the first place,
the aim is to bring our files closer to upstream, so we can benefit
from changes directly and vice-versa. After all, this drop about
650 lines just copied from the upstream DTSI file.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi [deleted file]
target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi
target/linux/ipq806x/patches-5.4/080-ARM-dts-qcom-add-gpio-ranges-property.patch [deleted file]
target/linux/ipq806x/patches-5.4/080-v5.7-ARM-dts-qcom-add-gpio-ranges-property.patch [new file with mode: 0644]
target/linux/ipq806x/patches-5.4/081-v5.8-ARM-dts-qcom-add-scm-definition-to-ipq806x.patch [new file with mode: 0644]
target/linux/ipq806x/patches-5.4/082-ipq8064-dtsi-tweaks.patch [new file with mode: 0644]
target/linux/ipq806x/patches-5.4/083-ipq8064-dtsi-additions.patch [new file with mode: 0644]