[PATCH 05/12] [v2] spi: rspi: Add DT support to DMA setup

[PATCH 05/12] [v2] spi: rspi: Add DT support to DMA setup

[Geert Uytterhoeven]

Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
v2:
  - Update DMA specifiers to match the renesas,rcar-dmac bindings
---
 Documentation/devicetree/bindings/spi/spi-rspi.txt |  5 +++
 drivers/spi/spi-rspi.c                             | 37 ++++++++++++++--------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/Documentation/devicetree/bindings/spi/spi-rspi.txt b/Documentation/devicetree/bindings/spi/spi-rspi.txt
index d57d82a74054..f9929aceeacc 100644
--- a/Documentation/devicetree/bindings/spi/spi-rspi.txt
+++ b/Documentation/devicetree/bindings/spi/spi-rspi.txt
@@ -30,6 +30,9 @@ Required properties:
 
 Optional properties:
 - clocks           : Must contain a reference to the functional clock.
+- dmas             : Must contain a list of two references to DMA specifiers,
+		     one for transmission, and one for reception.
+- dma-names        : Must contain a list of two DMA names, "tx" and "rx".
 
 Pinctrl properties might be needed, too.  See
 Documentation/devicetree/bindings/pinctrl/renesas,*.
@@ -58,4 +61,6 @@ Examples:
 		num-cs = <1>;
 		#address-cells = <1>;
 		#size-cells = <0>;
+		dmas = <&dmac0 0x17>, <&dmac0 0x18>;
+		dma-names = "tx", "rx";
 	};
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c
index 6a4eb2d7f644..1da609e4491d 100644
--- a/drivers/spi/spi-rspi.c
+++ b/drivers/spi/spi-rspi.c
@@ -909,10 +909,11 @@ static struct dma_chan *rspi_request_dma_chan(struct device *dev,
 	dma_cap_zero(mask);
 	dma_cap_set(DMA_SLAVE, mask);
 
-	chan = dma_request_channel(mask, shdma_chan_filter,
-				   (void *)(unsigned long)id);
+	chan = dma_request_slave_channel_compat(mask, shdma_chan_filter,
+				(void *)(unsigned long)id, dev,
+				dir == DMA_MEM_TO_DEV ? "tx" : "rx");
 	if (!chan) {
-		dev_warn(dev, "dma_request_channel failed\n");
+		dev_warn(dev, "dma_request_slave_channel_compat failed\n");
 		return NULL;
 	}
 
@@ -941,22 +942,30 @@ static int rspi_request_dma(struct device *dev, struct spi_master *master,
 			    const struct resource *res)
 {
 	const struct rspi_plat_data *rspi_pd = dev_get_platdata(dev);
+	unsigned int dma_tx_id, dma_rx_id;
+
+	if (dev->of_node) {
+		/* In the OF case we will get the slave IDs from the DT */
+		dma_tx_id = 0;
+		dma_rx_id = 0;
+	} else if (rspi_pd && rspi_pd->dma_tx_id && rspi_pd->dma_rx_id) {
+		dma_tx_id = rspi_pd->dma_tx_id;
+		dma_rx_id = rspi_pd->dma_rx_id;
+	} else {
+		/* The driver assumes no error. */
+		return 0;
+	}
 
-	if (!rspi_pd || !rspi_pd->dma_rx_id || !rspi_pd->dma_tx_id)
-		return 0;	/* The driver assumes no error. */
-
-	master->dma_rx = rspi_request_dma_chan(dev, DMA_DEV_TO_MEM,
-					       rspi_pd->dma_rx_id,
+	master->dma_tx = rspi_request_dma_chan(dev, DMA_MEM_TO_DEV, dma_tx_id,
 					       res->start + RSPI_SPDR);
-	if (!master->dma_rx)
+	if (!master->dma_tx)
 		return -ENODEV;
 
-	master->dma_tx = rspi_request_dma_chan(dev, DMA_MEM_TO_DEV,
-					       rspi_pd->dma_tx_id,
+	master->dma_rx = rspi_request_dma_chan(dev, DMA_DEV_TO_MEM, dma_rx_id,
 					       res->start + RSPI_SPDR);
-	if (!master->dma_tx) {
-		dma_release_channel(master->dma_rx);
-		master->dma_rx = NULL;
+	if (!master->dma_rx) {
+		dma_release_channel(master->dma_tx);
+		master->dma_tx = NULL;
 		return -ENODEV;
 	}
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 08/12] [v2] spi: sh-msiof: Add DT support to DMA setup

[Geert Uytterhoeven]

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: devicetree@vger.kernel.org
---
v2:
  - Update DMA specifiers to match the renesas,rcar-dmac bindings
---
 Documentation/devicetree/bindings/spi/sh-msiof.txt | 17 ++++++++++++---
 drivers/spi/spi-sh-msiof.c                         | 25 ++++++++++++++++------
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/Documentation/devicetree/bindings/spi/sh-msiof.txt b/Documentation/devicetree/bindings/spi/sh-msiof.txt
index f24baf3b6cc1..98e07f1c3dab 100644
--- a/Documentation/devicetree/bindings/spi/sh-msiof.txt
+++ b/Documentation/devicetree/bindings/spi/sh-msiof.txt
@@ -6,8 +6,13 @@ Required properties:
 			 "renesas,sh-mobile-msiof" for SH Mobile series.
 			 Examples with soctypes are:
 			 "renesas,msiof-r8a7790" (R-Car H2)
-			 "renesas,msiof-r8a7791" (R-Car M2)
-- reg                  : Offset and length of the register set for the device
+- reg                  : A list of offsets and lengths of the register sets for
+			 the device.
+			 If only one register set is present, it is to be used
+			 by both the CPU and the DMA engine.
+			 If two register sets are present, the first is to be
+			 used by the CPU, and the second is to be used by the
+			 DMA engine.
 - interrupt-parent     : The phandle for the interrupt controller that
 			 services interrupts for this device
 - interrupts           : Interrupt specifier
@@ -17,6 +22,10 @@ Required properties:
 Optional properties:
 - clocks               : Must contain a reference to the functional clock.
 - num-cs               : Total number of chip-selects (default is 1)
+- dmas                 : Must contain a list of two references to DMA
+			 specifiers, one for transmission, and one for
+			 reception.
+- dma-names            : Must contain a list of two DMA names, "tx" and "rx".
 
 Optional properties, deprecated for soctype-specific bindings:
 - renesas,tx-fifo-size : Overrides the default tx fifo size given in words
@@ -31,9 +40,11 @@ Example:
 
 	msiof0: spi@e6e20000 {
 		compatible = "renesas,msiof-r8a7791";
-		reg = <0 0xe6e20000 0 0x0064>;
+		reg = <0 0xe6e20000 0 0x0064>, <0 0xe7e20000 0 0x0064>;
 		interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>;
+		dmas = <&dmac0 0x51>, <&dmac0 0x52>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index b19cbb4cb4a0..811a42dba92a 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -977,10 +977,11 @@ static struct dma_chan *sh_msiof_request_dma_chan(struct device *dev,
 	dma_cap_zero(mask);
 	dma_cap_set(DMA_SLAVE, mask);
 
-	chan = dma_request_channel(mask, shdma_chan_filter,
-				  (void *)(unsigned long)id);
+	chan = dma_request_slave_channel_compat(mask, shdma_chan_filter,
+				(void *)(unsigned long)id, dev,
+				dir == DMA_MEM_TO_DEV ? "tx" : "rx");
 	if (!chan) {
-		dev_warn(dev, "dma_request_channel failed\n");
+		dev_warn(dev, "dma_request_slave_channel_compat failed\n");
 		return NULL;
 	}
 
@@ -1010,12 +1011,22 @@ static int sh_msiof_request_dma(struct sh_msiof_spi_priv *p)
 	struct platform_device *pdev = p->pdev;
 	struct device *dev = &pdev->dev;
 	const struct sh_msiof_spi_info *info = dev_get_platdata(dev);
+	unsigned int dma_tx_id, dma_rx_id;
 	const struct resource *res;
 	struct spi_master *master;
 	struct device *tx_dev, *rx_dev;
 
-	if (!info || !info->dma_tx_id || !info->dma_rx_id)
-		return 0;	/* The driver assumes no error */
+	if (dev->of_node) {
+		/* In the OF case we will get the slave IDs from the DT */
+		dma_tx_id = 0;
+		dma_rx_id = 0;
+	} else if (info && info->dma_tx_id && info->dma_rx_id) {
+		dma_tx_id = info->dma_tx_id;
+		dma_rx_id = info->dma_rx_id;
+	} else {
+		/* The driver assumes no error */
+		return 0;
+	}
 
 	/* The DMA engine uses the second register set, if present */
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
@@ -1024,13 +1035,13 @@ static int sh_msiof_request_dma(struct sh_msiof_spi_priv *p)
 
 	master = p->master;
 	master->dma_tx = sh_msiof_request_dma_chan(dev, DMA_MEM_TO_DEV,
-						   info->dma_tx_id,
+						   dma_tx_id,
 						   res->start + TFDR);
 	if (!master->dma_tx)
 		return -ENODEV;
 
 	master->dma_rx = sh_msiof_request_dma_chan(dev, DMA_DEV_TO_MEM,
-						   info->dma_rx_id,
+						   dma_rx_id,
 						   res->start + RFDR);
 	if (!master->dma_rx)
 		goto free_tx_chan;
-- 
1.9.1

[PATCH 09/12] [v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for QSPI

[Geert Uytterhoeven]

Add a DMA property to the QSPI node

Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
This depends on "[PATCH v2 8/8] ARM: shmobile: r8a7791: Add DMAC devices
to DT" of series "[PATCH v2 0/8] R-Car Gen2 DMA Controller driver".

v2:
  - Update DMA specifiers to match the renesas,rcar-dmac bindings,
v2:
  - QSPI needs to use 8-bit accesses for DMA, not 32-bit,
  - Reorder: TX first, RX second.
---
 arch/arm/boot/dts/r8a7791.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index d59af615e365..8186c9f4a18a 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1044,6 +1044,8 @@
 		reg = <0 0xe6b10000 0 0x2c>;
 		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp9_clks R8A7791_CLK_QSPI_MOD>;
+		dmas = <&dmac0 0x17>, <&dmac0 0x18>;
+		dma-names = "tx", "rx";
 		num-cs = <1>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 10/12] [v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for MSIOF

[Geert Uytterhoeven]

Add register sets used for access by the DMA engine, and DMA properties to
the MSIOF nodes.

Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
This depends on "[PATCH v2 8/8] ARM: shmobile: r8a7791: Add DMAC devices
to DT" of series "[PATCH v2 0/8] R-Car Gen2 DMA Controller driver".

v3:
  - Update DMA specifiers to match the renesas,rcar-dmac bindings,
v2:
  - Add register sets for DMA,
  - Reorder: TX first, RX second.
---
 arch/arm/boot/dts/r8a7791.dtsi | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 8186c9f4a18a..152c75ce8534 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1054,9 +1054,11 @@
 
 	msiof0: spi@e6e20000 {
 		compatible = "renesas,msiof-r8a7791";
-		reg = <0 0xe6e20000 0 0x0064>;
+		reg = <0 0xe6e20000 0 0x0064>, <0 0xe7e20000 0 0x0064>;
 		interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>;
+		dmas = <&dmac0 0x51>, <&dmac0 0x52>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
@@ -1064,9 +1066,11 @@
 
 	msiof1: spi@e6e10000 {
 		compatible = "renesas,msiof-r8a7791";
-		reg = <0 0xe6e10000 0 0x0064>;
+		reg = <0 0xe6e10000 0 0x0064>, <0 0xe7e10000 0 0x0064>;
 		interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_MSIOF1>;
+		dmas = <&dmac0 0x55>, <&dmac0 0x56>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
@@ -1074,9 +1078,11 @@
 
 	msiof2: spi@e6e00000 {
 		compatible = "renesas,msiof-r8a7791";
-		reg = <0 0xe6e00000 0 0x0064>;
+		reg = <0 0xe6e00000 0 0x0064>, <0 0xe7e00000 0 0x0064>;
 		interrupts = <0 158 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7791_CLK_MSIOF2>;
+		dmas = <&dmac0 0x41>, <&dmac0 0x42>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 11/12] ARM: shmobile: r8a7790 dtsi: Enable DMA for QSPI

[Geert Uytterhoeven]

Add a DMA property to the QSPI node

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: devicetree@vger.kernel.org
---
This depends on "[PATCH v2 7/8] ARM: shmobile: r8a7790: Add DMAC devices
to DT" of series "[PATCH v2 0/8] R-Car Gen2 DMA Controller driver".
---
 arch/arm/boot/dts/r8a7790.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 4c74f219c824..495771b3cb34 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -978,6 +978,8 @@
 		reg = <0 0xe6b10000 0 0x2c>;
 		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp9_clks R8A7790_CLK_QSPI_MOD>;
+		dmas = <&dmac0 0x17>, <&dmac0 0x18>;
+		dma-names = "tx", "rx";
 		num-cs = <1>;
 		#address-cells = <1>;
 		#size-cells = <0>;
-- 
1.9.1

[PATCH 12/12] ARM: shmobile: r8a7790 dtsi: Enable DMA for MSIOF

[Geert Uytterhoeven]

Add register sets used for access by the DMA engine, and DMA properties to
the MSIOF nodes.

Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
---
This depends on "[PATCH v2 7/8] ARM: shmobile: r8a7790: Add DMAC devices
to DT" of series "[PATCH v2 0/8] R-Car Gen2 DMA Controller driver".
---
 arch/arm/boot/dts/r8a7790.dtsi | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 495771b3cb34..45d6fdd6877b 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -988,9 +988,11 @@
 
 	msiof0: spi@e6e20000 {
 		compatible = "renesas,msiof-r8a7790";
-		reg = <0 0xe6e20000 0 0x0064>;
+		reg = <0 0xe6e20000 0 0x0064>, <0 0xe7e20000 0 0x0064>;
 		interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp0_clks R8A7790_CLK_MSIOF0>;
+		dmas = <&dmac0 0x51>, <&dmac0 0x52>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
@@ -998,9 +1000,11 @@
 
 	msiof1: spi@e6e10000 {
 		compatible = "renesas,msiof-r8a7790";
-		reg = <0 0xe6e10000 0 0x0064>;
+		reg = <0 0xe6e10000 0 0x0064>, <0 0xe7e10000 0 0x0064>;
 		interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_MSIOF1>;
+		dmas = <&dmac0 0x55>, <&dmac0 0x56>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
@@ -1008,9 +1012,11 @@
 
 	msiof2: spi@e6e00000 {
 		compatible = "renesas,msiof-r8a7790";
-		reg = <0 0xe6e00000 0 0x0064>;
+		reg = <0 0xe6e00000 0 0x0064>, <0 0xe7e00000 0 0x0064>;
 		interrupts = <0 158 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_MSIOF2>;
+		dmas = <&dmac0 0x41>, <&dmac0 0x42>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
@@ -1018,9 +1024,11 @@
 
 	msiof3: spi@e6c90000 {
 		compatible = "renesas,msiof-r8a7790";
-		reg = <0 0xe6c90000 0 0x0064>;
+		reg = <0 0xe6c90000 0 0x0064>, <0 0xe7c90000 0 0x0064>;
 		interrupts = <0 159 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp2_clks R8A7790_CLK_MSIOF3>;
+		dmas = <&dmac0 0x45>, <&dmac0 0x46>;
+		dma-names = "tx", "rx";
 		#address-cells = <1>;
 		#size-cells = <0>;
 		status = "disabled";
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 05/12] [v2] spi: rspi: Add DT support to DMA setup

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

On Wed, Aug 06, 2014 at 02:59:02PM +0200, Geert Uytterhoeven wrote:
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Cc: devicetree@vger.kernel.org

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 08/12] [v2] spi: sh-msiof: Add DT support to DMA setup

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 148 bytes --]

On Wed, Aug 06, 2014 at 02:59:05PM +0200, Geert Uytterhoeven wrote:
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 09/12] [v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for QSPI

[Simon Horman]

On Wed, Aug 06, 2014 at 02:59:06PM +0200, Geert Uytterhoeven wrote:
> Add a DMA property to the QSPI node
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> Cc: devicetree@vger.kernel.org
> ---
> This depends on "[PATCH v2 8/8] ARM: shmobile: r8a7791: Add DMAC devices
> to DT" of series "[PATCH v2 0/8] R-Car Gen2 DMA Controller driver".

Hi Geert, Hi Laurent,

Am I correct in assuming that with this patch applied things
will continue to work the old way until the patch above applied
to the same tree and from there on the user will get the new behaviour?

If so I think that I can take this patch as although the driver hasn't been
merged the relevant bindings were added to the subsystem maintainers tree
by "dmaengine: rcar-dmac: Add device tree bindings documentation" and are
available in linux-next.

Likewise for "[v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for MSIO".

> v2:
>   - Update DMA specifiers to match the renesas,rcar-dmac bindings,
> v2:
>   - QSPI needs to use 8-bit accesses for DMA, not 32-bit,
>   - Reorder: TX first, RX second.
> ---
>  arch/arm/boot/dts/r8a7791.dtsi | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
> index d59af615e365..8186c9f4a18a 100644
> --- a/arch/arm/boot/dts/r8a7791.dtsi
> +++ b/arch/arm/boot/dts/r8a7791.dtsi
> @@ -1044,6 +1044,8 @@
>  		reg = <0 0xe6b10000 0 0x2c>;
>  		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
>  		clocks = <&mstp9_clks R8A7791_CLK_QSPI_MOD>;
> +		dmas = <&dmac0 0x17>, <&dmac0 0x18>;
> +		dma-names = "tx", "rx";
>  		num-cs = <1>;
>  		#address-cells = <1>;
>  		#size-cells = <0>;
> -- 
> 1.9.1
> 

Re: [PATCH 09/12] [v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for QSPI

[Simon Horman]

On Thu, Aug 07, 2014 at 09:37:56AM +0900, Simon Horman wrote:
> On Wed, Aug 06, 2014 at 02:59:06PM +0200, Geert Uytterhoeven wrote:
> > Add a DMA property to the QSPI node
> > 
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > Cc: devicetree@vger.kernel.org
> > ---
> > This depends on "[PATCH v2 8/8] ARM: shmobile: r8a7791: Add DMAC devices
> > to DT" of series "[PATCH v2 0/8] R-Car Gen2 DMA Controller driver".
> 
> Hi Geert, Hi Laurent,
> 
> Am I correct in assuming that with this patch applied things
> will continue to work the old way until the patch above applied
> to the same tree and from there on the user will get the new behaviour?
> 
> If so I think that I can take this patch as although the driver hasn't been
> merged the relevant bindings were added to the subsystem maintainers tree
> by "dmaengine: rcar-dmac: Add device tree bindings documentation" and are
> available in linux-next.
> 
> Likewise for "[v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for MSIO".

... and "ARM: shmobile: r8a7790 dtsi: Enable DMA for QSPI"

> > v2:
> >   - Update DMA specifiers to match the renesas,rcar-dmac bindings,
> > v2:
> >   - QSPI needs to use 8-bit accesses for DMA, not 32-bit,
> >   - Reorder: TX first, RX second.
> > ---
> >  arch/arm/boot/dts/r8a7791.dtsi | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
> > index d59af615e365..8186c9f4a18a 100644
> > --- a/arch/arm/boot/dts/r8a7791.dtsi
> > +++ b/arch/arm/boot/dts/r8a7791.dtsi
> > @@ -1044,6 +1044,8 @@
> >  		reg = <0 0xe6b10000 0 0x2c>;
> >  		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
> >  		clocks = <&mstp9_clks R8A7791_CLK_QSPI_MOD>;
> > +		dmas = <&dmac0 0x17>, <&dmac0 0x18>;
> > +		dma-names = "tx", "rx";
> >  		num-cs = <1>;
> >  		#address-cells = <1>;
> >  		#size-cells = <0>;
> > -- 
> > 1.9.1
> > 

Re: [PATCH 09/12] [v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for QSPI

[Simon Horman]

On Thu, Aug 07, 2014 at 09:39:08AM +0900, Simon Horman wrote:
> On Thu, Aug 07, 2014 at 09:37:56AM +0900, Simon Horman wrote:
> > On Wed, Aug 06, 2014 at 02:59:06PM +0200, Geert Uytterhoeven wrote:
> > > Add a DMA property to the QSPI node
> > > 
> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > > Cc: devicetree@vger.kernel.org
> > > ---
> > > This depends on "[PATCH v2 8/8] ARM: shmobile: r8a7791: Add DMAC devices
> > > to DT" of series "[PATCH v2 0/8] R-Car Gen2 DMA Controller driver".
> > 
> > Hi Geert, Hi Laurent,
> > 
> > Am I correct in assuming that with this patch applied things
> > will continue to work the old way until the patch above applied
> > to the same tree and from there on the user will get the new behaviour?
> > 
> > If so I think that I can take this patch as although the driver hasn't been
> > merged the relevant bindings were added to the subsystem maintainers tree
> > by "dmaengine: rcar-dmac: Add device tree bindings documentation" and are
> > available in linux-next.
> > 
> > Likewise for "[v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for MSIO".
> 
> ... and "ARM: shmobile: r8a7790 dtsi: Enable DMA for QSPI"

... and "ARM: shmobile: r8a7790 dtsi: Enable DMA for MSIO"

and any other similar patches I didn't list above :)

> 
> > > v2:
> > >   - Update DMA specifiers to match the renesas,rcar-dmac bindings,
> > > v2:
> > >   - QSPI needs to use 8-bit accesses for DMA, not 32-bit,
> > >   - Reorder: TX first, RX second.
> > > ---
> > >  arch/arm/boot/dts/r8a7791.dtsi | 2 ++
> > >  1 file changed, 2 insertions(+)
> > > 
> > > diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
> > > index d59af615e365..8186c9f4a18a 100644
> > > --- a/arch/arm/boot/dts/r8a7791.dtsi
> > > +++ b/arch/arm/boot/dts/r8a7791.dtsi
> > > @@ -1044,6 +1044,8 @@
> > >  		reg = <0 0xe6b10000 0 0x2c>;
> > >  		interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
> > >  		clocks = <&mstp9_clks R8A7791_CLK_QSPI_MOD>;
> > > +		dmas = <&dmac0 0x17>, <&dmac0 0x18>;
> > > +		dma-names = "tx", "rx";
> > >  		num-cs = <1>;
> > >  		#address-cells = <1>;
> > >  		#size-cells = <0>;
> > > -- 
> > > 1.9.1
> > > 

Re: [PATCH 09/12] [v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for QSPI

[Geert Uytterhoeven]

Hi Simon,

On Thu, Aug 7, 2014 at 2:41 AM, Simon Horman <horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org> wrote:
> On Thu, Aug 07, 2014 at 09:39:08AM +0900, Simon Horman wrote:
>> On Thu, Aug 07, 2014 at 09:37:56AM +0900, Simon Horman wrote:
>> > On Wed, Aug 06, 2014 at 02:59:06PM +0200, Geert Uytterhoeven wrote:
>> > > Add a DMA property to the QSPI node
>> > >
>> > > Signed-off-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>
>> > > Cc: devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
>> > > ---
>> > > This depends on "[PATCH v2 8/8] ARM: shmobile: r8a7791: Add DMAC devices
>> > > to DT" of series "[PATCH v2 0/8] R-Car Gen2 DMA Controller driver".
>> >
>> > Hi Geert, Hi Laurent,
>> >
>> > Am I correct in assuming that with this patch applied things
>> > will continue to work the old way until the patch above applied
>> > to the same tree and from there on the user will get the new behaviour?
>> >
>> > If so I think that I can take this patch as although the driver hasn't been
>> > merged the relevant bindings were added to the subsystem maintainers tree
>> > by "dmaengine: rcar-dmac: Add device tree bindings documentation" and are
>> > available in linux-next.
>> >
>> > Likewise for "[v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for MSIO".
>>
>> ... and "ARM: shmobile: r8a7790 dtsi: Enable DMA for QSPI"
>
> ... and "ARM: shmobile: r8a7790 dtsi: Enable DMA for MSIO"
>
> and any other similar patches I didn't list above :)

Yes[*].

If rcar-dma is not available, drivers fall back to PIO, cfr. for rspi:

-renesas_spi e6b10000.spi: DMA available
+renesas_spi e6b10000.spi: dma_request_slave_channel_compat failed
+renesas_spi e6b10000.spi: DMA not available, using PIO
 renesas_spi e6b10000.spi: registered master spi0
 spi spi0.0: setup mode 0, 8 bits/w, 30000000 Hz max --> 0
 m25p80 spi0.0: s25fl512s (65536 Kbytes)
 3 ofpart partitions found on MTD device spi0.0
 Creating 3 MTD partitions on "spi0.0":
 0x000000000000-0x000000080000 : "loader"
 0x000000080000-0x000000100000 : "bootenv"
 0x000000100000-0x000004000000 : "data"
 renesas_spi e6b10000.spi: registered child spi0.0

and sh-msiof:

-spi_sh_msiof e6e20000.spi: DMA available
+spi_sh_msiof e6e20000.spi: dma_request_slave_channel_compat failed
+spi_sh_msiof e6e20000.spi: DMA not available, using PIO
 spi_sh_msiof e6e20000.spi: registered master spi1
 spi spi1.0: setup mode 3, 8 bits/w, 6000000 Hz max --> 0
 spi_sh_msiof e6e20000.spi: registered child spi1.0

and everything still works, but slower.

[*] If the individual DMA slave drivers properly handle DMA request
    failures. If they don't, they will already fail now, as there is no DMA
    platform configuration without the dmas/dma-names properties
    (ignoring Magnus' DMA prototypes using auxdata, as DT is the way
     forward).

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 09/12] [v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for QSPI

[Simon Horman]

On Thu, Aug 07, 2014 at 10:27:21AM +0200, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Thu, Aug 7, 2014 at 2:41 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Thu, Aug 07, 2014 at 09:39:08AM +0900, Simon Horman wrote:
> >> On Thu, Aug 07, 2014 at 09:37:56AM +0900, Simon Horman wrote:
> >> > On Wed, Aug 06, 2014 at 02:59:06PM +0200, Geert Uytterhoeven wrote:
> >> > > Add a DMA property to the QSPI node
> >> > >
> >> > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> >> > > Cc: devicetree@vger.kernel.org
> >> > > ---
> >> > > This depends on "[PATCH v2 8/8] ARM: shmobile: r8a7791: Add DMAC devices
> >> > > to DT" of series "[PATCH v2 0/8] R-Car Gen2 DMA Controller driver".
> >> >
> >> > Hi Geert, Hi Laurent,
> >> >
> >> > Am I correct in assuming that with this patch applied things
> >> > will continue to work the old way until the patch above applied
> >> > to the same tree and from there on the user will get the new behaviour?
> >> >
> >> > If so I think that I can take this patch as although the driver hasn't been
> >> > merged the relevant bindings were added to the subsystem maintainers tree
> >> > by "dmaengine: rcar-dmac: Add device tree bindings documentation" and are
> >> > available in linux-next.
> >> >
> >> > Likewise for "[v3] ARM: shmobile: r8a7791 dtsi: Enable DMA for MSIO".
> >>
> >> ... and "ARM: shmobile: r8a7790 dtsi: Enable DMA for QSPI"
> >
> > ... and "ARM: shmobile: r8a7790 dtsi: Enable DMA for MSIO"
> >
> > and any other similar patches I didn't list above :)
> 
> Yes[*].
> 
> If rcar-dma is not available, drivers fall back to PIO, cfr. for rspi:
> 
> -renesas_spi e6b10000.spi: DMA available
> +renesas_spi e6b10000.spi: dma_request_slave_channel_compat failed
> +renesas_spi e6b10000.spi: DMA not available, using PIO
>  renesas_spi e6b10000.spi: registered master spi0
>  spi spi0.0: setup mode 0, 8 bits/w, 30000000 Hz max --> 0
>  m25p80 spi0.0: s25fl512s (65536 Kbytes)
>  3 ofpart partitions found on MTD device spi0.0
>  Creating 3 MTD partitions on "spi0.0":
>  0x000000000000-0x000000080000 : "loader"
>  0x000000080000-0x000000100000 : "bootenv"
>  0x000000100000-0x000004000000 : "data"
>  renesas_spi e6b10000.spi: registered child spi0.0
> 
> and sh-msiof:
> 
> -spi_sh_msiof e6e20000.spi: DMA available
> +spi_sh_msiof e6e20000.spi: dma_request_slave_channel_compat failed
> +spi_sh_msiof e6e20000.spi: DMA not available, using PIO
>  spi_sh_msiof e6e20000.spi: registered master spi1
>  spi spi1.0: setup mode 3, 8 bits/w, 6000000 Hz max --> 0
>  spi_sh_msiof e6e20000.spi: registered child spi1.0
> 
> and everything still works, but slower.
> 
> [*] If the individual DMA slave drivers properly handle DMA request
>     failures. If they don't, they will already fail now, as there is no DMA
>     platform configuration without the dmas/dma-names properties
>     (ignoring Magnus' DMA prototypes using auxdata, as DT is the way
>      forward).

Thanks, I have queued up the 4 shmobile patches for v3.18 with
Laurent's Ack. They should appear in the devel branch of the renesas tree
some time today.

On Thu, Aug 07, 2014 at 02:16:47AM +0200, Laurent Pinchart wrote:
> Hi Geert,
> 
> Thank you for the patches.
> 
> On Wednesday 06 August 2014 14:58:57 Geert Uytterhoeven wrote:
> > 	Hi Mark, Simon,
> > 
> > Here's a series of Renesas RSPI/QSPI and SH-MSIOF SPI driver updates.
> > I grouped them in three parts:
> >   - [1-5] are for the rspi driver (Mark),
> >   - [6-8] are for the sh-msiof driver (Mark),
> >   - [9-12] are for the R-Car Gen2 DTSes (Simon).
> 
> For everything but 06/12,
> 
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

[snip]