* [PATCH v2 1/5] dt-bindings: dma: qcom: gpi: Use sm6350 fallback
2022-10-18 23:03 [PATCH v2 0/5] dma/arm64: qcom: use one compatible also for 0x10000 offset Krzysztof Kozlowski
@ 2022-10-18 23:03 ` Krzysztof Kozlowski
2022-10-18 23:03 ` [PATCH v2 2/5] dmaengine: qcom: gpi: Document preferred SM6350 binding Krzysztof Kozlowski
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-18 23:03 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Rob Herring, Krzysztof Kozlowski, linux-arm-msm, dmaengine,
devicetree, linux-kernel
Cc: Krzysztof Kozlowski, Rob Herring
Several devices like SM6350, SM8150 and SC7280 are actually compatible,
so use one compatible fallback for all of them.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Rob Herring <robh@kernel.org>
---
Documentation/devicetree/bindings/dma/qcom,gpi.yaml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/dma/qcom,gpi.yaml b/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
index 6f7dcae944e4..0c2894498845 100644
--- a/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
+++ b/Documentation/devicetree/bindings/dma/qcom,gpi.yaml
@@ -20,11 +20,14 @@ properties:
compatible:
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,sc7280-gpi-dma
+ - qcom,sm8350-gpi-dma
+ - qcom,sm8450-gpi-dma
+ - const: qcom,sm6350-gpi-dma
- items:
- enum:
- qcom,sdm670-gpi-dma
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 2/5] dmaengine: qcom: gpi: Document preferred SM6350 binding
2022-10-18 23:03 [PATCH v2 0/5] dma/arm64: qcom: use one compatible also for 0x10000 offset Krzysztof Kozlowski
2022-10-18 23:03 ` [PATCH v2 1/5] dt-bindings: dma: qcom: gpi: Use sm6350 fallback Krzysztof Kozlowski
@ 2022-10-18 23:03 ` Krzysztof Kozlowski
2022-10-18 23:03 ` [PATCH v2 3/5] arm64: dts: qcom: sc7280: Add GPI DMA compatible fallback Krzysztof Kozlowski
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-18 23:03 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Rob Herring, Krzysztof Kozlowski, linux-arm-msm, dmaengine,
devicetree, linux-kernel
Cc: Krzysztof Kozlowski, Richard Acayan
Devices with ee offset of 0x10000 should rather bind with SM6350
compatible, so the list will not unnecessarily grow for compatible
devices.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Acked-by: Richard Acayan <mailingradian@gmail.com>
---
drivers/dma/qcom/gpi.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/dma/qcom/gpi.c b/drivers/dma/qcom/gpi.c
index f8e19e6e6117..061add832295 100644
--- a/drivers/dma/qcom/gpi.c
+++ b/drivers/dma/qcom/gpi.c
@@ -2286,13 +2286,14 @@ 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,sm6350-gpi-dma", .data = (void *)0x10000 },
/*
- * Deprecated, devices with ee_offset = 0 should use sdm845-gpi-dma as
- * fallback and not need their own entries here.
+ * Do not grow the list for compatible devices. Instead use
+ * qcom,sdm845-gpi-dma (for ee_offset = 0x0) or qcom,sm6350-gpi-dma
+ * (for ee_offset = 0x10000).
*/
+ { .compatible = "qcom,sc7280-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 },
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 3/5] arm64: dts: qcom: sc7280: Add GPI DMA compatible fallback
2022-10-18 23:03 [PATCH v2 0/5] dma/arm64: qcom: use one compatible also for 0x10000 offset Krzysztof Kozlowski
2022-10-18 23:03 ` [PATCH v2 1/5] dt-bindings: dma: qcom: gpi: Use sm6350 fallback Krzysztof Kozlowski
2022-10-18 23:03 ` [PATCH v2 2/5] dmaengine: qcom: gpi: Document preferred SM6350 binding Krzysztof Kozlowski
@ 2022-10-18 23:03 ` Krzysztof Kozlowski
2022-10-18 23:03 ` [PATCH v2 4/5] arm64: dts: qcom: sm8350: " Krzysztof Kozlowski
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-18 23:03 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Rob Herring, Krzysztof Kozlowski, linux-arm-msm, dmaengine,
devicetree, linux-kernel
Cc: Krzysztof Kozlowski, Neil Armstrong
Use SM6350 as fallback for GPI DMA, to indicate devices are compatible
and that drivers can bind with only one compatible.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/qcom/sc7280.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 212580316d3e..2a167412fa6a 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -920,7 +920,7 @@ opp-384000000 {
gpi_dma0: dma-controller@900000 {
#dma-cells = <3>;
- compatible = "qcom,sc7280-gpi-dma";
+ compatible = "qcom,sc7280-gpi-dma", "qcom,sm6350-gpi-dma";
reg = <0 0x00900000 0 0x60000>;
interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>,
@@ -1419,7 +1419,7 @@ uart7: serial@99c000 {
gpi_dma1: dma-controller@a00000 {
#dma-cells = <3>;
- compatible = "qcom,sc7280-gpi-dma";
+ compatible = "qcom,sc7280-gpi-dma", "qcom,sm6350-gpi-dma";
reg = <0 0x00a00000 0 0x60000>;
interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 4/5] arm64: dts: qcom: sm8350: Add GPI DMA compatible fallback
2022-10-18 23:03 [PATCH v2 0/5] dma/arm64: qcom: use one compatible also for 0x10000 offset Krzysztof Kozlowski
` (2 preceding siblings ...)
2022-10-18 23:03 ` [PATCH v2 3/5] arm64: dts: qcom: sc7280: Add GPI DMA compatible fallback Krzysztof Kozlowski
@ 2022-10-18 23:03 ` Krzysztof Kozlowski
2022-10-18 23:03 ` [PATCH v2 5/5] arm64: dts: qcom: sm8450: " Krzysztof Kozlowski
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-18 23:03 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Rob Herring, Krzysztof Kozlowski, linux-arm-msm, dmaengine,
devicetree, linux-kernel
Cc: Krzysztof Kozlowski, Neil Armstrong
Use SM6350 as fallback for GPI DMA, to indicate devices are compatible
and that drivers can bind with only one compatible.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/qcom/sm8350.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index a86d9ea93b9d..aa08c0e065c7 100644
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -678,7 +678,7 @@ ipcc: mailbox@408000 {
};
gpi_dma2: dma-controller@800000 {
- compatible = "qcom,sm8350-gpi-dma";
+ compatible = "qcom,sm8350-gpi-dma", "qcom,sm6350-gpi-dma";
reg = <0 0x00800000 0 0x60000>;
interrupts = <GIC_SPI 588 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 589 IRQ_TYPE_LEVEL_HIGH>,
@@ -904,7 +904,7 @@ spi19: spi@894000 {
};
gpi_dma0: dma-controller@900000 {
- compatible = "qcom,sm8350-gpi-dma";
+ compatible = "qcom,sm8350-gpi-dma", "qcom,sm6350-gpi-dma";
reg = <0 0x09800000 0 0x60000>;
interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 245 IRQ_TYPE_LEVEL_HIGH>,
@@ -1209,7 +1209,7 @@ spi7: spi@99c000 {
};
gpi_dma1: dma-controller@a00000 {
- compatible = "qcom,sm8350-gpi-dma";
+ compatible = "qcom,sm8350-gpi-dma", "qcom,sm6350-gpi-dma";
reg = <0 0x00a00000 0 0x60000>;
interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 280 IRQ_TYPE_LEVEL_HIGH>,
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [PATCH v2 5/5] arm64: dts: qcom: sm8450: Add GPI DMA compatible fallback
2022-10-18 23:03 [PATCH v2 0/5] dma/arm64: qcom: use one compatible also for 0x10000 offset Krzysztof Kozlowski
` (3 preceding siblings ...)
2022-10-18 23:03 ` [PATCH v2 4/5] arm64: dts: qcom: sm8350: " Krzysztof Kozlowski
@ 2022-10-18 23:03 ` Krzysztof Kozlowski
2022-10-19 12:49 ` [PATCH v2 0/5] dma/arm64: qcom: use one compatible also for 0x10000 offset Vinod Koul
2022-11-07 3:12 ` (subset) " Bjorn Andersson
6 siblings, 0 replies; 8+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-18 23:03 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Rob Herring, Krzysztof Kozlowski, linux-arm-msm, dmaengine,
devicetree, linux-kernel
Cc: Krzysztof Kozlowski, Neil Armstrong
Use SM6350 as fallback for GPI DMA, to indicate devices are compatible
and that drivers can bind with only one compatible.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
---
arch/arm64/boot/dts/qcom/sm8450.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index d32f08df743d..e01a019d8b23 100644
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -730,7 +730,7 @@ gcc: clock-controller@100000 {
};
gpi_dma2: dma-controller@800000 {
- compatible = "qcom,sm8450-gpi-dma";
+ compatible = "qcom,sm8450-gpi-dma", "qcom,sm6350-gpi-dma";
#dma-cells = <3>;
reg = <0 0x800000 0 0x60000>;
interrupts = <GIC_SPI 588 IRQ_TYPE_LEVEL_HIGH>,
@@ -1058,7 +1058,7 @@ spi21: spi@898000 {
};
gpi_dma0: dma-controller@900000 {
- compatible = "qcom,sm8450-gpi-dma";
+ compatible = "qcom,sm8450-gpi-dma", "qcom,sm6350-gpi-dma";
#dma-cells = <3>;
reg = <0 0x900000 0 0x60000>;
interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>,
@@ -1394,7 +1394,7 @@ uart7: serial@99c000 {
};
gpi_dma1: dma-controller@a00000 {
- compatible = "qcom,sm8450-gpi-dma";
+ compatible = "qcom,sm8450-gpi-dma", "qcom,sm6350-gpi-dma";
#dma-cells = <3>;
reg = <0 0xa00000 0 0x60000>;
interrupts = <GIC_SPI 279 IRQ_TYPE_LEVEL_HIGH>,
--
2.34.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH v2 0/5] dma/arm64: qcom: use one compatible also for 0x10000 offset
2022-10-18 23:03 [PATCH v2 0/5] dma/arm64: qcom: use one compatible also for 0x10000 offset Krzysztof Kozlowski
` (4 preceding siblings ...)
2022-10-18 23:03 ` [PATCH v2 5/5] arm64: dts: qcom: sm8450: " Krzysztof Kozlowski
@ 2022-10-19 12:49 ` Vinod Koul
2022-11-07 3:12 ` (subset) " Bjorn Andersson
6 siblings, 0 replies; 8+ messages in thread
From: Vinod Koul @ 2022-10-19 12:49 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, linux-arm-msm, dmaengine, devicetree,
linux-kernel
On 18-10-22, 19:03, Krzysztof Kozlowski wrote:
> Hi,
>
> Dependencies
> ============
> 1. DT bindings and DMA driver change depends contextually on:
> https://lore.kernel.org/all/20221018005740.23952-1-mailingradian@gmail.com/
>
> 2. DTS patches are independent, although they will spark some dtbs_check
> warnings (due to change in bindings).
Applied 1-2, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: (subset) [PATCH v2 0/5] dma/arm64: qcom: use one compatible also for 0x10000 offset
2022-10-18 23:03 [PATCH v2 0/5] dma/arm64: qcom: use one compatible also for 0x10000 offset Krzysztof Kozlowski
` (5 preceding siblings ...)
2022-10-19 12:49 ` [PATCH v2 0/5] dma/arm64: qcom: use one compatible also for 0x10000 offset Vinod Koul
@ 2022-11-07 3:12 ` Bjorn Andersson
6 siblings, 0 replies; 8+ messages in thread
From: Bjorn Andersson @ 2022-11-07 3:12 UTC (permalink / raw)
To: krzysztof.kozlowski+dt, devicetree, Rob Herring, linux-arm-msm,
vkoul, konrad.dybcio, Krzysztof Kozlowski, linux-kernel,
dmaengine, Andy Gross
On Tue, 18 Oct 2022 19:03:47 -0400, Krzysztof Kozlowski wrote:
> Changes since v1
> ================
> 1. Rebase on v6 of Richard's patch.
> 2. Add tags.
>
> Dependencies
> ============
> 1. DT bindings and DMA driver change depends contextually on:
> https://lore.kernel.org/all/20221018005740.23952-1-mailingradian@gmail.com/
>
> [...]
Applied, thanks!
[3/5] arm64: dts: qcom: sc7280: Add GPI DMA compatible fallback
commit: e9f2053b7866ac09f2acebbe65056204ef3fe67d
[4/5] arm64: dts: qcom: sm8350: Add GPI DMA compatible fallback
commit: b561e225dee5412609fd98340ca71ba0ab2e4b36
[5/5] arm64: dts: qcom: sm8450: Add GPI DMA compatible fallback
commit: 19e67894500a8a038cb103e7267da5e64bcc853c
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread