aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq806x
diff options
context:
space:
mode:
authorRoman Yeryomin <roman@advem.lv>2017-10-30 01:18:11 +0200
committerJohn Crispin <john@phrozen.org>2017-10-30 01:18:11 +0200
commit1abc7889242a1cfa103ecb8b4a55ccac02643023 (patch)
treeac46d761cc66092c07e78bc86b610f6c78a9b016 /target/linux/ipq806x
parentab3ab6241f41f5e5a038958ff7bad460964e59aa (diff)
downloadupstream-1abc7889242a1cfa103ecb8b4a55ccac02643023.tar.gz
upstream-1abc7889242a1cfa103ecb8b4a55ccac02643023.tar.bz2
upstream-1abc7889242a1cfa103ecb8b4a55ccac02643023.zip
ipq806x: ipq4019: dts: move xo and timer nodes to SoC dtsi
xo and timer are common thing and it makes more sense to keep them in SoC dtsi Signed-off-by: Roman Yeryomin <roman@advem.lv>
Diffstat (limited to 'target/linux/ipq806x')
-rw-r--r--target/linux/ipq806x/patches-4.9/864-00-v3-2-2-dts-ipq4019-Move-xo-and-timer-nodes-to-SoC-dtsi.patch78
-rw-r--r--target/linux/ipq806x/patches-4.9/864-02-dts-ipq4019-ap-dk04-remove-xo-and-timer-nodes.patch27
2 files changed, 105 insertions, 0 deletions
diff --git a/target/linux/ipq806x/patches-4.9/864-00-v3-2-2-dts-ipq4019-Move-xo-and-timer-nodes-to-SoC-dtsi.patch b/target/linux/ipq806x/patches-4.9/864-00-v3-2-2-dts-ipq4019-Move-xo-and-timer-nodes-to-SoC-dtsi.patch
new file mode 100644
index 0000000000..da3b2c6945
--- /dev/null
+++ b/target/linux/ipq806x/patches-4.9/864-00-v3-2-2-dts-ipq4019-Move-xo-and-timer-nodes-to-SoC-dtsi.patch
@@ -0,0 +1,78 @@
+From patchwork Mon Jul 3 07:47:13 2017
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+Subject: [v3,2/2] dts: ipq4019: Move xo and timer nodes to SoC dtsi
+From: Varadarajan Narayanan <varada@codeaurora.org>
+X-Patchwork-Id: 9822107
+Message-Id: <1499068033-24000-3-git-send-email-varada@codeaurora.org>
+To: andy.gross@linaro.org, david.brown@linaro.org, robh+dt@kernel.org,
+ mark.rutland@arm.com, linux@armlinux.org.uk,
+ linux-arm-msm@vger.kernel.org,
+ linux-soc@vger.kernel.org, devicetree@vger.kernel.org,
+ linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
+Cc: Varadarajan Narayanan <varada@codeaurora.org>
+Date: Mon, 3 Jul 2017 13:17:13 +0530
+
+The node for xo and timer belong to the SoC DTS file.
+Else, new board DT files may not inherit these nodes.
+
+Signed-off-by: Varadarajan Narayanan <varada@codeaurora.org>
+---
+ arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 19 -------------------
+ arch/arm/boot/dts/qcom-ipq4019.dtsi | 15 +++++++++++++++
+ 2 files changed, 15 insertions(+), 19 deletions(-)
+
+--- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
+@@ -20,26 +20,7 @@
+ model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK01.1";
+ compatible = "qcom,ipq4019";
+
+- clocks {
+- xo: xo {
+- compatible = "fixed-clock";
+- clock-frequency = <48000000>;
+- #clock-cells = <0>;
+- };
+- };
+-
+ soc {
+-
+-
+- timer {
+- compatible = "arm,armv7-timer";
+- interrupts = <1 2 0xf08>,
+- <1 3 0xf08>,
+- <1 4 0xf08>,
+- <1 1 0xf08>;
+- clock-frequency = <48000000>;
+- };
+-
+ pinctrl@1000000 {
+ serial_pins: serial_pinmux {
+ mux {
+--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
+@@ -132,6 +132,21 @@
+ clock-frequency = <32768>;
+ #clock-cells = <0>;
+ };
++
++ xo: xo {
++ compatible = "fixed-clock";
++ clock-frequency = <48000000>;
++ #clock-cells = <0>;
++ };
++ };
++
++ timer {
++ compatible = "arm,armv7-timer";
++ interrupts = <1 2 0xf08>,
++ <1 3 0xf08>,
++ <1 4 0xf08>,
++ <1 1 0xf08>;
++ clock-frequency = <48000000>;
+ };
+
+ soc {
diff --git a/target/linux/ipq806x/patches-4.9/864-02-dts-ipq4019-ap-dk04-remove-xo-and-timer-nodes.patch b/target/linux/ipq806x/patches-4.9/864-02-dts-ipq4019-ap-dk04-remove-xo-and-timer-nodes.patch
new file mode 100644
index 0000000000..dcbdb8d777
--- /dev/null
+++ b/target/linux/ipq806x/patches-4.9/864-02-dts-ipq4019-ap-dk04-remove-xo-and-timer-nodes.patch
@@ -0,0 +1,27 @@
+--- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi
+@@ -20,24 +20,7 @@
+ model = "Qualcomm Technologies, Inc. IPQ4019/AP-DK04.1";
+ compatible = "qcom,ipq4019";
+
+- clocks {
+- xo: xo {
+- compatible = "fixed-clock";
+- clock-frequency = <48000000>;
+- #clock-cells = <0>;
+- };
+- };
+-
+ soc {
+- timer {
+- compatible = "arm,armv7-timer";
+- interrupts = <1 2 0xf08>,
+- <1 3 0xf08>,
+- <1 4 0xf08>,
+- <1 1 0xf08>;
+- clock-frequency = <48000000>;
+- };
+-
+ pinctrl@1000000 {
+ serial_0_pins: serial_pinmux {
+ mux {