* [PATCH v3 1/4] dt-bindings: dma: qcom: gpi: add fallback compatible
2022-09-27 1:48 [PATCH v3 0/4] SDM670 GPI DMA support Richard Acayan
@ 2022-09-27 1:48 ` Richard Acayan
2022-09-28 7:48 ` Krzysztof Kozlowski
2022-09-27 1:48 ` [PATCH v3 2/4] dt-bindings: dma: qcom: gpi: add compatible for sdm670 Richard Acayan
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ messages in thread
From: Richard Acayan @ 2022-09-27 1:48 UTC (permalink / raw)
To: linux-arm-msm
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Rob Herring, Krzysztof Kozlowski, dmaengine, devicetree,
Richard Acayan
The drivers are transitioning from matching against lists of specific
compatible strings to matching against smaller lists of more generic
compatible strings. Use the SDM845 compatible string as a fallback in
the schema to support this change.
Signed-off-by: Richard Acayan <mailingradian@gmail.com>
---
.../devicetree/bindings/dma/qcom,gpi.yaml | 21 ++++++++++++-------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/Documentation/devicetree/bindings/dma/qcom,gpi.yaml b/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
index eabf8a76d3a0..081b8a2d393d 100644
--- a/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
+++ b/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
@@ -18,14 +18,19 @@ allOf:
properties:
compatible:
- enum:
- - qcom,sc7280-gpi-dma
- - qcom,sdm845-gpi-dma
- - qcom,sm6350-gpi-dma
- - qcom,sm8150-gpi-dma
- - qcom,sm8250-gpi-dma
- - qcom,sm8350-gpi-dma
- - qcom,sm8450-gpi-dma
+ oneOf:
+ - enum:
+ - qcom,sc7280-gpi-dma
+ - qcom,sdm845-gpi-dma
+ - qcom,sm6350-gpi-dma
+ - qcom,sm8350-gpi-dma
+ - qcom,sm8450-gpi-dma
+
+ - items:
+ - enum:
+ - qcom,sm8150-gpi-dma
+ - qcom,sm8250-gpi-dma
+ - const: qcom,sdm845-gpi-dma
reg:
maxItems: 1
--
2.37.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v3 1/4] dt-bindings: dma: qcom: gpi: add fallback compatible
2022-09-27 1:48 ` [PATCH v3 1/4] dt-bindings: dma: qcom: gpi: add fallback compatible Richard Acayan
@ 2022-09-28 7:48 ` Krzysztof Kozlowski
0 siblings, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2022-09-28 7:48 UTC (permalink / raw)
To: Richard Acayan, linux-arm-msm
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Rob Herring, Krzysztof Kozlowski, dmaengine, devicetree
On 27/09/2022 03:48, Richard Acayan wrote:
> The drivers are transitioning from matching against lists of specific
> compatible strings to matching against smaller lists of more generic
> compatible strings. Use the SDM845 compatible string as a fallback in
> the schema to support this change.
>
> Signed-off-by: Richard Acayan <mailingradian@gmail.com>
> ---
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 2/4] dt-bindings: dma: qcom: gpi: add compatible for sdm670
2022-09-27 1:48 [PATCH v3 0/4] SDM670 GPI DMA support Richard Acayan
2022-09-27 1:48 ` [PATCH v3 1/4] dt-bindings: dma: qcom: gpi: add fallback compatible Richard Acayan
@ 2022-09-27 1:48 ` Richard Acayan
2022-09-28 7:48 ` Krzysztof Kozlowski
2022-09-27 1:48 ` [PATCH v3 3/4] arm64: dts: qcom: add gpi-dma fallback compatible Richard Acayan
2022-09-27 1:48 ` [PATCH v3 4/4] dmaengine: qcom: gpi: drop redundant of_device_id entries Richard Acayan
3 siblings, 1 reply; 10+ messages in thread
From: Richard Acayan @ 2022-09-27 1:48 UTC (permalink / raw)
To: linux-arm-msm
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Rob Herring, Krzysztof Kozlowski, dmaengine, devicetree,
Richard Acayan
The Snapdragon 670 uses GPI DMA for its GENI interface. Add a compatible
string for it in the documentation.
Signed-off-by: Richard Acayan <mailingradian@gmail.com>
---
Documentation/devicetree/bindings/dma/qcom,gpi.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/dma/qcom,gpi.yaml b/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
index 081b8a2d393d..750b40c32213 100644
--- a/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
+++ b/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
@@ -28,6 +28,7 @@ properties:
- items:
- enum:
+ - qcom,sdm670-gpi-dma
- qcom,sm8150-gpi-dma
- qcom,sm8250-gpi-dma
- const: qcom,sdm845-gpi-dma
--
2.37.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v3 2/4] dt-bindings: dma: qcom: gpi: add compatible for sdm670
2022-09-27 1:48 ` [PATCH v3 2/4] dt-bindings: dma: qcom: gpi: add compatible for sdm670 Richard Acayan
@ 2022-09-28 7:48 ` Krzysztof Kozlowski
0 siblings, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2022-09-28 7:48 UTC (permalink / raw)
To: Richard Acayan, linux-arm-msm
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Rob Herring, Krzysztof Kozlowski, dmaengine, devicetree
On 27/09/2022 03:48, Richard Acayan wrote:
> The Snapdragon 670 uses GPI DMA for its GENI interface. Add a compatible
> string for it in the documentation.
>
> Signed-off-by: Richard Acayan <mailingradian@gmail.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 3/4] arm64: dts: qcom: add gpi-dma fallback compatible
2022-09-27 1:48 [PATCH v3 0/4] SDM670 GPI DMA support Richard Acayan
2022-09-27 1:48 ` [PATCH v3 1/4] dt-bindings: dma: qcom: gpi: add fallback compatible Richard Acayan
2022-09-27 1:48 ` [PATCH v3 2/4] dt-bindings: dma: qcom: gpi: add compatible for sdm670 Richard Acayan
@ 2022-09-27 1:48 ` Richard Acayan
2022-09-28 7:48 ` Krzysztof Kozlowski
2022-09-27 1:48 ` [PATCH v3 4/4] dmaengine: qcom: gpi: drop redundant of_device_id entries Richard Acayan
3 siblings, 1 reply; 10+ messages in thread
From: Richard Acayan @ 2022-09-27 1:48 UTC (permalink / raw)
To: linux-arm-msm
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Rob Herring, Krzysztof Kozlowski, dmaengine, devicetree,
Richard Acayan
The dt schema for gpi-dma has been updated with a new fallback
compatible string. Add the compatible strings to existing device trees.
Signed-off-by: Richard Acayan <mailingradian@gmail.com>
---
arch/arm64/boot/dts/qcom/sm8150.dtsi | 6 +++---
arch/arm64/boot/dts/qcom/sm8250.dtsi | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index cef8c4f4f0ff..281d5109ac3b 100644
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -887,7 +887,7 @@ gcc: clock-controller@100000 {
};
gpi_dma0: dma-controller@800000 {
- compatible = "qcom,sm8150-gpi-dma";
+ compatible = "qcom,sm8150-gpi-dma", "qcom,sdm845-gpi-dma";
reg = <0 0x800000 0 0x60000>;
interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>,
@@ -1222,7 +1222,7 @@ spi7: spi@89c000 {
};
gpi_dma1: dma-controller@a00000 {
- compatible = "qcom,sm8150-gpi-dma";
+ compatible = "qcom,sm8150-gpi-dma", "qcom,sdm845-gpi-dma";
reg = <0 0xa00000 0 0x60000>;
interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,
@@ -1471,7 +1471,7 @@ spi16: spi@a94000 {
};
gpi_dma2: dma-controller@c00000 {
- compatible = "qcom,sm8150-gpi-dma";
+ compatible = "qcom,sm8150-gpi-dma", "qcom,sdm845-gpi-dma";
reg = <0 0xc00000 0 0x60000>;
interrupts = <GIC_SPI 588 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH>,
diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
index a5b62cadb129..5d5de7eead08 100644
--- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
@@ -936,7 +936,7 @@ rng: rng@793000 {
};
gpi_dma2: dma-controller@800000 {
- compatible = "qcom,sm8250-gpi-dma";
+ compatible = "qcom,sm8250-gpi-dma", "qcom,sdm845-gpi-dma";
reg = <0 0x00800000 0 0x70000>;
interrupts = <GIC_SPI 588 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH>,
@@ -1187,7 +1187,7 @@ spi19: spi@894000 {
};
gpi_dma0: dma-controller@900000 {
- compatible = "qcom,sm8250-gpi-dma";
+ compatible = "qcom,sm8250-gpi-dma", "qcom,sdm845-gpi-dma";
reg = <0 0x00900000 0 0x70000>;
interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>,
@@ -1505,7 +1505,7 @@ spi7: spi@99c000 {
};
gpi_dma1: dma-controller@a00000 {
- compatible = "qcom,sm8250-gpi-dma";
+ compatible = "qcom,sm8250-gpi-dma", "qcom,sdm845-gpi-dma";
reg = <0 0x00a00000 0 0x70000>;
interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,
--
2.37.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v3 3/4] arm64: dts: qcom: add gpi-dma fallback compatible
2022-09-27 1:48 ` [PATCH v3 3/4] arm64: dts: qcom: add gpi-dma fallback compatible Richard Acayan
@ 2022-09-28 7:48 ` Krzysztof Kozlowski
0 siblings, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2022-09-28 7:48 UTC (permalink / raw)
To: Richard Acayan, linux-arm-msm
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Rob Herring, Krzysztof Kozlowski, dmaengine, devicetree
On 27/09/2022 03:48, Richard Acayan wrote:
> The dt schema for gpi-dma has been updated with a new fallback
> compatible string. Add the compatible strings to existing device trees.
>
> Signed-off-by: Richard Acayan <mailingradian@gmail.com>
> ---
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v3 4/4] dmaengine: qcom: gpi: drop redundant of_device_id entries
2022-09-27 1:48 [PATCH v3 0/4] SDM670 GPI DMA support Richard Acayan
` (2 preceding siblings ...)
2022-09-27 1:48 ` [PATCH v3 3/4] arm64: dts: qcom: add gpi-dma fallback compatible Richard Acayan
@ 2022-09-27 1:48 ` Richard Acayan
2022-09-28 7:49 ` Krzysztof Kozlowski
2022-09-29 7:40 ` Vinod Koul
3 siblings, 2 replies; 10+ messages in thread
From: Richard Acayan @ 2022-09-27 1:48 UTC (permalink / raw)
To: linux-arm-msm
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Rob Herring, Krzysztof Kozlowski, dmaengine, devicetree,
Richard Acayan
The drivers are transitioning from matching against lists of specific
compatible strings to matching against smaller lists of more generic
compatible strings. Continue the transition in the GPI DMA driver.
Signed-off-by: Richard Acayan <mailingradian@gmail.com>
---
drivers/dma/qcom/gpi.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/dma/qcom/gpi.c b/drivers/dma/qcom/gpi.c
index 89839864b4ec..e5f37d61f30a 100644
--- a/drivers/dma/qcom/gpi.c
+++ b/drivers/dma/qcom/gpi.c
@@ -2289,8 +2289,6 @@ static const struct of_device_id gpi_of_match[] = {
{ .compatible = "qcom,sc7280-gpi-dma", .data = (void *)0x10000 },
{ .compatible = "qcom,sdm845-gpi-dma", .data = (void *)0x0 },
{ .compatible = "qcom,sm6350-gpi-dma", .data = (void *)0x10000 },
- { .compatible = "qcom,sm8150-gpi-dma", .data = (void *)0x0 },
- { .compatible = "qcom,sm8250-gpi-dma", .data = (void *)0x0 },
{ .compatible = "qcom,sm8350-gpi-dma", .data = (void *)0x10000 },
{ .compatible = "qcom,sm8450-gpi-dma", .data = (void *)0x10000 },
{ },
--
2.37.3
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v3 4/4] dmaengine: qcom: gpi: drop redundant of_device_id entries
2022-09-27 1:48 ` [PATCH v3 4/4] dmaengine: qcom: gpi: drop redundant of_device_id entries Richard Acayan
@ 2022-09-28 7:49 ` Krzysztof Kozlowski
2022-09-29 7:40 ` Vinod Koul
1 sibling, 0 replies; 10+ messages in thread
From: Krzysztof Kozlowski @ 2022-09-28 7:49 UTC (permalink / raw)
To: Richard Acayan, linux-arm-msm
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Rob Herring, Krzysztof Kozlowski, dmaengine, devicetree
On 27/09/2022 03:48, Richard Acayan wrote:
> The drivers are transitioning from matching against lists of specific
> compatible strings to matching against smaller lists of more generic
> compatible strings. Continue the transition in the GPI DMA driver.
>
> Signed-off-by: Richard Acayan <mailingradian@gmail.com>
> ---
> drivers/dma/qcom/gpi.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/dma/qcom/gpi.c b/drivers/dma/qcom/gpi.c
> index 89839864b4ec..e5f37d61f30a 100644
> --- a/drivers/dma/qcom/gpi.c
> +++ b/drivers/dma/qcom/gpi.c
> @@ -2289,8 +2289,6 @@ static const struct of_device_id gpi_of_match[] = {
> { .compatible = "qcom,sc7280-gpi-dma", .data = (void *)0x10000 },
> { .compatible = "qcom,sdm845-gpi-dma", .data = (void *)0x0 },
> { .compatible = "qcom,sm6350-gpi-dma", .data = (void *)0x10000 },
> - { .compatible = "qcom,sm8150-gpi-dma", .data = (void *)0x0 },
> - { .compatible = "qcom,sm8250-gpi-dma", .data = (void *)0x0 },
You cannot remove them that fast - it would be an ABI break. Just add a
comment that these are deprecated and devices should match with a
fallback compatible.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v3 4/4] dmaengine: qcom: gpi: drop redundant of_device_id entries
2022-09-27 1:48 ` [PATCH v3 4/4] dmaengine: qcom: gpi: drop redundant of_device_id entries Richard Acayan
2022-09-28 7:49 ` Krzysztof Kozlowski
@ 2022-09-29 7:40 ` Vinod Koul
1 sibling, 0 replies; 10+ messages in thread
From: Vinod Koul @ 2022-09-29 7:40 UTC (permalink / raw)
To: Richard Acayan
Cc: linux-arm-msm, Andy Gross, Bjorn Andersson, Konrad Dybcio,
Rob Herring, Krzysztof Kozlowski, dmaengine, devicetree
On 26-09-22, 21:48, Richard Acayan wrote:
> The drivers are transitioning from matching against lists of specific
> compatible strings to matching against smaller lists of more generic
> compatible strings. Continue the transition in the GPI DMA driver.
>
> Signed-off-by: Richard Acayan <mailingradian@gmail.com>
> ---
> drivers/dma/qcom/gpi.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/dma/qcom/gpi.c b/drivers/dma/qcom/gpi.c
> index 89839864b4ec..e5f37d61f30a 100644
> --- a/drivers/dma/qcom/gpi.c
> +++ b/drivers/dma/qcom/gpi.c
> @@ -2289,8 +2289,6 @@ static const struct of_device_id gpi_of_match[] = {
> { .compatible = "qcom,sc7280-gpi-dma", .data = (void *)0x10000 },
> { .compatible = "qcom,sdm845-gpi-dma", .data = (void *)0x0 },
> { .compatible = "qcom,sm6350-gpi-dma", .data = (void *)0x10000 },
> - { .compatible = "qcom,sm8150-gpi-dma", .data = (void *)0x0 },
> - { .compatible = "qcom,sm8250-gpi-dma", .data = (void *)0x0 },
We cant do this without breaking stuff...
There are DTs which have this id!
> { .compatible = "qcom,sm8350-gpi-dma", .data = (void *)0x10000 },
> { .compatible = "qcom,sm8450-gpi-dma", .data = (void *)0x10000 },
> { },
> --
> 2.37.3
--
~Vinod
^ permalink raw reply [flat|nested] 10+ messages in thread