瀏覽代碼

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 <[email protected]>
Roman Yeryomin 8 年之前
父節點
當前提交
1abc788924

+ 78 - 0
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 <[email protected]>
+X-Patchwork-Id: 9822107
+Message-Id: <[email protected]>
+To: [email protected], [email protected], [email protected],
+ [email protected], [email protected],
+ [email protected], 
+ [email protected], [email protected],
+ [email protected], [email protected]
+Cc: Varadarajan Narayanan <[email protected]>
+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 <[email protected]>
+---
+ 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 {

+ 27 - 0
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 {