mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 22:23:27 +00:00
b7b7c2a6ad
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>
71 lines
2.9 KiB
Diff
71 lines
2.9 KiB
Diff
From patchwork Mon May 21 20:57:38 2018
|
|
Content-Type: text/plain; charset="utf-8"
|
|
MIME-Version: 1.0
|
|
Content-Transfer-Encoding: 7bit
|
|
Subject: [v5,3/4] ARM: dts: qcom: add gpio-ranges property
|
|
X-Patchwork-Submitter: Christian Lamparter <chunkeey@gmail.com>
|
|
X-Patchwork-Id: 917856
|
|
Message-Id: <0ae3376606a89bcdf3fe753a5c967f7103699e09.1526935804.git.chunkeey@gmail.com>
|
|
To: linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
|
|
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org
|
|
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>,
|
|
Linus Walleij <linus.walleij@linaro.org>,
|
|
Stephen Boyd <sboyd@kernel.org>, David Brown <david.brown@linaro.org>,
|
|
Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
|
|
Andy Gross <andy.gross@linaro.org>,
|
|
Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|
Date: Mon, 21 May 2018 22:57:38 +0200
|
|
From: Christian Lamparter <chunkeey@gmail.com>
|
|
List-Id: <linux-gpio.vger.kernel.org>
|
|
|
|
This patch adds the gpio-ranges property to almost all of
|
|
the Qualcomm ARM platforms that utilize the pinctrl-msm
|
|
framework.
|
|
|
|
The gpio-ranges property is part of the gpiolib subsystem.
|
|
As a result, the binding text is available in section
|
|
"2.1 gpio- and pin-controller interaction" of
|
|
Documentation/devicetree/bindings/gpio/gpio.txt
|
|
|
|
For more information please see the patch titled:
|
|
"pinctrl: msm: fix gpio-hog related boot issues" from
|
|
this series.
|
|
|
|
Reported-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|
Tested-by: Sven Eckelmann <sven.eckelmann@openmesh.com> [ipq4019]
|
|
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
|
|
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
|
|
---
|
|
To help with git bisect, the DT update patch has been intentionally
|
|
placed after the "pinctrl: msm: fix gpio-hog related boot issues".
|
|
Otherwise - if the order was reveresed - and bisect decides to split
|
|
between these two patches, the gpiochip_add_pin_ranges() function
|
|
will be executed twice with the same parameters for the same pinctrl.
|
|
---
|
|
arch/arm/boot/dts/qcom-apq8064.dtsi | 1 +
|
|
arch/arm/boot/dts/qcom-apq8084.dtsi | 1 +
|
|
arch/arm/boot/dts/qcom-ipq4019.dtsi | 1 +
|
|
arch/arm/boot/dts/qcom-ipq8064.dtsi | 1 +
|
|
arch/arm/boot/dts/qcom-mdm9615.dtsi | 1 +
|
|
arch/arm/boot/dts/qcom-msm8660.dtsi | 1 +
|
|
arch/arm/boot/dts/qcom-msm8960.dtsi | 1 +
|
|
arch/arm/boot/dts/qcom-msm8974.dtsi | 1 +
|
|
arch/arm64/boot/dts/qcom/ipq8074.dtsi | 3 ++-
|
|
arch/arm64/boot/dts/qcom/msm8916.dtsi | 1 +
|
|
arch/arm64/boot/dts/qcom/msm8992.dtsi | 1 +
|
|
arch/arm64/boot/dts/qcom/msm8994.dtsi | 1 +
|
|
arch/arm64/boot/dts/qcom/msm8996.dtsi | 1 +
|
|
13 files changed, 14 insertions(+), 1 deletion(-)
|
|
|
|
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
|
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
|
|
@@ -119,6 +119,7 @@
|
|
reg = <0x800000 0x4000>;
|
|
|
|
gpio-controller;
|
|
+ gpio-ranges = <&qcom_pinmux 0 0 69>;
|
|
#gpio-cells = <2>;
|
|
interrupt-controller;
|
|
#interrupt-cells = <2>;
|