Convert Qcom BAM dma binding to json format
v3 cover Convert Qcom BAM dma binding to json format
Patch 1,2,3,4,5 require generic node name for dma and 6/6 is actual conversion change.
Looking forward towards review comments. Thanks!
---
v3:
- Add Krzysztof's R-b tags for dts changes
- Add qcom,ee as required property(Krzysztof)
- Use type as boolean
- Add min/max to qcom,ee
- Clocks are required ones, skip them as it's users are not fixed.
---
v2:
- Add more variants of ip4019-ap/dk-{01/04/07} for dma node rename
- Add #dma-cells in binding file
- use additionalproperties as false
---
Kuldeep Singh (6):
ARM: dts: qcom: apq8064: User generic node name for DMA
ARM: dts: qcom: mdm9615: User generic node name for DMA
arm64: dts: qcom: msm8996: User generic node name for DMA
ARM: dts: qcom: ipq4019: User generic node name for DMA
ARM: dts: qcom: ipq8064: User generic node name for DMA
dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
.../devicetree/bindings/dma/qcom,bam-dma.yaml | 97 +++++++++++++++++++ .../devicetree/bindings/dma/qcom_bam_dma.txt | 52 ---------- arch/arm/boot/dts/qcom-apq8064.dtsi | 6 +- arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 4 +- .../boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts | 2 +- arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi | 2 +- arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi | 4 +- arch/arm/boot/dts/qcom-ipq4019.dtsi | 6 +- arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 +- arch/arm/boot/dts/qcom-mdm9615.dtsi | 4 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- 11 files changed, 114 insertions(+), 69 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml delete mode 100644 Documentation/devicetree/bindings/dma/qcom_bam_dma.txt
Signature · 1 line
2.25.1
PATCH v3 1/6 ARM: dts: qcom: apq8064: User generic node name for DMA
Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.
---
v3: Add Krzysztof R-b tag
---
v2: No change
--- arch/arm/boot/dts/qcom-apq8064.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/qcom-apq8064.dtsi +3 -3
@@ -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>;
Signature · 1 line
2.25.1
PATCH v3 2/6 ARM: dts: qcom: mdm9615: User generic node name for DMA
In reply to Kuldeep SinghQcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.
---
v3: Add Krzysztof R-b tag
---
v2: No change
--- arch/arm/boot/dts/qcom-mdm9615.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/qcom-mdm9615.dtsi +2 -2
@@ -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>;
Signature · 1 line
2.25.1
PATCH v3 3/6 arm64: dts: qcom: msm8996: User generic node name for DMA
In reply to Kuldeep SinghQcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.
---
v3: Add Krzysztof R-b tag
---
v2: No change
--- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8996.dtsi +1 -1
@@ -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>;
Signature · 1 line
2.25.1
Re: [PATCH v3 3/6] arm64: dts: qcom: msm8996: User generic node name for DMA
Hi Kuldeep,
Quoted 3 lines · Kuldeep Singh
Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.
This is already fixed with in-flight patch
<https://lore.kernel.org/lkml/[email protected]/T/#mb84230b9b8e06544859ccf5e16a7651fac79c933>
Thanks,
Bhupesh
Quoted 26 lines
Signed-off-by Kuldeep Singh <[email protected]>Reviewed-by Krzysztof Kozlowski <[email protected]>---
v3: Add Krzysztof R-b tag
---
v2: No change--- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm64/boot/dts/qcom/msm8996.dtsi +1
-2@@ -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
Re: [PATCH v3 3/6] arm64: dts: qcom: msm8996: User generic node name for DMA
Quoted 2 lines · Bhupesh Sharma
This is already fixed with in-flight patch
<https://lore.kernel.org/lkml/[email protected]/T/#mb84230b9b8e06544859ccf5e16a7651fac79c933>
Your change is currently not accepted/merged and don't think it's in maintainer's queue as well. So, probably it's not in-flight patch as of now.
A message that is not in the archive (sent off-list or not yet received): CAH=2NtxNcs31dQDuGwqs_U9fwhpUdJ1OVLOs5Epe7YwMHDd0aQ@mail.gmail.com
Re: [PATCH v3 3/6] arm64: dts: qcom: msm8996: User generic node name for DMA
Quoted 2 lines · Bhupesh Sharma
My patch already has an ACK from the DMA maintainer, whereas your's is still in review.
Sincere apologies, I saw your original patch only and missed Ack. Please note, mine change is reviewed by FDT maintainer.
Quoted 1 line
So please drop this patch from the next version.
If we are going to have mine binding version, then skipping dts change here will trigger Rob's bot warning.
PATCH v3 4/6 ARM: dts: qcom: ipq4019: User generic node name for DMA
In reply to Kuldeep SinghQcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.
---
v3: Add Krzysztof R-b tag
---
v2:
- Add more variants of ip4019-ap/dk-{01/04/07} for dma node rename
--- arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 4 ++-- arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts | 2 +- arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi | 2 +- arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi | 4 ++-- arch/arm/boot/dts/qcom-ipq4019.dtsi | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi +2 -2
@@ -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"; };
arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts +1 -1
@@ -8,7 +8,7 @@ / { compatible = "qcom,ipq4019-dk04.1-c1", "qcom,ipq4019"; soc { - dma@7984000 { + dma-controller@7984000 { status = "okay"; };
arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi +1 -1
@@ -79,7 +79,7 @@ serial@78b0000 { status = "okay"; }; - dma@7884000 { + dma-controller@7884000 { status = "okay"; };
arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi +2 -2
@@ -52,7 +52,7 @@ serial@78af000 { status = "okay"; }; - dma@7884000 { + dma-controller@7884000 { status = "okay"; };
@@ -62,7 +62,7 @@ i2c@78b7000 { /* BLSP1 QUP2 */ status = "okay"; }; - dma@7984000 { + dma-controller@7984000 { status = "okay"; };
arch/arm/boot/dts/qcom-ipq4019.dtsi +3 -3
@@ -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>;
Signature · 1 line
2.25.1
PATCH v3 5/6 ARM: dts: qcom: ipq8064: User generic node name for DMA
In reply to Kuldeep SinghQcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.
---
v3: Add Krzysztof R-b tag
---
v2: No change
--- arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/qcom-ipq8064.dtsi +2 -2
@@ -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>;
Signature · 1 line
2.25.1
PATCH v3 6/6 dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
In reply to Kuldeep SinghConvert Qualcomm BAM DMA controller binding to DT schema format using json schema.
---
v3:
- Address Krzysztof Comments
- qcom,ee as required property
- Use boolean type instead of flag
- Add min/max to qcom,ee
- skip clocks, as it's users are not fixed
---
v2:
- Use dma-cells
- Set additionalProperties to false
--- .../devicetree/bindings/dma/qcom,bam-dma.yaml | 97 +++++++++++++++++++ .../devicetree/bindings/dma/qcom_bam_dma.txt | 52 ---------- 2 files changed, 97 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
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +97 -0
@@ -0,0 +1,97 @@ +# 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 <[email protected]> + - Bjorn Andersson <[email protected]> + +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 + + "#dma-cells": + const: 1 + + 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: + type: boolean + description: + Indicates that the bam is controlled by remote proccessor i.e. execution + environment. + + qcom,ee: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 7 + 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: + type: boolean + 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 + - "#dma-cells" + - interrupts + - qcom,ee + - reg + +additionalProperties: 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>; + }; +...
Documentation/devicetree/bindings/dma/qcom_bam_dma.txt deleted +0 -52
52 lines not on this page · raw message
Signature · 1 line
2.25.1
Rob Herring
maintainerRe: [PATCH v3 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 39 lines · Kuldeep Singh
Convert Qualcomm BAM DMA controller binding to DT schema format using json schema.
Signed-off-by Kuldeep Singh <[email protected]>---
v3:
- Address Krzysztof Comments
- qcom,ee as required property
- Use boolean type instead of flag
- Add min/max to qcom,ee
- skip clocks, as it's users are not fixed
---
v2:
- Use dma-cells
- Set additionalProperties to false--- .../devicetree/bindings/dma/qcom,bam-dma.yaml | 97 +++++++++++++++++++ .../devicetree/bindings/dma/qcom_bam_dma.txt | 52 ---------- 2 files changed, 97 insertions(+), 52 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml delete mode 100644 Documentation/devicetree/bindings/dma/qcom_bam_dma.txtDocumentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +11
-0@@ -0,0 +1,97 @@ +# 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 <[email protected]> + - Bjorn Andersson <[email protected]>
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml line 21
Quoted 10 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +10
-0+ +allOf: + - $ref: "dma-controller.yaml#" + +properties: + compatible: + enum: + - qcom,bam-v1.3.0 + - qcom,bam-v1.4.0 + - qcom,bam-v1.7.0
We've lost the mapping to SoCs. Please add as comments.
Quoted 138 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +76
-0+ + clocks: + maxItems: 1 + + clock-names: + items: + - const: bam_clk + + "#dma-cells": + const: 1 + + 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: + type: boolean + description: + Indicates that the bam is controlled by remote proccessor i.e. execution + environment. + + qcom,ee: + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 7 + 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: + type: boolean + 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 + - "#dma-cells" + - interrupts + - qcom,ee + - reg + +additionalProperties: 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>; + }; +...Documentation/devicetree/bindings/dma/qcom_bam_dma.txt deleted +0
-52@@ -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"; - };Signature · 1 line
2.25.1
Rob Herring
maintainerRe: [PATCH v3 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
In reply to Kuldeep SinghQuoted 15 lines · Kuldeep Singh
Convert Qualcomm BAM DMA controller binding to DT schema format using json schema.
Signed-off-by Kuldeep Singh <[email protected]>---
v3:
- Address Krzysztof Comments
- qcom,ee as required property
- Use boolean type instead of flag
- Add min/max to qcom,ee
- skip clocks, as it's users are not fixed
---
v2:
- Use dma-cells
- Set additionalProperties to false
Quoted 7 lines
--- .../devicetree/bindings/dma/qcom,bam-dma.yaml | 97 +++++++++++++++++++ .../devicetree/bindings/dma/qcom_bam_dma.txt | 52 ---------- 2 files changed, 97 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
This is the 11th most warned on (168 warnings) for missing a schema, so I've implemented my only comment and applied. It seems neither this one or the other attempt at converting are getting respun.
Rob
Re: [PATCH v3 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 3 lines
This is the 11th most warned on (168 warnings) for missing a schema, so I've implemented my only comment and applied. It seems neither this one or the other attempt at converting are getting respun.
I didn't respin because Bhupesh mentioned he will send his v5 and then I couldn't followup.
I realized I should have anyway respin my patch.
Thanks for incorporating the changes.
Regards
Kuldeep