2022-10-01 18:57:12

by Martin Botka

Subject: [PATCH 1/3] dt-bindings: dma: gpi: Document SM6125 compatible

This commit documents the newly added SM6125 SoC
compatible.

Signed-off-by: Martin Botka <[email protected]>
---
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 7d2fc4eb5530..a21c40fc6439 100644
--- a/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
+++ b/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
@@ -21,6 +21,7 @@ properties:
enum:
- qcom,sc7280-gpi-dma
- qcom,sdm845-gpi-dma
+ - qcom,sm6125-gpi-dma
- qcom,sm8150-gpi-dma
- qcom,sm8250-gpi-dma
- qcom,sm8350-gpi-dma
--
2.37.3

2022-10-01 18:57:19

by Martin Botka

Subject: [PATCH 2/3] drivers: dma: gpi: Add SM6125 compatible

This commit adds compatible for SM6125
SoC.

Signed-off-by: Martin Botka <[email protected]>
---
drivers/dma/qcom/gpi.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/dma/qcom/gpi.c b/drivers/dma/qcom/gpi.c
index 8f0c9c4e2efd..0c42b40a7586 100644
--- a/drivers/dma/qcom/gpi.c
+++ b/drivers/dma/qcom/gpi.c
@@ -2288,6 +2288,7 @@ static int gpi_probe(struct platform_device *pdev)
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,sm6125-gpi-dma", .data = (void *)0x0 },
{ .compatible = "qcom,sm8150-gpi-dma", .data = (void *)0x0 },
{ .compatible = "qcom,sm8250-gpi-dma", .data = (void *)0x0 },
{ .compatible = "qcom,sm8350-gpi-dma", .data = (void *)0x10000 },
--
2.37.3

2022-10-01 19:09:22

by Martin Botka

Subject: [PATCH 3/3] arm64: dts: qcom: sm6125: Add GPI DMA nodes

This commit adds and configures GPI DMA nodes.

Signed-off-by: Martin Botka <[email protected]>
---
arch/arm64/boot/dts/qcom/sm6125.dtsi | 37 ++++++++++++++++++++++++++++
1 file changed, 37 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
index d35ea4474234..7e135041bd42 100644
--- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
@@ -6,6 +6,7 @@
#include <dt-bindings/clock/qcom,dispcc-sm6125.h>
#include <dt-bindings/clock/qcom,gcc-sm6125.h>
#include <dt-bindings/clock/qcom,rpmcc.h>
+#include <dt-bindings/dma/qcom-gpi.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/power/qcom-rpmpd.h>
@@ -1076,6 +1077,42 @@ sdhc_2: mmc@4784000 {
status = "disabled";
};

+ gpi_dma0: dma-controller@4a00000 {
+ compatible = "qcom,sm6125-gpi-dma";
+ #dma-cells = <5>;
+ reg = <0x04a00000 0x60000>;
+ iommus = <&apps_smmu 0x0136 0x0>;
+ dma-channels = <8>;
+ dma-channel-mask = <0x1f>;
+ interrupts = <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>;
+ status = "okay";
+ };
+
+ gpi_dma1: dma-controller@4c00000 {
+ compatible = "qcom,sm6125-gpi-dma";
+ #dma-cells = <5>;
+ reg = <0x04c00000 0x60000>;
+ iommus = <&apps_smmu 0x0156 0x0>;
+ dma-channels = <8>;
+ dma-channel-mask = <0x0f>;
+ interrupts = <GIC_SPI 314 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 315 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 316 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 317 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 318 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 319 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 320 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 321 IRQ_TYPE_LEVEL_HIGH>;
+ status = "okay";
+ };
+
qupv3_id_0: geniqup@4ac0000 {
compatible = "qcom,geni-se-qup";
reg = <0x04ac0000 0x2000>;
--
2.37.3

2022-10-01 20:44:29

by Konrad Dybcio

Subject: Re: [PATCH 2/3] drivers: dma: gpi: Add SM6125 compatible

On 1.10.2022 20:55, Martin Botka wrote:
> This commit adds compatible for SM6125
> SoC.
>
> Signed-off-by: Martin Botka <[email protected]>
> ---
It's been decided to not add any more compatibles without a need.
Please follow what has been done here:

https://lore.kernel.org/all/YzVL9ngfwqfwhF8Q@matsya/t/

Konrad
> drivers/dma/qcom/gpi.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/dma/qcom/gpi.c b/drivers/dma/qcom/gpi.c
> index 8f0c9c4e2efd..0c42b40a7586 100644
> --- a/drivers/dma/qcom/gpi.c
> +++ b/drivers/dma/qcom/gpi.c
> @@ -2288,6 +2288,7 @@ static int gpi_probe(struct platform_device *pdev)
> 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,sm6125-gpi-dma", .data = (void *)0x0 },
> { .compatible = "qcom,sm8150-gpi-dma", .data = (void *)0x0 },
> { .compatible = "qcom,sm8250-gpi-dma", .data = (void *)0x0 },
> { .compatible = "qcom,sm8350-gpi-dma", .data = (void *)0x10000 },

2022-10-02 08:18:46

by Krzysztof Kozlowski

Subject: Re: [PATCH 3/3] arm64: dts: qcom: sm6125: Add GPI DMA nodes

On 01/10/2022 20:55, Martin Botka wrote:
> This commit adds and configures GPI DMA nodes.
>
> Signed-off-by: Martin Botka <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/sm6125.dtsi | 37 ++++++++++++++++++++++++++++
> 1 file changed, 37 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi
> index d35ea4474234..7e135041bd42 100644
> --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi
> @@ -6,6 +6,7 @@
> #include <dt-bindings/clock/qcom,dispcc-sm6125.h>
> #include <dt-bindings/clock/qcom,gcc-sm6125.h>
> #include <dt-bindings/clock/qcom,rpmcc.h>
> +#include <dt-bindings/dma/qcom-gpi.h>
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/interrupt-controller/arm-gic.h>
> #include <dt-bindings/power/qcom-rpmpd.h>
> @@ -1076,6 +1077,42 @@ sdhc_2: mmc@4784000 {
> status = "disabled";
> };
>
> + gpi_dma0: dma-controller@4a00000 {
> + compatible = "qcom,sm6125-gpi-dma";

You will need here sdm845 fallback.

> + #dma-cells = <5>;
> + reg = <0x04a00000 0x60000>;
> + iommus = <&apps_smmu 0x0136 0x0>;
> + dma-channels = <8>;
> + dma-channel-mask = <0x1f>;
> + interrupts = <GIC_SPI 335 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 340 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 341 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 342 IRQ_TYPE_LEVEL_HIGH>;
> + status = "okay";

No need, its okay by default.

Both comments apply everywhere.

Best regards,
Krzysztof

2022-10-02 08:25:40

by Krzysztof Kozlowski

Subject: Re: [PATCH 1/3] dt-bindings: dma: gpi: Document SM6125 compatible

On 01/10/2022 20:55, Martin Botka wrote:
> This commit documents the newly added SM6125 SoC
> compatible.
>
> Signed-off-by: Martin Botka <[email protected]>
> ---
> 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 7d2fc4eb5530..a21c40fc6439 100644
> --- a/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
> +++ b/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
> @@ -21,6 +21,7 @@ properties:
> enum:
> - qcom,sc7280-gpi-dma
> - qcom,sdm845-gpi-dma
> + - qcom,sm6125-gpi-dma

Please rebase on top of:
https://lore.kernel.org/linux-devicetree/[email protected]/

and mention it depends on it.

Best regards,
Krzysztof