forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f 
 kernel/arch/arm/boot/dts/qcom-apq8064.dtsi
....@@ -1,7 +1,6 @@
11 // SPDX-License-Identifier: GPL-2.0
22 /dts-v1/;
33 
4
-#include "skeleton.dtsi"
54 #include <dt-bindings/clock/qcom,gcc-msm8960.h>
65 #include <dt-bindings/reset/qcom,gcc-msm8960.h>
76 #include <dt-bindings/clock/qcom,mmcc-msm8960.h>
....@@ -10,6 +9,8 @@
109 #include <dt-bindings/interrupt-controller/irq.h>
1110 #include <dt-bindings/interrupt-controller/arm-gic.h>
1211 / {
12
+	#address-cells = <1>;
13
+	#size-cells = <1>;
1314 	model = "Qualcomm APQ8064";
1415 	compatible = "qcom,apq8064";
1516 	interrupt-parent = <&intc>;
....@@ -92,6 +93,11 @@
9293 				min-residency-us = <3000>;
9394 			};
9495 		};
96
+	};
97
+
98
+	memory {
99
+		device_type = "memory";
100
+		reg = <0x0 0x0>;
95101 	};
96102 
97103 	thermal-zones {
....@@ -192,7 +198,7 @@
192198 			clock-frequency = <19200000>;
193199 		};
194200 
195
-		pxo_board {
201
+		pxo_board: pxo_board {
196202 			compatible = "fixed-clock";
197203 			#clock-cells = <0>;
198204 			clock-frequency = <27000000>;
....@@ -344,6 +350,7 @@
344350 			reg = <0x800000 0x4000>;
345351 
346352 			gpio-controller;
353
+			gpio-ranges = <&tlmm_pinmux 0 0 90>;
347354 			#gpio-cells = <2>;
348355 			interrupt-controller;
349356 			#interrupt-cells = <2>;
....@@ -705,51 +712,10 @@
705712 					compatible = "qcom,pm8921-gpio",
706713 						     "qcom,ssbi-gpio";
707714 					reg = <0x150>;
708
-					interrupts = <192 IRQ_TYPE_NONE>,
709
-						     <193 IRQ_TYPE_NONE>,
710
-						     <194 IRQ_TYPE_NONE>,
711
-						     <195 IRQ_TYPE_NONE>,
712
-						     <196 IRQ_TYPE_NONE>,
713
-						     <197 IRQ_TYPE_NONE>,
714
-						     <198 IRQ_TYPE_NONE>,
715
-						     <199 IRQ_TYPE_NONE>,
716
-						     <200 IRQ_TYPE_NONE>,
717
-						     <201 IRQ_TYPE_NONE>,
718
-						     <202 IRQ_TYPE_NONE>,
719
-						     <203 IRQ_TYPE_NONE>,
720
-						     <204 IRQ_TYPE_NONE>,
721
-						     <205 IRQ_TYPE_NONE>,
722
-						     <206 IRQ_TYPE_NONE>,
723
-						     <207 IRQ_TYPE_NONE>,
724
-						     <208 IRQ_TYPE_NONE>,
725
-						     <209 IRQ_TYPE_NONE>,
726
-						     <210 IRQ_TYPE_NONE>,
727
-						     <211 IRQ_TYPE_NONE>,
728
-						     <212 IRQ_TYPE_NONE>,
729
-						     <213 IRQ_TYPE_NONE>,
730
-						     <214 IRQ_TYPE_NONE>,
731
-						     <215 IRQ_TYPE_NONE>,
732
-						     <216 IRQ_TYPE_NONE>,
733
-						     <217 IRQ_TYPE_NONE>,
734
-						     <218 IRQ_TYPE_NONE>,
735
-						     <219 IRQ_TYPE_NONE>,
736
-						     <220 IRQ_TYPE_NONE>,
737
-						     <221 IRQ_TYPE_NONE>,
738
-						     <222 IRQ_TYPE_NONE>,
739
-						     <223 IRQ_TYPE_NONE>,
740
-						     <224 IRQ_TYPE_NONE>,
741
-						     <225 IRQ_TYPE_NONE>,
742
-						     <226 IRQ_TYPE_NONE>,
743
-						     <227 IRQ_TYPE_NONE>,
744
-						     <228 IRQ_TYPE_NONE>,
745
-						     <229 IRQ_TYPE_NONE>,
746
-						     <230 IRQ_TYPE_NONE>,
747
-						     <231 IRQ_TYPE_NONE>,
748
-						     <232 IRQ_TYPE_NONE>,
749
-						     <233 IRQ_TYPE_NONE>,
750
-						     <234 IRQ_TYPE_NONE>,
751
-						     <235 IRQ_TYPE_NONE>;
715
+					interrupt-controller;
716
+					#interrupt-cells = <2>;
752717 					gpio-controller;
718
+					gpio-ranges = <&pm8921_gpio 0 0 44>;
753719 					#gpio-cells = <2>;
754720 
755721 				};
....@@ -1337,8 +1303,9 @@
13371303 				<0x04700300 0x200>,
13381304 				<0x04700500 0x5c>;
13391305 			reg-names = "dsi_pll", "dsi_phy", "dsi_phy_regulator";
1340
-			clock-names = "iface_clk";
1341
-			clocks = <&mmcc DSI_M_AHB_CLK>;
1306
+			clock-names = "iface_clk", "ref";
1307
+			clocks = <&mmcc DSI_M_AHB_CLK>,
1308
+				 <&pxo_board>;
13421309 		};
13431310 
13441311 
....@@ -1610,10 +1577,11 @@
16101577 			clocks = <&rpmcc RPM_QDSS_CLK>;
16111578 			clock-names = "apb_pclk";
16121579 
1613
-			port {
1614
-				etb_in: endpoint {
1615
-					slave-mode;
1616
-					remote-endpoint = <&replicator_out0>;
1580
+			in-ports {
1581
+				port {
1582
+					etb_in: endpoint {
1583
+						remote-endpoint = <&replicator_out0>;
1584
+					};
16171585 				};
16181586 			};
16191587 		};
....@@ -1625,21 +1593,22 @@
16251593 			clocks = <&rpmcc RPM_QDSS_CLK>;
16261594 			clock-names = "apb_pclk";
16271595 
1628
-			port {
1629
-				tpiu_in: endpoint {
1630
-					slave-mode;
1631
-					remote-endpoint = <&replicator_out1>;
1596
+			in-ports {
1597
+				port {
1598
+					tpiu_in: endpoint {
1599
+						remote-endpoint = <&replicator_out1>;
1600
+					};
16321601 				};
16331602 			};
16341603 		};
16351604 
16361605 		replicator {
1637
-			compatible = "arm,coresight-replicator";
1606
+			compatible = "arm,coresight-static-replicator";
16381607 
16391608 			clocks = <&rpmcc RPM_QDSS_CLK>;
16401609 			clock-names = "apb_pclk";
16411610 
1642
-			ports {
1611
+			out-ports {
16431612 				#address-cells = <1>;
16441613 				#size-cells = <0>;
16451614 
....@@ -1655,10 +1624,11 @@
16551624 						remote-endpoint = <&tpiu_in>;
16561625 					};
16571626 				};
1658
-				port@2 {
1659
-					reg = <0>;
1627
+			};
1628
+
1629
+			in-ports {
1630
+				port {
16601631 					replicator_in: endpoint {
1661
-						slave-mode;
16621632 						remote-endpoint = <&funnel_out>;
16631633 					};
16641634 				};
....@@ -1666,13 +1636,13 @@
16661636 		};
16671637 
16681638 		funnel@1a04000 {
1669
-			compatible = "arm,coresight-funnel", "arm,primecell";
1639
+			compatible = "arm,coresight-dynamic-funnel", "arm,primecell";
16701640 			reg = <0x1a04000 0x1000>;
16711641 
16721642 			clocks = <&rpmcc RPM_QDSS_CLK>;
16731643 			clock-names = "apb_pclk";
16741644 
1675
-			ports {
1645
+			in-ports {
16761646 				#address-cells = <1>;
16771647 				#size-cells = <0>;
16781648 
....@@ -1686,33 +1656,31 @@
16861656 				port@0 {
16871657 					reg = <0>;
16881658 					funnel_in0: endpoint {
1689
-						slave-mode;
16901659 						remote-endpoint = <&etm0_out>;
16911660 					};
16921661 				};
16931662 				port@1 {
16941663 					reg = <1>;
16951664 					funnel_in1: endpoint {
1696
-						slave-mode;
16971665 						remote-endpoint = <&etm1_out>;
16981666 					};
16991667 				};
17001668 				port@4 {
17011669 					reg = <4>;
17021670 					funnel_in4: endpoint {
1703
-						slave-mode;
17041671 						remote-endpoint = <&etm2_out>;
17051672 					};
17061673 				};
17071674 				port@5 {
17081675 					reg = <5>;
17091676 					funnel_in5: endpoint {
1710
-						slave-mode;
17111677 						remote-endpoint = <&etm3_out>;
17121678 					};
17131679 				};
1714
-				port@8 {
1715
-					reg = <0>;
1680
+			};
1681
+
1682
+			out-ports {
1683
+				port {
17161684 					funnel_out: endpoint {
17171685 						remote-endpoint = <&replicator_in>;
17181686 					};
....@@ -1729,9 +1697,11 @@
17291697 
17301698 			cpu = <&CPU0>;
17311699 
1732
-			port {
1733
-				etm0_out: endpoint {
1734
-					remote-endpoint = <&funnel_in0>;
1700
+			out-ports {
1701
+				port {
1702
+					etm0_out: endpoint {
1703
+						remote-endpoint = <&funnel_in0>;
1704
+					};
17351705 				};
17361706 			};
17371707 		};
....@@ -1745,9 +1715,11 @@
17451715 
17461716 			cpu = <&CPU1>;
17471717 
1748
-			port {
1749
-				etm1_out: endpoint {
1750
-					remote-endpoint = <&funnel_in1>;
1718
+			out-ports {
1719
+				port {
1720
+					etm1_out: endpoint {
1721
+						remote-endpoint = <&funnel_in1>;
1722
+					};
17511723 				};
17521724 			};
17531725 		};
....@@ -1761,9 +1733,11 @@
17611733 
17621734 			cpu = <&CPU2>;
17631735 
1764
-			port {
1765
-				etm2_out: endpoint {
1766
-					remote-endpoint = <&funnel_in4>;
1736
+			out-ports {
1737
+				port {
1738
+					etm2_out: endpoint {
1739
+						remote-endpoint = <&funnel_in4>;
1740
+					};
17671741 				};
17681742 			};
17691743 		};
....@@ -1777,9 +1751,11 @@
17771751 
17781752 			cpu = <&CPU3>;
17791753 
1780
-			port {
1781
-				etm3_out: endpoint {
1782
-					remote-endpoint = <&funnel_in5>;
1754
+			out-ports {
1755
+				port {
1756
+					etm3_out: endpoint {
1757
+						remote-endpoint = <&funnel_in5>;
1758
+					};
17831759 				};
17841760 			};
17851761 		};