GSBI CRCI Autoconfiguration Support
Subsystems (4)
v3 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 v2:
- Use cell-index instead of alias to denote GSBI instance
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 | 14 +- arch/arm/boot/dts/qcom-apq8064.dtsi | 14 ++ arch/arm/boot/dts/qcom-ipq8064.dtsi | 14 ++ arch/arm/boot/dts/qcom-msm8660.dtsi | 8 ++ arch/arm/boot/dts/qcom-msm8960.dtsi | 8 ++ drivers/soc/qcom/Kconfig | 1 + drivers/soc/qcom/qcom_gsbi.c | 152 ++++++++++++++++++++ 8 files changed, 232 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
PATCH v3 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 | 14 +- drivers/soc/qcom/Kconfig | 1 + drivers/soc/qcom/qcom_gsbi.c | 152 ++++++++++++++++++++ 3 files changed, 166 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt +13 -1
@@ -6,7 +6,8 @@ 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" +- cell-index: Should contain the GSBI index - reg: Address range for GSBI registers - clocks: required clock - clock-names: must contain "iface" entry
@@ -16,6 +17,8 @@ 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
@@ -39,6 +42,7 @@ Example for APQ8064: gsbi4@16300000 { compatible = "qcom,gsbi-v1.0.0"; + cell-index = <4>; reg = <0x16300000 0x100>; clocks = <&gcc GSBI4_H_CLK>; clock-names = "iface";
@@ -48,6 +52,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@16380000 {
@@ -76,3 +82,9 @@ Example for APQ8064: }; }; + tcsr: syscon@1a400000 { + compatible = "qcom,apq8064-tcsr", "syscon"; + reg = <0x1a400000 0x100>; + }; + +
drivers/soc/qcom/Kconfig +1 -0
@@ -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 +152 -0
186 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
PATCH v3 2/6 mfd: qcom,tcsr: Add device tree binding for TCSR
In reply to Andy GrossThis 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
@@ -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@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
PATCH v3 3/6 ARM: DT: apq8064: Add TCSR support
In reply to Andy GrossThis 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm/boot/dts/qcom-apq8064.dtsi +14 -0
@@ -166,6 +166,7 @@ gsbi1: gsbi@12440000 { status = "disabled"; compatible = "qcom,gsbi-v1.0.0"; + cell-index = <1>; reg = <0x12440000 0x100>; clocks = <&gcc GSBI1_H_CLK>; clock-names = "iface";
@@ -173,6 +174,8 @@ #size-cells = <1>; ranges; + syscon-tcsr = <&tcsr>; + i2c1: i2c@12460000 { compatible = "qcom,i2c-qup-v1.1.1"; reg = <0x12460000 0x1000>;
@@ -187,6 +190,7 @@ gsbi2: gsbi@12480000 { status = "disabled"; compatible = "qcom,gsbi-v1.0.0"; + cell-index = <2>; reg = <0x12480000 0x100>; clocks = <&gcc GSBI2_H_CLK>; clock-names = "iface";
@@ -194,6 +198,8 @@ #size-cells = <1>; ranges; + syscon-tcsr = <&tcsr>; + i2c2: i2c@124a0000 { compatible = "qcom,i2c-qup-v1.1.1"; reg = <0x124a0000 0x1000>;
@@ -208,6 +214,7 @@ gsbi7: gsbi@16600000 { status = "disabled"; compatible = "qcom,gsbi-v1.0.0"; + cell-index = <7>; reg = <0x16600000 0x100>; clocks = <&gcc GSBI7_H_CLK>; clock-names = "iface";
@@ -215,6 +222,8 @@ #size-cells = <1>; ranges; + syscon-tcsr = <&tcsr>; + serial@16640000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16640000 0x1000>,
@@ -349,5 +358,10 @@ pinctrl-0 = <&sdc4_gpios>; }; }; + + tcsr: syscon@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
PATCH v3 4/6 ARM: DT: ipq8064: Add TCSR support
In reply to Andy GrossThis 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 | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm/boot/dts/qcom-ipq8064.dtsi +14 -0
@@ -120,6 +120,7 @@ gsbi2: gsbi@12480000 { compatible = "qcom,gsbi-v1.0.0"; + cell-index = <2>; reg = <0x12480000 0x100>; clocks = <&gcc GSBI2_H_CLK>; clock-names = "iface";
@@ -128,6 +129,8 @@ ranges; status = "disabled"; + syscon-tcsr = <&tcsr>; + serial@12490000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x12490000 0x1000>,
@@ -155,6 +158,7 @@ gsbi4: gsbi@16300000 { compatible = "qcom,gsbi-v1.0.0"; + cell-index = <4>; reg = <0x16300000 0x100>; clocks = <&gcc GSBI4_H_CLK>; clock-names = "iface";
@@ -163,6 +167,8 @@ ranges; status = "disabled"; + syscon-tcsr = <&tcsr>; + serial@16340000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16340000 0x1000>,
@@ -189,6 +195,7 @@ gsbi5: gsbi@1a200000 { compatible = "qcom,gsbi-v1.0.0"; + cell-index = <5>; reg = <0x1a200000 0x100>; clocks = <&gcc GSBI5_H_CLK>; clock-names = "iface";
@@ -197,6 +204,8 @@ ranges; status = "disabled"; + syscon-tcsr = <&tcsr>; + serial@1a240000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x1a240000 0x1000>,
@@ -279,5 +288,10 @@ #clock-cells = <1>; #reset-cells = <1>; }; + + tcsr: syscon@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
PATCH v3 5/6 ARM: DT: msm8660: Add TCSR support
In reply to Andy GrossThis 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 | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/qcom-msm8660.dtsi +8 -0
@@ -82,6 +82,7 @@ gsbi12: gsbi@19c00000 { compatible = "qcom,gsbi-v1.0.0"; + cell-index = <12>; reg = <0x19c00000 0x100>; clocks = <&gcc GSBI12_H_CLK>; clock-names = "iface";
@@ -89,6 +90,8 @@ #size-cells = <1>; ranges; + syscon-tcsr = <&tcsr>; + serial@19c40000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x19c40000 0x1000>,
@@ -196,6 +199,11 @@ vmmc-supply = <&vsdcc_fixed>; }; }; + + tcsr: syscon@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
PATCH v3 6/6 ARM: DT: msm8960: Add TCSR support
In reply to Andy GrossThis 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 | 8 ++++++++ 1 file changed, 8 insertions(+)
arch/arm/boot/dts/qcom-msm8960.dtsi +8 -0
@@ -122,6 +122,7 @@ gsbi5: gsbi@16400000 { compatible = "qcom,gsbi-v1.0.0"; + cell-index = <5>; reg = <0x16400000 0x100>; clocks = <&gcc GSBI5_H_CLK>; clock-names = "iface";
@@ -129,6 +130,8 @@ #size-cells = <1>; ranges; + syscon-tcsr = <&tcsr>; + serial@16440000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16440000 0x1000>,
@@ -238,5 +241,10 @@ vmmc-supply = <&vsdcc_fixed>; }; }; + + tcsr: syscon@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
Quoted 35 lines · Andy Gross
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 v2:
- Use cell-index instead of alias to denote GSBI instanceChanges since v1:
- Fixed various review commentsAndy 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 | 14 +- arch/arm/boot/dts/qcom-apq8064.dtsi | 14 ++ arch/arm/boot/dts/qcom-ipq8064.dtsi | 14 ++ arch/arm/boot/dts/qcom-msm8660.dtsi | 8 ++ arch/arm/boot/dts/qcom-msm8960.dtsi | 8 ++ drivers/soc/qcom/Kconfig | 1 + drivers/soc/qcom/qcom_gsbi.c | 152 ++++++++++++++++++++ 8 files changed, 232 insertions(+), 1 deletion(-)
Quoted 1 line
create mode 100644
Documentation/devicetree/bindings/mfd/qcom,tcsr.txt
Series looks good, do we need a qcom_defconfig update to enable anything new for this?
- 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
Quoted 40 lines · Kumar Gala
Quoted 35 lines · Andy Gross
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 v2:
- Use cell-index instead of alias to denote GSBI instanceChanges since v1:
- Fixed various review commentsAndy 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 | 14 +- arch/arm/boot/dts/qcom-apq8064.dtsi | 14 ++ arch/arm/boot/dts/qcom-ipq8064.dtsi | 14 ++ arch/arm/boot/dts/qcom-msm8660.dtsi | 8 ++ arch/arm/boot/dts/qcom-msm8960.dtsi | 8 ++ drivers/soc/qcom/Kconfig | 1 + drivers/soc/qcom/qcom_gsbi.c | 152 ++++++++++++++++++++ 8 files changed, 232 insertions(+), 1 deletion(-)Quoted 1 line
create mode 100644
Documentation/devicetree/bindings/mfd/qcom,tcsr.txt
Quoted 3 lines
Series looks good, do we need a
qcom_defconfigupdate to enable anything new for this?- k
I'll send a followup to enable qcom_defconfig.
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
<snip>
Quoted 7 lines
Quoted 4 lines
Series looks good, do we need a
qcom_defconfigupdate to enable anything new for this?- k
I'll send a followup to enable
qcom_defconfig.
Correction:
Since I use a 'selects MFD_SYSCON' in the Kconfig we shouldn't need anything.
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