Skip to contentSkip to conversation

GSBI CRCI Autoconfiguration Support

PATCH Superseded Andy Gross 3 participants 11 messages Jan 30, 2015 – Feb 3, 2015

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Andy Gross

author
#0 lore raw

v2 cover GSBI CRCI Autoconfiguration Support

This patch set adds support for automatic configuration of GSBI DMA CRCI values.

DMA operations require that the ADM CRCI mux values be properly configured in the TCSR (Top Control and Status Register) block. During probing of a GSBI device, the client mode must be declared and this can be used to lookup the correct TCSR ADM CRCI MUX settings and then program them so that they are correct before any clients are populated.

These patches add the TCSR as a syscon device and that allows the GSBI to access and manipulate the ADM CRCI MUX registers to correctly configure the values based on the GSBI port configuration.

Changes since v1:
- Fixed various review comments

Andy Gross (6):
soc: qcom: gsbi: Add support for ADM CRCI muxing
mfd: qcom,tcsr: Add device tree binding for TCSR
ARM: DT: apq8064: Add TCSR support
ARM: DT: ipq8064: Add TCSR support
ARM: DT: msm8660: Add TCSR support
ARM: DT: msm8960: Add TCSR support

 .../devicetree/bindings/mfd/qcom,tcsr.txt          |   22 +++
 .../devicetree/bindings/soc/qcom/qcom,gsbi.txt     |   18 ++-
 arch/arm/boot/dts/qcom-apq8064.dtsi                |   17 +++
 arch/arm/boot/dts/qcom-ipq8064.dtsi                |   17 +++
 arch/arm/boot/dts/qcom-msm8660.dtsi                |   11 ++
 arch/arm/boot/dts/qcom-msm8960.dtsi                |   11 ++
 drivers/soc/qcom/Kconfig                           |    1 +
 drivers/soc/qcom/qcom_gsbi.c                       |  153 ++++++++++++++++++++
 8 files changed, 249 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/mfd/qcom,tcsr.txt
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
author
#1 lore raw

PATCH v2 1/6 soc: qcom: gsbi: Add support for ADM CRCI muxing

This patch adds automatic configuration for the ADM CRCI muxing required to support DMA operations for GSBI clients. The GSBI mode and instance determine the correct TCSR ADM CRCI MUX value that must be programmed so that the DMA works properly.

---
 .../devicetree/bindings/soc/qcom/qcom,gsbi.txt     |   18 ++-
 drivers/soc/qcom/Kconfig                           |    1 +
 drivers/soc/qcom/qcom_gsbi.c                       |  153 ++++++++++++++++++++
 3 files changed, 171 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +17 -1
index 4ce24d4..8fe7b37 100644
@@ -6,7 +6,7 @@ configuration settings.  The mode setting will govern the input/output mode of
 the 4 GSBI IOs.
 
 Required properties:
-- compatible: must contain "qcom,gsbi-v1.0.0" for APQ8064/IPQ8064
+- compatible:	Should contain "qcom,gsbi-v1.0.0"
 - reg: Address range for GSBI registers
 - clocks: required clock
 - clock-names: must contain "iface" entry
@@ -16,12 +16,16 @@ Required properties:
 Optional properties:
 - qcom,crci : indicates CRCI MUX value for QUP CRCI ports.  Please reference
   dt-bindings/soc/qcom,gsbi.h for valid CRCI mux values.
+- syscon-tcsr: indicates phandle of TCSR syscon node.  Required if child uses
+  dma.
 
 Required properties if child node exists:
 - #address-cells: Must be 1
 - #size-cells: Must be 1
 - ranges: Must be present
 
+Note: Each GSBI should have an alias correctly numbered in "aliases" node.
+
 Properties for children:
 
 A GSBI controller node can contain 0 or more child nodes representing serial
@@ -37,6 +41,10 @@ Example for APQ8064:
 
 #include <dt-bindings/soc/qcom,gsbi.h>
 
+	aliases {
+		gsbi4 = <&gsbi4>;
+	};
+
 	gsbi4 at 16300000 {
 		compatible = "qcom,gsbi-v1.0.0";
 		reg = <0x16300000 0x100>;
@@ -48,6 +56,8 @@ Example for APQ8064:
 		qcom,mode = <GSBI_PROT_I2C_UART>;
 		qcom,crci = <GSBI_CRCI_QUP>;
 
+		syscon-tcsr = <&tcsr>;
+
 		/* child nodes go under here */
 
 		i2c_qup4: i2c at 16380000 {
@@ -76,3 +86,9 @@ Example for APQ8064:
 		};
 	};
 
+	tcsr: syscon at 1a400000 {
+		compatible = "qcom,apq8064-tcsr", "syscon";
+		reg = <0x1a400000 0x100>;
+	};
+
+
drivers/soc/qcom/Kconfig +1 -0
index 7bd2c94..460b2db 100644
@@ -4,6 +4,7 @@
 config QCOM_GSBI
         tristate "QCOM General Serial Bus Interface"
         depends on ARCH_QCOM
+        select MFD_SYSCON
         help
           Say y here to enable GSBI support.  The GSBI provides control
           functions for connecting the underlying serial UART, SPI, and I2C
drivers/soc/qcom/qcom_gsbi.c +153 -0

187 lines not on this page · raw message

Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
#2 lore raw

Re: [Patch v2 1/6] soc: qcom: gsbi: Add support for ADM CRCI muxing

Quoted 43 lines · Andy Gross

This patch adds automatic configuration for the ADM CRCI muxing required to support DMA operations for GSBI clients. The GSBI mode and instance determine the correct TCSR ADM CRCI MUX value that must be programmed so that the DMA works properly.

---

.../devicetree/bindings/soc/qcom/qcom,gsbi.txt     |   18 ++-
drivers/soc/qcom/Kconfig                           |    1 +
drivers/soc/qcom/qcom_gsbi.c                       |  153 ++++++++++++++++++++
3 files changed, 171 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +0 -0
index 4ce24d4..8fe7b37 100644
@@ -6,7 +6,7 @@ configuration settings.  The mode setting will govern the input/output mode of

the 4 GSBI IOs.

Required properties:
-- compatible: must contain "qcom,gsbi-v1.0.0" for APQ8064/IPQ8064
+- compatible: Should contain "qcom,gsbi-v1.0.0"
- reg: Address range for GSBI registers
- clocks: required clock
- clock-names: must contain "iface" entry

Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +0 -0
@@ -16,12 +16,16 @@ Required properties:

Optional properties:
- qcom,crci : indicates CRCI MUX value for QUP CRCI ports. Please reference dt-bindings/soc/qcom,gsbi.h for valid CRCI mux values.

+- syscon-tcsr: indicates phandle of TCSR syscon node.  Required if child uses
+  dma.

Required properties if child node exists:
- #address-cells: Must be 1
- #size-cells: Must be 1
- ranges: Must be present

Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +2 -0
+Note: Each GSBI should have an alias correctly numbered in "aliases" node.
+

Properties for children:

A GSBI controller node can contain 0 or more child nodes representing serial

Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt Example for APQ8064: · line 46

Quoted 6 lines
Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +3 -0
@@ -37,6 +41,10 @@ Example for APQ8064:
 
 #include <dt-bindings/soc/qcom,gsbi.h>
 
+	aliases {
+		gsbi4 = <&gsbi4>;
+	};

You appear to be using the alias name to determine a index number for the gsbi, if that is the case, than you should probably just add a cell-index node to the gsbi?s for this purpose.

Quoted 14 lines
Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +3 -0
+
 	gsbi4 at 16300000 {
 		compatible = "qcom,gsbi-v1.0.0";
 		reg = <0x16300000 0x100>;
@@ -48,6 +56,8 @@ Example for APQ8064:
 		qcom,mode = <GSBI_PROT_I2C_UART>;
 		qcom,crci = <GSBI_CRCI_QUP>;
 
+		syscon-tcsr = <&tcsr>;
+
 		/* child nodes go under here */
 
 		i2c_qup4: i2c at 16380000 {

Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt Example for APQ8064: · line 94

Quoted 9 lines
Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +6 -0
@@ -76,3 +86,9 @@ Example for APQ8064:
 		};
 	};
 
+	tcsr: syscon at 1a400000 {
+		compatible = "qcom,apq8064-tcsr", "syscon";
+		reg = <0x1a400000 0x100>;
+	};
+
+

- k

Signature · 3 lines
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#3 lore raw

Re: [Patch v2 1/6] soc: qcom: gsbi: Add support for ADM CRCI muxing

Quoted 14 lines · Kumar Gala
Quoted 12 lines · Andy Gross

Required properties if child node exists:
- #address-cells: Must be 1
- #size-cells: Must be 1
- ranges: Must be present

Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +2 -0
+Note: Each GSBI should have an alias correctly numbered in "aliases" node.
+

Properties for children:

A GSBI controller node can contain 0 or more child nodes representing serial

(quoted diff) +0 -0
@@ -37,6 +41,10 @@ Example for APQ8064:
 
Quoted 7 lines

Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt Example for APQ8064: · line 46

Quoted 5 lines
Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +3 -0
 #include <dt-bindings/soc/qcom,gsbi.h>
 
+	aliases {
+		gsbi4 = <&gsbi4>;
+	};

You appear to be using the alias name to determine a index number for the gsbi, if that is the case, than you should probably just add a cell-index node to the gsbi?s for this purpose.

I thought cell-index was "deprecated" and referred more to things like enumerating all the devices on a bus by assigning them a unique ID. Aliases, on the other hand, allow us to enumerate a subset of devices that share the same bus with other devices of different types. For example, how would I know that a device is gsbi1 vs serial1 if they both used cell-index and they both had the same parent node?

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
#4 lore raw

Re: [Patch v2 1/6] soc: qcom: gsbi: Add support for ADM CRCI muxing

Quoted 23 lines · Stephen Boyd
Quoted 14 lines · Kumar Gala
Quoted 12 lines · Andy Gross

Required properties if child node exists:
- #address-cells: Must be 1
- #size-cells: Must be 1
- ranges: Must be present

Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +2 -0
+Note: Each GSBI should have an alias correctly numbered in "aliases" node.
+

Properties for children:

A GSBI controller node can contain 0 or more child nodes representing serial

(quoted diff) +0 -0
@@ -37,6 +41,10 @@ Example for APQ8064:
 
Quoted 7 lines

Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt Example for APQ8064: · line 46

Quoted 5 lines
Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +3 -0
 #include <dt-bindings/soc/qcom,gsbi.h>
 
+	aliases {
+		gsbi4 = <&gsbi4>;
+	};

You appear to be using the alias name to determine a index number for the gsbi, if that is the case, than you should probably just add a cell-index node to the gsbi?s for this purpose.

Quoted 6 lines

I thought cell-index was "deprecated" and referred more to things like enumerating all the devices on a bus by assigning them a unique ID. Aliases, on the other hand, allow us to enumerate a subset of devices that share the same bus with other devices of different types. For example, how would I know that a device is gsbi1 vs serial1 if they both used cell-index and they both had the same parent node?

I think the problem was cell-index was never well understood and abused. For the example you are giving you wouldn?t use cell-index because you are talking about things that would have different compatibles. For what it appears we really are enumerating the GSBI hardware to match some programming interface convention. If that is the case than I think cell-index is proper.

- k

Signature · 3 lines
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
#5 lore raw

Re: [Patch v2 1/6] soc: qcom: gsbi: Add support for ADM CRCI muxing

Quoted 24 lines · Kumar Gala
Quoted 22 lines · Stephen Boyd
Quoted 21 lines · Kumar Gala
Quoted 11 lines · Andy Gross

Required properties if child node exists:
- #address-cells: Must be 1
- #size-cells: Must be 1
- ranges: Must be present

Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +2 -0
+Note: Each GSBI should have an alias correctly numbered in "aliases" node.
+

Properties for children:

A GSBI controller node can contain 0 or more child nodes representing serial

Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt Example for APQ8064: · line 46

Quoted 6 lines
Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +3 -0
@@ -37,6 +41,10 @@ Example for APQ8064:
 
 #include <dt-bindings/soc/qcom,gsbi.h>
 
+	aliases {
+		gsbi4 = <&gsbi4>;
+	};

You appear to be using the alias name to determine a index number for the gsbi, if that is the case, than you should probably just add a cell-index node to the gsbi?s for this purpose.

Quoted 7 lines
Quoted 6 lines

I thought cell-index was "deprecated" and referred more to things like enumerating all the devices on a bus by assigning them a unique ID. Aliases, on the other hand, allow us to enumerate a subset of devices that share the same bus with other devices of different types. For example, how would I know that a device is gsbi1 vs serial1 if they both used cell-index and they both had the same parent node?

I think the problem was cell-index was never well understood and abused. For the example you are giving you wouldn?t use cell-index because you are talking about things that would have different compatibles. For what it appears we really are enumerating the GSBI hardware to match some programming interface convention. If that is the case than I think cell-index is proper.

Can you please explain when cell-index should be used and when aliases should be used? I'm confused because I recall this message from Rob Herring[1] where it's indicated that cell-index is pretty much deprecated. I'm also interested to find out what cell means in cell-index. Does it have any relation to *-cells properties?

[1] https://lkml.org/lkml/2012/11/10/102

Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project
author
#6 lore raw

PATCH v2 2/6 mfd: qcom,tcsr: Add device tree binding for TCSR

In reply to Andy Gross

This patch adds the device tree binding for the Qualcomm Top Control and Status Register device. The TCSR is comprised of a set of registers that provide various control and status functions for attached peripherals.

---
 .../devicetree/bindings/mfd/qcom,tcsr.txt          |   22 ++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mfd/qcom,tcsr.txt
Documentation/devicetree/bindings/mfd/qcom,tcsr.txt new file +22 -0
new file mode 100644
index 0000000..e90519d
@@ -0,0 +1,22 @@
+QCOM Top Control and Status Register
+
+Qualcomm devices have a set of registers that provide various control and status
+functions for their peripherals.  This node is intended to allow access to these
+registers via syscon.
+
+Required properties:
+- compatible:	Should contain:
+		"qcom,tcsr-ipq8064", "syscon" for IPQ8064
+		"qcom,tcsr-apq8064", "syscon" for APQ8064
+		"qcom,tcsr-msm8660", "syscon" for MSM8660
+		"qcom,tcsr-msm8960", "syscon" for MSM8960
+		"qcom,tcsr-msm8974", "syscon" for MSM8974
+		"qcom,tcsr-apq8084", "syscon" for APQ8084
+		"qcom,tcsr-msm8916", "syscon" for MSM8916
+- reg: Address range for TCSR registers
+
+Example:
+	tcsr: syscon at 1a400000 {
+		compatible = "qcom,tcsr-msm8960", "syscon";
+		reg = <0x1a400000 0x100>;
+	};
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
author
#7 lore raw

PATCH v2 3/6 ARM: DT: apq8064: Add TCSR support

In reply to Andy Gross

This patch adds TCSR support for use by the GSBI to automatically configure ADM CRCI values based on the GSBI port configuration.

---
 arch/arm/boot/dts/qcom-apq8064.dtsi |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/arm/boot/dts/qcom-apq8064.dtsi +17 -0
index b3154c0..720fa2e 100644
@@ -11,6 +11,12 @@
 	compatible = "qcom,apq8064";
 	interrupt-parent = <&intc>;
 
+	aliases {
+		gsbi1 = &gsbi1;
+		gsbi2 = &gsbi2;
+		gsbi7 = &gsbi7;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -173,6 +179,8 @@
 			#size-cells = <1>;
 			ranges;
 
+			syscon-tcsr = <&tcsr>;
+
 			i2c1: i2c at 12460000 {
 				compatible = "qcom,i2c-qup-v1.1.1";
 				reg = <0x12460000 0x1000>;
@@ -194,6 +202,8 @@
 			#size-cells = <1>;
 			ranges;
 
+			syscon-tcsr = <&tcsr>;
+
 			i2c2: i2c at 124a0000 {
 				compatible = "qcom,i2c-qup-v1.1.1";
 				reg = <0x124a0000 0x1000>;
@@ -215,6 +225,8 @@
 			#size-cells = <1>;
 			ranges;
 
+			syscon-tcsr = <&tcsr>;
+
 			serial at 16640000 {
 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 				reg = <0x16640000 0x1000>,
@@ -349,5 +361,10 @@
 				pinctrl-0 = <&sdc4_gpios>;
 			};
 		};
+
+		tcsr: syscon at 1a400000 {
+			compatible = "qcom,tcsr-apq8064", "syscon";
+			reg = <0x1a400000 0x100>;
+		};
 	};
 };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
author
#8 lore raw

PATCH v2 4/6 ARM: DT: ipq8064: Add TCSR support

In reply to Andy Gross

This patch adds TCSR support for use by the GSBI to automatically configure ADM CRCI values based on the GSBI port configuration.

---
 arch/arm/boot/dts/qcom-ipq8064.dtsi |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/arm/boot/dts/qcom-ipq8064.dtsi +17 -0
index 63b2146..8939d31 100644
@@ -9,6 +9,12 @@
 	compatible = "qcom,ipq8064";
 	interrupt-parent = <&intc>;
 
+	aliases {
+		gsbi2 = &gsbi2;
+		gsbi4 = &gsbi4;
+		gsbi5 = &gsbi5;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -128,6 +134,8 @@
 			ranges;
 			status = "disabled";
 
+			syscon-tcsr = <&tcsr>;
+
 			serial at 12490000 {
 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 				reg = <0x12490000 0x1000>,
@@ -163,6 +171,8 @@
 			ranges;
 			status = "disabled";
 
+			syscon-tcsr = <&tcsr>;
+
 			serial at 16340000 {
 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 				reg = <0x16340000 0x1000>,
@@ -197,6 +207,8 @@
 			ranges;
 			status = "disabled";
 
+			syscon-tcsr = <&tcsr>;
+
 			serial at 1a240000 {
 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 				reg = <0x1a240000 0x1000>,
@@ -279,5 +291,10 @@
 			#clock-cells = <1>;
 			#reset-cells = <1>;
 		};
+
+		tcsr: syscon at 1a400000 {
+			compatible = "qcom,tcsr-ipq8064", "syscon";
+			reg = <0x1a400000 0x100>;
+		};
 	};
 };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
author
#9 lore raw

PATCH v2 5/6 ARM: DT: msm8660: Add TCSR support

In reply to Andy Gross

This patch adds TCSR support for use by the GSBI to automatically configure ADM CRCI values based on the GSBI port configuration.

---
 arch/arm/boot/dts/qcom-msm8660.dtsi |   11 +++++++++++
 1 file changed, 11 insertions(+)
arch/arm/boot/dts/qcom-msm8660.dtsi +11 -0
index 0affd61..0a41fd3 100644
@@ -11,6 +11,10 @@
 	compatible = "qcom,msm8660";
 	interrupt-parent = <&intc>;
 
+	aliases {
+		gsbi12 = &gsbi12;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -89,6 +93,8 @@
 			#size-cells = <1>;
 			ranges;
 
+			syscon-tcsr = <&tcsr>;
+
 			serial at 19c40000 {
 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 				reg = <0x19c40000 0x1000>,
@@ -196,6 +202,11 @@
 				vmmc-supply = <&vsdcc_fixed>;
 			};
 		};
+
+		tcsr: syscon at 1a400000 {
+			compatible = "qcom,tcsr-msm8660", "syscon";
+			reg = <0x1a400000 0x100>;
+		};
 	};
 
 };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
author
#10 lore raw

PATCH v2 6/6 ARM: DT: msm8960: Add TCSR support

In reply to Andy Gross

This patch adds TCSR support for use by the GSBI to automatically configure ADM CRCI values based on the GSBI port configuration.

---
 arch/arm/boot/dts/qcom-msm8960.dtsi |   11 +++++++++++
 1 file changed, 11 insertions(+)
arch/arm/boot/dts/qcom-msm8960.dtsi +11 -0
index e1b0d5c..078b4fb 100644
@@ -11,6 +11,10 @@
 	compatible = "qcom,msm8960";
 	interrupt-parent = <&intc>;
 
+	aliases {
+		gsbi5 = &gsbi5;
+	};
+
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
@@ -129,6 +133,8 @@
 			#size-cells = <1>;
 			ranges;
 
+			syscon-tcsr = <&tcsr>;
+
 			serial at 16440000 {
 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
 				reg = <0x16440000 0x1000>,
@@ -238,5 +244,10 @@
 				vmmc-supply = <&vsdcc_fixed>;
 			};
 		};
+
+		tcsr: syscon at 1a400000 {
+			compatible = "qcom,tcsr-msm8960", "syscon";
+			reg = <0x1a400000 0x100>;
+		};
 	};
 };
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation