ipq806x: add GSBI nodes to ipq8064-dtsi-addidions
Rather than having separate patches for each GSBI node added, this patch consolidates the existing GSBI1 patch into 083-ipq8064-dtsi-additions.patch. In addition, GSBI6 and GSBI7 I2C nodes, required for the MR42 and MR52 respectively, are added. Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
This commit is contained in:
		
				
					committed by
					
						
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			
						parent
						
							529eac5371
						
					
				
				
					commit
					cef420e8f7
				
			@@ -563,7 +563,7 @@
 | 
				
			|||||||
 		saw0: regulator@2089000 {
 | 
					 		saw0: regulator@2089000 {
 | 
				
			||||||
 			compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
 | 
					 			compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
 | 
				
			||||||
 			reg = <0x02089000 0x1000>, <0x02009000 0x1000>;
 | 
					 			reg = <0x02089000 0x1000>, <0x02009000 0x1000>;
 | 
				
			||||||
@@ -243,6 +739,17 @@
 | 
					@@ -243,6 +739,52 @@
 | 
				
			||||||
 			regulator;
 | 
					 			regulator;
 | 
				
			||||||
 		};
 | 
					 		};
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
@@ -577,11 +577,100 @@
 | 
				
			|||||||
+			compatible = "syscon";
 | 
					+			compatible = "syscon";
 | 
				
			||||||
+			reg = <0x12100000 0x10000>;
 | 
					+			reg = <0x12100000 0x10000>;
 | 
				
			||||||
+		};
 | 
					+		};
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+		gsbi1: gsbi@12440000 {
 | 
				
			||||||
 | 
					+			compatible = "qcom,gsbi-v1.0.0";
 | 
				
			||||||
 | 
					+			cell-index = <1>;
 | 
				
			||||||
 | 
					+			reg = <0x12440000 0x100>;
 | 
				
			||||||
 | 
					+			clocks = <&gcc GSBI1_H_CLK>;
 | 
				
			||||||
 | 
					+			clock-names = "iface";
 | 
				
			||||||
 | 
					+			#address-cells = <1>;
 | 
				
			||||||
 | 
					+			#size-cells = <1>;
 | 
				
			||||||
 | 
					+			ranges;
 | 
				
			||||||
 | 
					+			status = "disabled";
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+			syscon-tcsr = <&tcsr>;
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+			gsbi1_serial: serial@12450000 {
 | 
				
			||||||
 | 
					+				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 | 
				
			||||||
 | 
					+				reg = <0x12450000 0x100>,
 | 
				
			||||||
 | 
					+				      <0x12400000 0x03>;
 | 
				
			||||||
 | 
					+				interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>;
 | 
				
			||||||
 | 
					+				clocks = <&gcc GSBI1_UART_CLK>, <&gcc GSBI1_H_CLK>;
 | 
				
			||||||
 | 
					+				clock-names = "core", "iface";
 | 
				
			||||||
 | 
					+				status = "disabled";
 | 
				
			||||||
 | 
					+			};
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+			gsbi1_i2c: i2c@12460000 {
 | 
				
			||||||
 | 
					+				compatible = "qcom,i2c-qup-v1.1.1";
 | 
				
			||||||
 | 
					+				reg = <0x12460000 0x1000>;
 | 
				
			||||||
 | 
					+				interrupts = <GIC_SPI 194 IRQ_TYPE_LEVEL_HIGH>;
 | 
				
			||||||
 | 
					+				clocks = <&gcc GSBI1_QUP_CLK>, <&gcc GSBI1_H_CLK>;
 | 
				
			||||||
 | 
					+				clock-names = "core", "iface";
 | 
				
			||||||
 | 
					+				#address-cells = <1>;
 | 
				
			||||||
 | 
					+				#size-cells = <0>;
 | 
				
			||||||
 | 
					+				status = "disabled";
 | 
				
			||||||
 | 
					+			};
 | 
				
			||||||
 | 
					+		};
 | 
				
			||||||
+
 | 
					+
 | 
				
			||||||
 		gsbi2: gsbi@12480000 {
 | 
					 		gsbi2: gsbi@12480000 {
 | 
				
			||||||
 			compatible = "qcom,gsbi-v1.0.0";
 | 
					 			compatible = "qcom,gsbi-v1.0.0";
 | 
				
			||||||
 			cell-index = <2>;
 | 
					 			cell-index = <2>;
 | 
				
			||||||
@@ -478,6 +985,95 @@
 | 
					@@ -368,6 +910,33 @@
 | 
				
			||||||
 | 
					 			};
 | 
				
			||||||
 | 
					 		};
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					+		gsbi6: gsbi@16500000 {
 | 
				
			||||||
 | 
					+			status = "disabled";
 | 
				
			||||||
 | 
					+			compatible = "qcom,gsbi-v1.0.0";
 | 
				
			||||||
 | 
					+			cell-index = <6>;
 | 
				
			||||||
 | 
					+			reg = <0x16500000 0x100>;
 | 
				
			||||||
 | 
					+			clocks = <&gcc GSBI6_H_CLK>;
 | 
				
			||||||
 | 
					+			clock-names = "iface";
 | 
				
			||||||
 | 
					+			#address-cells = <1>;
 | 
				
			||||||
 | 
					+			#size-cells = <1>;
 | 
				
			||||||
 | 
					+			ranges;
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+			syscon-tcsr = <&tcsr>;
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+			gsbi6_i2c: i2c@16580000 {
 | 
				
			||||||
 | 
					+				compatible = "qcom,i2c-qup-v1.1.1";
 | 
				
			||||||
 | 
					+				reg = <0x16580000 0x1000>;
 | 
				
			||||||
 | 
					+				interrupts = <GIC_SPI 157 IRQ_TYPE_LEVEL_HIGH>;
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+				clocks = <&gcc GSBI6_QUP_CLK>, <&gcc GSBI6_H_CLK>;
 | 
				
			||||||
 | 
					+				clock-names = "core", "iface";
 | 
				
			||||||
 | 
					+				status = "disabled";
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+				#address-cells = <1>;
 | 
				
			||||||
 | 
					+				#size-cells = <0>;
 | 
				
			||||||
 | 
					+			};
 | 
				
			||||||
 | 
					+		};
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					 		gsbi7: gsbi@16600000 {
 | 
				
			||||||
 | 
					 			status = "disabled";
 | 
				
			||||||
 | 
					 			compatible = "qcom,gsbi-v1.0.0";
 | 
				
			||||||
 | 
					@@ -389,6 +958,19 @@
 | 
				
			||||||
 | 
					 				clock-names = "core", "iface";
 | 
				
			||||||
 | 
					 				status = "disabled";
 | 
				
			||||||
 | 
					 			};
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+			gsbi7_i2c: i2c@16680000 {
 | 
				
			||||||
 | 
					+ 				compatible = "qcom,i2c-qup-v1.1.1";
 | 
				
			||||||
 | 
					+ 				reg = <0x16680000 0x1000>;
 | 
				
			||||||
 | 
					+				interrupts = <GIC_SPI 159 IRQ_TYPE_LEVEL_HIGH>;
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+ 				clocks = <&gcc GSBI7_QUP_CLK>, <&gcc GSBI7_H_CLK>;
 | 
				
			||||||
 | 
					+ 				clock-names = "core", "iface";
 | 
				
			||||||
 | 
					+				status = "disabled";
 | 
				
			||||||
 | 
					+
 | 
				
			||||||
 | 
					+ 				#address-cells = <1>;
 | 
				
			||||||
 | 
					+				#size-cells = <0>;
 | 
				
			||||||
 | 
					+			};
 | 
				
			||||||
 | 
					 		};
 | 
				
			||||||
 | 
					 
 | 
				
			||||||
 | 
					 		sata_phy: sata-phy@1b400000 {
 | 
				
			||||||
 | 
					@@ -478,6 +1060,95 @@
 | 
				
			||||||
 			#reset-cells = <1>;
 | 
					 			#reset-cells = <1>;
 | 
				
			||||||
 		};
 | 
					 		};
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
@@ -677,7 +766,7 @@
 | 
				
			|||||||
 		pcie0: pci@1b500000 {
 | 
					 		pcie0: pci@1b500000 {
 | 
				
			||||||
 			compatible = "qcom,pcie-ipq8064";
 | 
					 			compatible = "qcom,pcie-ipq8064";
 | 
				
			||||||
 			reg = <0x1b500000 0x1000
 | 
					 			reg = <0x1b500000 0x1000
 | 
				
			||||||
@@ -739,6 +1335,59 @@
 | 
					@@ -739,6 +1410,59 @@
 | 
				
			||||||
 			status = "disabled";
 | 
					 			status = "disabled";
 | 
				
			||||||
 		};
 | 
					 		};
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
@@ -737,7 +826,7 @@
 | 
				
			|||||||
 		vsdcc_fixed: vsdcc-regulator {
 | 
					 		vsdcc_fixed: vsdcc-regulator {
 | 
				
			||||||
 			compatible = "regulator-fixed";
 | 
					 			compatible = "regulator-fixed";
 | 
				
			||||||
 			regulator-name = "SDCC Power";
 | 
					 			regulator-name = "SDCC Power";
 | 
				
			||||||
@@ -814,4 +1463,17 @@
 | 
					@@ -814,4 +1538,17 @@
 | 
				
			||||||
 			};
 | 
					 			};
 | 
				
			||||||
 		};
 | 
					 		};
 | 
				
			||||||
 	};
 | 
					 	};
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 | 
					--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 | 
				
			||||||
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
 | 
					+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
 | 
				
			||||||
@@ -1088,7 +1088,7 @@
 | 
					@@ -1163,7 +1163,7 @@
 | 
				
			||||||
 			#address-cells = <3>;
 | 
					 			#address-cells = <3>;
 | 
				
			||||||
 			#size-cells = <2>;
 | 
					 			#size-cells = <2>;
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
@@ -26,7 +26,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
 | 
				
			|||||||
 				  0x82000000 0 0x08000000 0x08000000 0 0x07e00000>; /* non-prefetchable memory */
 | 
					 				  0x82000000 0 0x08000000 0x08000000 0 0x07e00000>; /* non-prefetchable memory */
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
 | 
					 			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
 | 
				
			||||||
@@ -1139,7 +1139,7 @@
 | 
					@@ -1214,7 +1214,7 @@
 | 
				
			||||||
 			#address-cells = <3>;
 | 
					 			#address-cells = <3>;
 | 
				
			||||||
 			#size-cells = <2>;
 | 
					 			#size-cells = <2>;
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
@@ -35,7 +35,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
 | 
				
			|||||||
 				  0x82000000 0 0x2e000000 0x2e000000 0 0x03e00000>; /* non-prefetchable memory */
 | 
					 				  0x82000000 0 0x2e000000 0x2e000000 0 0x03e00000>; /* non-prefetchable memory */
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 			interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
 | 
					 			interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
 | 
				
			||||||
@@ -1190,7 +1190,7 @@
 | 
					@@ -1265,7 +1265,7 @@
 | 
				
			||||||
 			#address-cells = <3>;
 | 
					 			#address-cells = <3>;
 | 
				
			||||||
 			#size-cells = <2>;
 | 
					 			#size-cells = <2>;
 | 
				
			||||||
 
 | 
					 
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,44 +0,0 @@
 | 
				
			|||||||
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 | 
					 | 
				
			||||||
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
 | 
					 | 
				
			||||||
@@ -750,6 +750,41 @@
 | 
					 | 
				
			||||||
 			reg = <0x12100000 0x10000>;
 | 
					 | 
				
			||||||
 		};
 | 
					 | 
				
			||||||
 
 | 
					 | 
				
			||||||
+		gsbi1: gsbi@12440000 {
 | 
					 | 
				
			||||||
+			compatible = "qcom,gsbi-v1.0.0";
 | 
					 | 
				
			||||||
+			cell-index = <1>;
 | 
					 | 
				
			||||||
+			reg = <0x12440000 0x100>;
 | 
					 | 
				
			||||||
+			clocks = <&gcc GSBI1_H_CLK>;
 | 
					 | 
				
			||||||
+			clock-names = "iface";
 | 
					 | 
				
			||||||
+			#address-cells = <1>;
 | 
					 | 
				
			||||||
+			#size-cells = <1>;
 | 
					 | 
				
			||||||
+			ranges;
 | 
					 | 
				
			||||||
+			status = "disabled";
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+			syscon-tcsr = <&tcsr>;
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+			gsbi1_serial: serial@12450000 {
 | 
					 | 
				
			||||||
+				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 | 
					 | 
				
			||||||
+				reg = <0x12450000 0x100>,
 | 
					 | 
				
			||||||
+				      <0x12400000 0x03>;
 | 
					 | 
				
			||||||
+				interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>;
 | 
					 | 
				
			||||||
+				clocks = <&gcc GSBI1_UART_CLK>, <&gcc GSBI1_H_CLK>;
 | 
					 | 
				
			||||||
+				clock-names = "core", "iface";
 | 
					 | 
				
			||||||
+				status = "disabled";
 | 
					 | 
				
			||||||
+			};
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
+			gsbi1_i2c: i2c@12460000 {
 | 
					 | 
				
			||||||
+				compatible = "qcom,i2c-qup-v1.1.1";
 | 
					 | 
				
			||||||
+				reg = <0x12460000 0x1000>;
 | 
					 | 
				
			||||||
+				interrupts = <GIC_SPI 194 IRQ_TYPE_LEVEL_HIGH>;
 | 
					 | 
				
			||||||
+				clocks = <&gcc GSBI1_QUP_CLK>, <&gcc GSBI1_H_CLK>;
 | 
					 | 
				
			||||||
+				clock-names = "core", "iface";
 | 
					 | 
				
			||||||
+				#address-cells = <1>;
 | 
					 | 
				
			||||||
+				#size-cells = <0>;
 | 
					 | 
				
			||||||
+				status = "disabled";
 | 
					 | 
				
			||||||
+			};
 | 
					 | 
				
			||||||
+		};
 | 
					 | 
				
			||||||
+
 | 
					 | 
				
			||||||
 		gsbi2: gsbi@12480000 {
 | 
					 | 
				
			||||||
 			compatible = "qcom,gsbi-v1.0.0";
 | 
					 | 
				
			||||||
 			cell-index = <2>;
 | 
					 | 
				
			||||||
		Reference in New Issue
	
	Block a user