* [PATCH 1/6] ARM: dts: qcom: apq8064: User generic node name for DMA
2022-04-09 18:41 [PATCH 0/6] Covert Qcom BAM dma binding to json format Kuldeep Singh
@ 2022-04-09 18:41 ` Kuldeep Singh
2022-04-09 18:41 ` [PATCH 2/6] ARM: dts: qcom: mdm9615: " Kuldeep Singh
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Kuldeep Singh @ 2022-04-09 18:41 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Andy Gross, Bjorn Andersson
Cc: linux-kernel, devicetree, Kuldeep Singh, linux-arm-msm
Qcom BAM DT spec expects generic DMA controller node name as
"dma-controller" to enable validations.
Signed-off-by: Kuldeep Singh <singh.kuldeep87k@gmail.com>
---
arch/arm/boot/dts/qcom-apq8064.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi
index a1c8ae516d21..b2975be3ae04 100644
--- a/arch/arm/boot/dts/qcom-apq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1040,7 +1040,7 @@ sata0: sata@29000000 {
};
/* Temporary fixed regulator */
- sdcc1bam:dma@12402000{
+ sdcc1bam: dma-controller@12402000{
compatible = "qcom,bam-v1.3.0";
reg = <0x12402000 0x8000>;
interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -1050,7 +1050,7 @@ sdcc1bam:dma@12402000{
qcom,ee = <0>;
};
- sdcc3bam:dma@12182000{
+ sdcc3bam: dma-controller@12182000{
compatible = "qcom,bam-v1.3.0";
reg = <0x12182000 0x8000>;
interrupts = <0 96 IRQ_TYPE_LEVEL_HIGH>;
@@ -1060,7 +1060,7 @@ sdcc3bam:dma@12182000{
qcom,ee = <0>;
};
- sdcc4bam:dma@121c2000{
+ sdcc4bam: dma-controller@121c2000{
compatible = "qcom,bam-v1.3.0";
reg = <0x121c2000 0x8000>;
interrupts = <0 95 IRQ_TYPE_LEVEL_HIGH>;
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 2/6] ARM: dts: qcom: mdm9615: User generic node name for DMA
2022-04-09 18:41 [PATCH 0/6] Covert Qcom BAM dma binding to json format Kuldeep Singh
2022-04-09 18:41 ` [PATCH 1/6] ARM: dts: qcom: apq8064: User generic node name for DMA Kuldeep Singh
@ 2022-04-09 18:41 ` Kuldeep Singh
2022-04-09 18:41 ` [PATCH 3/6] arm64: dts: qcom: msm8996: " Kuldeep Singh
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Kuldeep Singh @ 2022-04-09 18:41 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Andy Gross, Bjorn Andersson
Cc: linux-kernel, devicetree, Kuldeep Singh, linux-arm-msm
Qcom BAM DT spec expects generic DMA controller node name as
"dma-controller" to enable validations.
Signed-off-by: Kuldeep Singh <singh.kuldeep87k@gmail.com>
---
arch/arm/boot/dts/qcom-mdm9615.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom-mdm9615.dtsi
index 4d4f37cebf21..8f0752ce1c7b 100644
--- a/arch/arm/boot/dts/qcom-mdm9615.dtsi
+++ b/arch/arm/boot/dts/qcom-mdm9615.dtsi
@@ -330,7 +330,7 @@ pmicgpio: gpio@150 {
};
};
- sdcc1bam: dma@12182000{
+ sdcc1bam: dma-controller@12182000{
compatible = "qcom,bam-v1.3.0";
reg = <0x12182000 0x8000>;
interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -340,7 +340,7 @@ sdcc1bam: dma@12182000{
qcom,ee = <0>;
};
- sdcc2bam: dma@12142000{
+ sdcc2bam: dma-controller@12142000{
compatible = "qcom,bam-v1.3.0";
reg = <0x12142000 0x8000>;
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 3/6] arm64: dts: qcom: msm8996: User generic node name for DMA
2022-04-09 18:41 [PATCH 0/6] Covert Qcom BAM dma binding to json format Kuldeep Singh
2022-04-09 18:41 ` [PATCH 1/6] ARM: dts: qcom: apq8064: User generic node name for DMA Kuldeep Singh
2022-04-09 18:41 ` [PATCH 2/6] ARM: dts: qcom: mdm9615: " Kuldeep Singh
@ 2022-04-09 18:41 ` Kuldeep Singh
2022-04-09 18:41 ` [PATCH 4/6] ARM: dts: qcom: ipq4019: " Kuldeep Singh
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Kuldeep Singh @ 2022-04-09 18:41 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Andy Gross, Bjorn Andersson
Cc: linux-kernel, devicetree, Kuldeep Singh, linux-arm-msm
Qcom BAM DT spec expects generic DMA controller node name as
"dma-controller" to enable validations.
Signed-off-by: Kuldeep Singh <singh.kuldeep87k@gmail.com>
---
arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index f0f81c23c16f..bbe677b9e5bf 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -707,7 +707,7 @@ tsens1: thermal-sensor@4ad000 {
#thermal-sensor-cells = <1>;
};
- cryptobam: dma@644000 {
+ cryptobam: dma-controller@644000 {
compatible = "qcom,bam-v1.7.0";
reg = <0x00644000 0x24000>;
interrupts = <GIC_SPI 206 IRQ_TYPE_LEVEL_HIGH>;
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 4/6] ARM: dts: qcom: ipq4019: User generic node name for DMA
2022-04-09 18:41 [PATCH 0/6] Covert Qcom BAM dma binding to json format Kuldeep Singh
` (2 preceding siblings ...)
2022-04-09 18:41 ` [PATCH 3/6] arm64: dts: qcom: msm8996: " Kuldeep Singh
@ 2022-04-09 18:41 ` Kuldeep Singh
2022-04-09 18:41 ` [PATCH 5/6] ARM: dts: qcom: ipq8064: " Kuldeep Singh
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Kuldeep Singh @ 2022-04-09 18:41 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Andy Gross, Bjorn Andersson
Cc: linux-kernel, devicetree, Kuldeep Singh, linux-arm-msm
Qcom BAM DT spec expects generic DMA controller node name as
"dma-controller" to enable validations.
Signed-off-by: Kuldeep Singh <singh.kuldeep87k@gmail.com>
---
arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 4 ++--
arch/arm/boot/dts/qcom-ipq4019.dtsi | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
index 0c10d9e096db..03bb9e1768c4 100644
--- a/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi
@@ -64,7 +64,7 @@ pinconf_cs {
};
};
- blsp_dma: dma@7884000 {
+ blsp_dma: dma-controller@7884000 {
status = "okay";
};
@@ -89,7 +89,7 @@ serial@78af000 {
status = "okay";
};
- cryptobam: dma@8e04000 {
+ cryptobam: dma-controller@8e04000 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi
index a9d0566a3190..258510eb30fc 100644
--- a/arch/arm/boot/dts/qcom-ipq4019.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi
@@ -233,7 +233,7 @@ sdhci: sdhci@7824900 {
status = "disabled";
};
- blsp_dma: dma@7884000 {
+ blsp_dma: dma-controller@7884000 {
compatible = "qcom,bam-v1.7.0";
reg = <0x07884000 0x23000>;
interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>;
@@ -300,7 +300,7 @@ blsp1_i2c4: i2c@78b8000 { /* BLSP1 QUP4 */
status = "disabled";
};
- cryptobam: dma@8e04000 {
+ cryptobam: dma-controller@8e04000 {
compatible = "qcom,bam-v1.7.0";
reg = <0x08e04000 0x20000>;
interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
@@ -471,7 +471,7 @@ pcie0: pci@40000000 {
status = "disabled";
};
- qpic_bam: dma@7984000 {
+ qpic_bam: dma-controller@7984000 {
compatible = "qcom,bam-v1.7.0";
reg = <0x7984000 0x1a000>;
interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 5/6] ARM: dts: qcom: ipq8064: User generic node name for DMA
2022-04-09 18:41 [PATCH 0/6] Covert Qcom BAM dma binding to json format Kuldeep Singh
` (3 preceding siblings ...)
2022-04-09 18:41 ` [PATCH 4/6] ARM: dts: qcom: ipq4019: " Kuldeep Singh
@ 2022-04-09 18:41 ` Kuldeep Singh
2022-04-09 18:41 ` [PATCH 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format Kuldeep Singh
2022-04-10 11:04 ` [PATCH 0/6] Covert Qcom BAM dma " Kuldeep Singh
6 siblings, 0 replies; 8+ messages in thread
From: Kuldeep Singh @ 2022-04-09 18:41 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Andy Gross, Bjorn Andersson
Cc: linux-kernel, devicetree, Kuldeep Singh, linux-arm-msm
Qcom BAM DT spec expects generic DMA controller node name as
"dma-controller" to enable validations.
Signed-off-by: Kuldeep Singh <singh.kuldeep87k@gmail.com>
---
arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi
index 996f4458d9fc..8366310ca5e3 100644
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
@@ -1155,7 +1155,7 @@ vsdcc_fixed: vsdcc-regulator {
regulator-always-on;
};
- sdcc1bam: dma@12402000 {
+ sdcc1bam: dma-controller@12402000 {
compatible = "qcom,bam-v1.3.0";
reg = <0x12402000 0x8000>;
interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -1165,7 +1165,7 @@ sdcc1bam: dma@12402000 {
qcom,ee = <0>;
};
- sdcc3bam: dma@12182000 {
+ sdcc3bam: dma-controller@12182000 {
compatible = "qcom,bam-v1.3.0";
reg = <0x12182000 0x8000>;
interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
2022-04-09 18:41 [PATCH 0/6] Covert Qcom BAM dma binding to json format Kuldeep Singh
` (4 preceding siblings ...)
2022-04-09 18:41 ` [PATCH 5/6] ARM: dts: qcom: ipq8064: " Kuldeep Singh
@ 2022-04-09 18:41 ` Kuldeep Singh
2022-04-10 11:04 ` [PATCH 0/6] Covert Qcom BAM dma " Kuldeep Singh
6 siblings, 0 replies; 8+ messages in thread
From: Kuldeep Singh @ 2022-04-09 18:41 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski, Andy Gross, Bjorn Andersson,
Vinod Koul
Cc: linux-kernel, devicetree, Kuldeep Singh, linux-arm-msm, dmaengine
Convert Qualcomm BAM DMA controller binding to DT schema format using
json schema.
Signed-off-by: Kuldeep Singh <singh.kuldeep87k@gmail.com>
---
.../devicetree/bindings/dma/qcom,bam-dma.yaml | 90 +++++++++++++++++++
.../devicetree/bindings/dma/qcom_bam_dma.txt | 52 -----------
2 files changed, 90 insertions(+), 52 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml
delete mode 100644 Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
diff --git a/Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml b/Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml
new file mode 100644
index 000000000000..606c19f83db3
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml
@@ -0,0 +1,90 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/dma/qcom,bam-dma.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Qualcomm Technologies Inc BAM DMA controller
+
+maintainers:
+ - Andy Gross <agross@kernel.org>
+ - Bjorn Andersson <bjorn.andersson@linaro.org>
+
+allOf:
+ - $ref: dma-controller.yaml#
+
+properties:
+ compatible:
+ enum:
+ - qcom,bam-v1.3.0
+ - qcom,bam-v1.4.0
+ - qcom,bam-v1.7.0
+
+ clocks:
+ maxItems: 1
+
+ clock-names:
+ items:
+ - const: bam_clk
+
+ interrupts:
+ maxItems: 1
+
+ iommus:
+ minItems: 1
+ maxItems: 4
+
+ num-channels:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ Indicates supported number of DMA channels in a remotely controlled bam.
+
+ qcom,controlled-remotely:
+ $ref: /schemas/types.yaml#/definitions/flag
+ description:
+ Indicates that the bam is controlled by remote proccessor i.e. execution
+ environment.
+
+ qcom,ee:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ Indicates the active Execution Environment identifier (0-7) used in the
+ secure world.
+
+ qcom,num-ees:
+ $ref: /schemas/types.yaml#/definitions/uint32
+ description:
+ Indicates supported number of Execution Environments in a remotely
+ controlled bam.
+
+ qcom,powered-remotely:
+ $ref: /schemas/types.yaml#/definitions/flag
+ description:
+ Indicates that the bam is powered up by a remote processor but must be
+ initialized by the local processor.
+
+ reg:
+ maxItems: 1
+
+required:
+ - compatible
+ - interrupts
+ - reg
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
+ #include <dt-bindings/clock/qcom,gcc-msm8974.h>
+
+ dma-controller@f9944000 {
+ compatible = "qcom,bam-v1.4.0";
+ reg = <0xf9944000 0x15000>;
+ interrupts = <GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&gcc GCC_BLSP2_AHB_CLK>;
+ clock-names = "bam_clk";
+ #dma-cells = <1>;
+ qcom,ee = <0>;
+ };
+...
diff --git a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
deleted file mode 100644
index 6e9a5497b3f2..000000000000
--- a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-QCOM BAM DMA controller
-
-Required properties:
-- compatible: must be one of the following:
- * "qcom,bam-v1.4.0" for MSM8974, APQ8074 and APQ8084
- * "qcom,bam-v1.3.0" for APQ8064, IPQ8064 and MSM8960
- * "qcom,bam-v1.7.0" for MSM8916
-- reg: Address range for DMA registers
-- interrupts: Should contain the one interrupt shared by all channels
-- #dma-cells: must be <1>, the cell in the dmas property of the client device
- represents the channel number
-- clocks: required clock
-- clock-names: must contain "bam_clk" entry
-- qcom,ee : indicates the active Execution Environment identifier (0-7) used in
- the secure world.
-- qcom,controlled-remotely : optional, indicates that the bam is controlled by
- remote proccessor i.e. execution environment.
-- qcom,powered-remotely : optional, indicates that the bam is powered up by
- a remote processor but must be initialized by the local processor.
-- num-channels : optional, indicates supported number of DMA channels in a
- remotely controlled bam.
-- qcom,num-ees : optional, indicates supported number of Execution Environments
- in a remotely controlled bam.
-
-Example:
-
- uart-bam: dma@f9984000 = {
- compatible = "qcom,bam-v1.4.0";
- reg = <0xf9984000 0x15000>;
- interrupts = <0 94 0>;
- clocks = <&gcc GCC_BAM_DMA_AHB_CLK>;
- clock-names = "bam_clk";
- #dma-cells = <1>;
- qcom,ee = <0>;
- };
-
-DMA clients must use the format described in the dma.txt file, using a two cell
-specifier for each channel.
-
-Example:
- serial@f991e000 {
- compatible = "qcom,msm-uart";
- reg = <0xf991e000 0x1000>
- <0xf9944000 0x19000>;
- interrupts = <0 108 0>;
- clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>,
- <&gcc GCC_BLSP1_AHB_CLK>;
- clock-names = "core", "iface";
-
- dmas = <&uart-bam 0>, <&uart-bam 1>;
- dma-names = "rx", "tx";
- };
--
2.25.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 0/6] Covert Qcom BAM dma binding to json format
2022-04-09 18:41 [PATCH 0/6] Covert Qcom BAM dma binding to json format Kuldeep Singh
` (5 preceding siblings ...)
2022-04-09 18:41 ` [PATCH 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format Kuldeep Singh
@ 2022-04-10 11:04 ` Kuldeep Singh
6 siblings, 0 replies; 8+ messages in thread
From: Kuldeep Singh @ 2022-04-10 11:04 UTC (permalink / raw)
To: Rob Herring, Krzysztof Kozlowski; +Cc: linux-kernel, devicetree
On Sun, Apr 10, 2022 at 12:11:09AM +0530, Kuldeep Singh wrote:
> Patch 1,2,3,4,5 require generic node name for dma and 6/6 is actual
> conversion change.
Need to add more dma-controller name for ip4019 and update in binding.
I will send v2 with updates.
^ permalink raw reply [flat|nested] 8+ messages in thread