Convert Qcom BAM dma binding to json format
v2 cover Convert Qcom BAM dma binding to json format
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
---
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!
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 | 94 +++++++++++++++++++ .../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, 111 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 v2 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.
--- 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
Re: [PATCH v2 1/6] ARM: dts: qcom: apq8064: User generic node name for DMA
Quoted 8 lines · Kuldeep Singh
Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.
Signed-off-by Kuldeep Singh <[email protected]>--- arch/arm/boot/dts/qcom-apq8064.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
All arm changes could be one commit, it's a lot of churn for just name renaming, but anyway:
Best regards,
Krzysztof
Re: [PATCH v2 1/6] ARM: dts: qcom: apq8064: User generic node name for DMA
Quoted 4 lines · Krzysztof Kozlowski
Quoted 3 lines · Kuldeep Singh
Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.
Quoted 8 lines
Quoted 5 lines
Signed-off-by Kuldeep Singh <[email protected]>--- arch/arm/boot/dts/qcom-apq8064.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)All arm changes could be one commit, it's a lot of churn for just name renaming, but anyway:
Ok. Since changes were in different file that's why i kept them separate.
Quoted 2 lines
Reviewed-by Krzysztof Kozlowski <[email protected]>
Thanks!
PATCH v2 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.
--- 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
Re: [PATCH v2 2/6] ARM: dts: qcom: mdm9615: User generic node name for DMA
Quoted 8 lines · Kuldeep Singh
Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.
Signed-off-by Kuldeep Singh <[email protected]>--- arch/arm/boot/dts/qcom-mdm9615.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Best regards,
Krzysztof
PATCH v2 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.
--- 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 v2 3/6] arm64: dts: qcom: msm8996: User generic node name for DMA
Quoted 8 lines · Kuldeep Singh
Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.
Signed-off-by Kuldeep Singh <[email protected]>--- arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Best regards,
Krzysztof
PATCH v2 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.
--- 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
Re: [PATCH v2 4/6] ARM: dts: qcom: ipq4019: User generic node name for DMA
Quoted 12 lines · Kuldeep Singh
Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.
Signed-off-by Kuldeep Singh <[email protected]>--- 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(-)
Best regards,
Krzysztof
PATCH v2 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.
--- 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
Re: [PATCH v2 5/6] ARM: dts: qcom: ipq8064: User generic node name for DMA
Quoted 8 lines · Kuldeep Singh
Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.
Signed-off-by Kuldeep Singh <[email protected]>--- arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Best regards,
Krzysztof
PATCH v2 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.
--- .../devicetree/bindings/dma/qcom,bam-dma.yaml | 94 +++++++++++++++++++ .../devicetree/bindings/dma/qcom_bam_dma.txt | 52 ---------- 2 files changed, 94 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 +94 -0
@@ -0,0 +1,94 @@ +# 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: + $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 + - "#dma-cells" + - interrupts + - 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
Re: [PATCH v2 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 2 lines · Kuldeep Singh
Convert Qualcomm BAM DMA controller binding to DT schema format using json schema.
Thank you for your patch. There is something to discuss/improve.
(...)
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml line 38
Quoted 7 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +7
-0+ + interrupts: + maxItems: 1 + + iommus: + minItems: 1 + maxItems: 4
This is something new and it seems only one SoC defines it (not even one BAM version). I wonder whether this is actually correct or this particular version of BAM is slightly different. Maybe someone could clarify it, but if no - looks ok.
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml line 46
Quoted 8 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +8
-0+ + 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
type: boolean
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml line 55
Quoted 9 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +9
-0+ 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.
maximum: 7
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml line 64
Quoted 9 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +9
-0+ + 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
type: boolean
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml line 76
Quoted 12 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +12
-0+ 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 + - reg
clocks, clock-names, qcom-ee - these are required according to old bindings.
Best regards,
Krzysztof
Re: [PATCH v2 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 4 lines
This is something new and it seems only one SoC defines it (not even one BAM version). I wonder whether this is actually correct or this particular version of BAM is slightly different. Maybe someone could clarify it, but if no - looks ok.
Yes, sdm845.dtsi uses 4 entries and rest 1.
Quoted 11 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml line 46
Quoted 9 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +8
-0+ + 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/flagtype: boolean
Boolean comes under flag in types.yaml
definitions:
flag:
oneOf:
- type: boolean
const: true
- type: 'null'
I have seen other boolean properties(spi-cpol, spi-cpha and bunch of others) using type flag. I think we should keep flag here.
Quoted 11 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml line 55
Quoted 10 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +9
-0+ 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.
Quoted 1 line
maximum: 7
ok.
Quoted 7 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml line 76
Quoted 5 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +5
-0+required: + - compatible + - "#dma-cells" + - interrupts + - regclocks, clock-names, qcom-ee - these are required according to old bindings.
I missed qcom,ee. Will add in v3.
For clocks and clock-names , there are two platforms(msm8996.dtsi, sdm845.dtsi) where these properties are missing. And I don't want to add some random values. Shall I skip them here? and let board owners add them later.
Re: [PATCH v2 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 6 lines · Kuldeep Singh
Quoted 4 lines
This is something new and it seems only one SoC defines it (not even one BAM version). I wonder whether this is actually correct or this particular version of BAM is slightly different. Maybe someone could clarify it, but if no - looks ok.
Yes,
sdm845.dtsiuses 4 entries and rest 1.
Yes, I know. This does not solve my wonder.
Quoted 22 lines
Quoted 12 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml line 46
Quoted 10 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +8
-0+ + 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/flagtype: boolean
Boolean comes under flag in
types.yamldefinitions:
flag:
oneOf:
- type: boolean
const: true
- type: 'null'
Quoted 2 lines
I have seen other boolean
properties(spi-cpol, spi-cpha and bunch of others)using type flag. I think we should keep flag here.
type:boolean is just shorter and example-schema recommends it. If you want to base on something (as a template, pattern) then the example-schema is the source, the preferred one.
Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +5
-0+required: + - compatible + - "#dma-cells" + - interrupts + - reg
Quoted 8 lines
Quoted 1 line
clocks, clock-names, qcom-ee - these are required according to old bindings.
I missed qcom,ee. Will add in v3.
For clocks and clock-names , there are two
platforms(msm8996.dtsi, sdm845.dtsi)where these properties are missing. And I don't want to add some random values. Shall I skip them here? and let board owners add them later.
These are required, so the SoC DTSI should be fixed. Not with random clocks but something proper. :)
Best regards,
Krzysztof
Re: [PATCH v2 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 32 lines · Krzysztof Kozlowski
Quoted 6 lines · Kuldeep Singh
Quoted 4 lines
This is something new and it seems only one SoC defines it (not even one BAM version). I wonder whether this is actually correct or this particular version of BAM is slightly different. Maybe someone could clarify it, but if no - looks ok.
Yes,
sdm845.dtsiuses 4 entries and rest 1.Yes, I know. This does not solve my wonder.
Quoted 22 lines
Quoted 12 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml line 46
Quoted 10 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +8
-0+ + 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/flagtype: boolean
Boolean comes under flag in
types.yamldefinitions:
flag:
oneOf:
- type: boolean
const: true
- type: 'null'
Quoted 6 lines
Quoted 2 lines
I have seen other boolean
properties(spi-cpol, spi-cpha and bunch of others)using type flag. I think we should keep flag here.type:boolean is just shorter and example-schema recommends it. If you want to base on something (as a template, pattern) then the example-schema is the source, the preferred one.
I had seen other spec using flag and that's why kept same here. Which example schema are you talking about?
Quoted 5 lines
Quoted 5 lines
Quoted 2 lines
clocks, clock-names, qcom-ee - these are required according to old bindings.
I missed qcom,ee. Will add in v3.
Quoted 7 lines
Quoted 4 lines
For clocks and clock-names , there are two
platforms(msm8996.dtsi, sdm845.dtsi)where these properties are missing. And I don't want to add some random values. Shall I skip them here? and let board owners add them later.These are required, so the SoC DTSI should be fixed. Not with random clocks but something proper. :)
Yes absolutely :-)
I have kept Srinivas in copy, who sent initial support for both the dtsi. Probably he can confirm provided his email doesn't bounce.
Anyway Krzysztof, can you confirm the same as you have been actively contributing to Qcom peripherals. I will add credit in follow-up submission.
Re: [PATCH v2 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 33 lines · Kuldeep Singh
Quoted 32 lines · Krzysztof Kozlowski
Quoted 6 lines · Kuldeep Singh
Quoted 4 lines
This is something new and it seems only one SoC defines it (not even one BAM version). I wonder whether this is actually correct or this particular version of BAM is slightly different. Maybe someone could clarify it, but if no - looks ok.
Yes,
sdm845.dtsiuses 4 entries and rest 1.Yes, I know. This does not solve my wonder.
Quoted 22 lines
Quoted 12 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml line 46
Quoted 10 lines
Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml new file +8
-0+ + 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/flagtype: boolean
Boolean comes under flag in
types.yamldefinitions:
flag:
oneOf:
- type: boolean
const: true
- type: 'null'
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
I have seen other boolean
properties(spi-cpol, spi-cpha and bunch of others)using type flag. I think we should keep flag here.type:boolean is just shorter and example-schema recommends it. If you want to base on something (as a template, pattern) then the example-schema is the source, the preferred one.
I had seen other spec using flag and that's why kept same here.
I understand, you mentioned it before. However other spec is not the example-schema...
Quoted 1 line
Which example schema are you talking about?
There is only one example-schema.
$ find ./linux -name 'example-schema*'
Quoted 12 lines
Quoted 11 lines
Quoted 8 lines
Quoted 1 line
clocks, clock-names, qcom-ee - these are required according to old bindings.
I missed qcom,ee. Will add in v3.
For clocks and clock-names , there are two
platforms(msm8996.dtsi, sdm845.dtsi)where these properties are missing. And I don't want to add some random values. Shall I skip them here? and let board owners add them later.These are required, so the SoC DTSI should be fixed. Not with random clocks but something proper. :)
Quoted 7 lines
Yes absolutely :-)
I have kept Srinivas in copy, who sent initial support for both the dtsi. Probably he can confirm provided his email doesn't bounce.Anyway Krzysztof, can you confirm the same as you have been actively contributing to Qcom peripherals. I will add credit in follow-up submission.
Honestly not now, because I don't have access to related datasheets (I am working on this). You can though try to look at original (vendor) sources:
https://git.codelinaro.org/clo/la/kernel/msm-4.19 (sdm845)
https://git.codelinaro.org/clo/la/kernel/msm-3.18 (msm8996)
Best regards,
Krzysztof
Re: [PATCH v2 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 4 lines
Quoted 1 line
Which example schema are you talking about?
There is only one example-schema.
$ find ./linux -name 'example-schema*'
Example seems good to me. I will change to boolean.
Quoted 6 lines
Quoted 3 lines
Anyway Krzysztof, can you confirm the same as you have been actively contributing to Qcom peripherals. I will add credit in follow-up submission.
Honestly not now, because I don't have access to related datasheets (I am working on this).
Yes definitely and you also must be having bunch of items in your todo list. Actually, I also don't have access to datasheets that's why was looking for inputs.
Quoted 3 lines
You can though try to look at original (vendor) sources:
https://git.codelinaro.org/clo/la/kernel/msm-4.19 (sdm845)
https://git.codelinaro.org/clo/la/kernel/msm-3.18 (msm8996)
Great. I'll see if I can make most out of it.
Re: [PATCH v2 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 3 lines
Quoted 3 lines
You can though try to look at original (vendor) sources:
https://git.codelinaro.org/clo/la/kernel/msm-4.19 (sdm845)
https://git.codelinaro.org/clo/la/kernel/msm-3.18 (msm8996)
I gave a look at this and couldn't find much info related to these platforms. And waited for sometime to get reply from Srinivas and other co.
I don't think it's viable to wait just for this particular thing and also doesn't make much sense either. I will send next version as per your current comments. Thanks!
Re: [PATCH v2 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
In reply to Kuldeep SinghHi Kuldeep,
Quoted 3 lines · Kuldeep Singh
Convert Qualcomm BAM DMA controller binding to DT schema format using json schema.
Please see <https://lore.kernel.org/lkml/[email protected]/T/#m6700c2695ee78e79060ac338d208ffd08ac39592>,
I already have an effort ongoing for converting qcom bam DMA bindings
to YAML format.
I will send a new version of the same shortly. Please try and use the same.
Thanks,
Bhupesh
Quoted 169 lines
Signed-off-by Kuldeep Singh <[email protected]>--- .../devicetree/bindings/dma/qcom,bam-dma.yaml | 94 +++++++++++++++++++ .../devicetree/bindings/dma/qcom_bam_dma.txt | 52 ---------- 2 files changed, 94 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 +94
-0@@ -0,0 +1,94 @@ +# 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: + $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 + - "#dma-cells" + - interrupts + - 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
-53@@ -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
Re: [PATCH v2 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 3 lines · Bhupesh Sharma
Please see <https://lore.kernel.org/lkml/[email protected]/T/#m6700c2695ee78e79060ac338d208ffd08ac39592>,
I already have an effort ongoing for converting qcom bam DMA bindings
to YAML format.
Ohh ok, I wasn't aware you had similar series.
I just noticed your latest v5 version was rolled out ~5 months back, usually this is a very long time considering the duration. Wondering reason behind this..
My updated series(v3 version[1]) is kind of complete and mostly reviewed by Krzysztof and takes care of armv7/8 based platforms. With no offence, I believe we should go with the current one as your series includes changes more than BAM and will take long time to merge. Anyway, I'll be fine with choice of the maintainers.
Regards
Kuldeep
[1] https://lore.kernel.org/linux-devicetree/[email protected]/T/#m2e1df4a579d0f40e07638e117df342b886289bb0
Re: [PATCH v2 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 5 lines · Kuldeep Singh
Quoted 3 lines · Bhupesh Sharma
Please see <https://lore.kernel.org/lkml/[email protected]/T/#m6700c2695ee78e79060ac338d208ffd08ac39592>,
I already have an effort ongoing for converting qcom bam DMA bindings
to YAML format.
Quoted 7 lines
Ohh ok, I wasn't aware you had similar series.
I just noticed your latest v5 version was rolled out ~5 months back, usually this is a very long time considering the duration. Wondering reason behind this..My updated
series(v3 version[1])is kind of complete and mostly reviewed by Krzysztof and takes care of armv7/8 based platforms.
My review was only about patch correctness, not overall patch preference.
Quoted 4 lines
With no offence,
I believe we should go with the current one as your series includes changes more than BAM and will take long time to merge. Anyway, I'll be fine with choice of the maintainers.
I appreciate your work Kuldeep, it is important and valuable contribution. It is sad to see duplicated effort, I don't like it for my own patches either. In general, I believe the FIFO approach should be applied, so in this case Bhupesh patches.
Before starting the conversion the best is to look for prior work on lore:
https://lore.kernel.org/lkml/?q=dfn%3Aqcom_bam_dma.txt
This way you could easily avoid doing the same.
Bhupesh,
Please check what was stopping your work, you might need to rebase it and resend it.
Best regards,
Krzysztof
Re: [PATCH v2 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 4 lines
I appreciate your work Kuldeep, it is important and valuable contribution. It is sad to see duplicated effort, I don't like it for my own patches either. In general, I believe the FIFO approach should be applied, so in this case Bhupesh patches.
Yep, I also agree with FIFO approach w.r.t contributions. But one thing daunts me here is the waiting time with latest revision, it's too high.
Anyway, Bhupesh had more than BAM changes and was already on v5, I can give benefit of doubt to him and won't argue much here.
Bhupesh, feel free to include my armv7 based dts patches in your series otherwise you might stumble DT checks warnings.
Re: [PATCH v2 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 5 lines · Kuldeep Singh
Quoted 4 lines
I appreciate your work Kuldeep, it is important and valuable contribution. It is sad to see duplicated effort, I don't like it for my own patches either. In general, I believe the FIFO approach should be applied, so in this case Bhupesh patches.
Quoted 8 lines
Yep, I also agree with FIFO approach w.r.t contributions. But one thing daunts me here is the waiting time with latest revision, it's too high.
Anyway, Bhupesh had more than BAM changes and was already on v5, I can give benefit of doubt to him and won't argue much here.
Bhupesh, feel free to include my armv7 based dts patches in your series otherwise you might stumble DT checks warnings.
Or do you want me to keep my changes separate? Sorry for spam.
Re: [PATCH v2 6/6] dt-bindings: dma: Convert Qualcomm BAM DMA binding to json format
Quoted 10 lines · Kuldeep Singh
Quoted 8 lines · Kuldeep Singh
Quoted 4 lines
I appreciate your work Kuldeep, it is important and valuable contribution. It is sad to see duplicated effort, I don't like it for my own patches either. In general, I believe the FIFO approach should be applied, so in this case Bhupesh patches.
Yep, I also agree with FIFO approach w.r.t contributions. But one thing daunts me here is the waiting time with latest revision, it's too high.
Quoted 7 lines
Quoted 5 lines
Anyway, Bhupesh had more than BAM changes and was already on v5, I can give benefit of doubt to him and won't argue much here.
Bhupesh, feel free to include my armv7 based dts patches in your series otherwise you might stumble DT checks warnings.
Or do you want me to keep my changes separate? Sorry for spam.
Please send your changes separately, as my patchset already exceeds 25 patches or so in the current form.
Thanks,
Bhupesh