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>
All device DTS files in the target set the serial0 property to the
same value (*). So, let's move the definitions to the DTSI files.
That's also where the kernel defines it (qcom-ipq8064-v1.0.dtsi).
* The only exception is ipq8064-db149, which defines
"serial0 = &uart2;", but inside a block called "alias" instead of
"aliases". It must be assumed that this is broken anyway, so we
don't touch it here.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
All device DTS files in the target set the stdout-path to the same
value. So, let's move the definitions to the DTSI files.
That's also where the kernel defines it (qcom-ipq8064-v1.0.dtsi).
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
So far, the DTSI files on ipq806x had a linear inheritance:
qcom-ipq8064.dtsi
v
qcom-ipq8064-v1.0.dtsi
v
qcom-ipq8064-v2.0.dtsi
v
qcom-ipq8065.dtsi
This poses problems when one wants to set something that is specific
to an architecture closer to the top of the tree.
In this patch, we remove the chain-like inheritance and have all
other files derived from qcom-ipq8064.dtsi (changing this name to
something more generic is not possible due to upstream use).
The removal of inheritance will require a few entries to be copied
from qcom-ipq8064-v2.0.dtsi to qcom-ipq8065.dtsi. However, it also
opens an opportunity for some clean-up:
- Many definitions can be improved by just using the innermost labels.
- Instead of disabling the CPU_SPC node for ipq8065, it is now off by
default and enabled where needed.
- Instead of patching phy-tx0-term-offset into qcom-ipq8064.dtsi and
then having it changed for qcom-ipq8064-v2.0/qcom-ipq8065, just have
the appropriate settings done in the lower DTSI files directly.
- For the opp_table0 adjustments for ipq8065, just redefine what's
changed, but don't add all the untouched properties again.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
