[GIT PULL] Renesas rcar-audmapp Driver Updates for v3.17

[GIT PULL] Renesas rcar-audmapp Driver Updates for v3.17

[Simon Horman]

Hi Vinod

Please consider pulling these Renesas rcar-audmapp Driver Updates for v3.17


The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:

  Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-rcar-audmapp-for-v3.17

for you to fetch changes up to caf18c27ddb2fb8ae2a7591b908e7efb7484e459:

  dma: rcar-audmapp: add DT support (2014-07-11 13:35:08 +0200)

----------------------------------------------------------------
Renesas rcar-audmapp Driver Updates for v3.17

* Add DT support to rcar-audmapp driver

----------------------------------------------------------------
Kuninori Morimoto (3):
      dma: rcar-audmapp: enable .set_slave
      dma: rcar-audmapp: don't keep audmapp_slave_config for each channeles
      dma: rcar-audmapp: add DT support

 .../devicetree/bindings/dma/rcar-audmapp.txt       |  29 ++++++
 drivers/dma/sh/rcar-audmapp.c                      | 114 +++++++++++++++------
 2 files changed, 113 insertions(+), 30 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/dma/rcar-audmapp.txt

Re: [GIT PULL] Renesas rcar-audmapp Driver Updates for v3.17

[Simon Horman]

Hi Vinod,

I wonder if you could take a moment to look over this.

On Tue, Jul 15, 2014 at 07:51:05PM +0900, Simon Horman wrote:
> Hi Vinod
> 
> Please consider pulling these Renesas rcar-audmapp Driver Updates for v3.17
> 
> 
> The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:
> 
>   Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-rcar-audmapp-for-v3.17
> 
> for you to fetch changes up to caf18c27ddb2fb8ae2a7591b908e7efb7484e459:
> 
>   dma: rcar-audmapp: add DT support (2014-07-11 13:35:08 +0200)
> 
> ----------------------------------------------------------------
> Renesas rcar-audmapp Driver Updates for v3.17
> 
> * Add DT support to rcar-audmapp driver
> 
> ----------------------------------------------------------------
> Kuninori Morimoto (3):
>       dma: rcar-audmapp: enable .set_slave
>       dma: rcar-audmapp: don't keep audmapp_slave_config for each channeles
>       dma: rcar-audmapp: add DT support
> 
>  .../devicetree/bindings/dma/rcar-audmapp.txt       |  29 ++++++
>  drivers/dma/sh/rcar-audmapp.c                      | 114 +++++++++++++++------
>  2 files changed, 113 insertions(+), 30 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/dma/rcar-audmapp.txt
> 

Re: [GIT PULL] Renesas rcar-audmapp Driver Updates for v3.17

[Vinod Koul]

On Tue, Jul 15, 2014 at 07:51:05PM +0900, Simon Horman wrote:
> Hi Vinod
> 
> Please consider pulling these Renesas rcar-audmapp Driver Updates for v3.17
> 
> 
> The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:
> 
>   Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-rcar-audmapp-for-v3.17

Merged now

Thanks
-- 
~Vinod
> 
> for you to fetch changes up to caf18c27ddb2fb8ae2a7591b908e7efb7484e459:
> 
>   dma: rcar-audmapp: add DT support (2014-07-11 13:35:08 +0200)
> 
> ----------------------------------------------------------------
> Renesas rcar-audmapp Driver Updates for v3.17
> 
> * Add DT support to rcar-audmapp driver
> 
> ----------------------------------------------------------------
> Kuninori Morimoto (3):
>       dma: rcar-audmapp: enable .set_slave
>       dma: rcar-audmapp: don't keep audmapp_slave_config for each channeles
>       dma: rcar-audmapp: add DT support
> 
>  .../devicetree/bindings/dma/rcar-audmapp.txt       |  29 ++++++
>  drivers/dma/sh/rcar-audmapp.c                      | 114 +++++++++++++++------
>  2 files changed, 113 insertions(+), 30 deletions(-)
>  create mode 100644 Documentation/devicetree/bindings/dma/rcar-audmapp.txt
> --
> To unsubscribe from this list: send the line "unsubscribe dmaengine" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 

Re: [GIT PULL] Renesas rcar-audmapp Driver Updates for v3.17

[Simon Horman]

On Mon, Jul 28, 2014 at 05:26:56PM +0530, Vinod Koul wrote:
> On Tue, Jul 15, 2014 at 07:51:05PM +0900, Simon Horman wrote:
> > Hi Vinod
> > 
> > Please consider pulling these Renesas rcar-audmapp Driver Updates for v3.17
> > 
> > 
> > The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:
> > 
> >   Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-rcar-audmapp-for-v3.17
> 
> Merged now

Thanks!

Re: [GIT PULL] Renesas rcar-audmapp Driver Updates for v3.17

[Ben Dooks]

On 15/07/14 11:51, Simon Horman wrote:
> Hi Vinod
> 
> Please consider pulling these Renesas rcar-audmapp Driver Updates for v3.17

Out of interest, what happened to the series I posted adding DT
support for the renesas dma code? I don't seem to have had any
feedback on it?

-- 
Ben Dooks				http://www.codethink.co.uk/
Senior Engineer				Codethink - Providing Genius

Re: [GIT PULL] Renesas rcar-audmapp Driver Updates for v3.17

[Vinod Koul]

On Mon, Aug 04, 2014 at 11:08:19AM +0100, Ben Dooks wrote:
> On 15/07/14 11:51, Simon Horman wrote:
> > Hi Vinod
> > 
> > Please consider pulling these Renesas rcar-audmapp Driver Updates for v3.17
> 
> Out of interest, what happened to the series I posted adding DT
> support for the renesas dma code? I don't seem to have had any
> feedback on it?
Sorry I assumed it was folded in the one sent by Simon as PULL request.
Can you please resend

-- 
~Vinod

Re: [GIT PULL] Renesas rcar-audmapp Driver Updates for v3.17

[Kuninori Morimoto]

Hi Ben

# I addded Laurent

> > > Please consider pulling these Renesas rcar-audmapp Driver Updates for v3.17
> > 
> > Out of interest, what happened to the series I posted adding DT
> > support for the renesas dma code? I don't seem to have had any
> > feedback on it?
> Sorry I assumed it was folded in the one sent by Simon as PULL request.
> Can you please resend

I guess SYS-DAC is now supported by Laurent's rcar-dma.
Because it needs to support modern feature, like IOMMU/LPAE...
addint it on shdma-base is difficult, I guess

Best regards
---
Kuninori Morimoto

[PATCH 0/3] dma: rcar-audmapp: add DT support

[Kuninori Morimoto]

Hi Vinod

These patches add DT support to Renesas Audio DMAC peri peri driver.

Kuninori Morimoto (3):
      dma: rcar-audmapp: enable .set_slave
      dma: rcar-audmapp: don't keep audmapp_slave_config for each channeles
      dma: rcar-audmapp: add DT support

 .../devicetree/bindings/dma/rcar-audmapp.txt       |   30 ++++++
 drivers/dma/sh/rcar-audmapp.c                      |  113 ++++++++++++++------
 2 files changed, 113 insertions(+), 30 deletions(-)

[PATCH 1/3] dma: rcar-audmapp: enable .set_slave

[Kuninori Morimoto]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Current .set_slave callback did nothing,
since it assumed src/dst address come from platform settings.
But, it isn't good match to DT probing.
This patch enables .set_slave callback to this issue.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 drivers/dma/sh/rcar-audmapp.c |   34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/drivers/dma/sh/rcar-audmapp.c b/drivers/dma/sh/rcar-audmapp.c
index 2de7728..858483b 100644
--- a/drivers/dma/sh/rcar-audmapp.c
+++ b/drivers/dma/sh/rcar-audmapp.c
@@ -47,6 +47,7 @@ struct audmapp_chan {
 	struct shdma_chan shdma_chan;
 	struct audmapp_slave_config *config;
 	void __iomem *base;
+	dma_addr_t slave_addr;
 };
 
 struct audmapp_device {
@@ -56,7 +57,14 @@ struct audmapp_device {
 	void __iomem *chan_reg;
 };
 
+struct audmapp_desc {
+	struct shdma_desc shdma_desc;
+	dma_addr_t src;
+	dma_addr_t dst;
+};
+
 #define to_chan(chan) container_of(chan, struct audmapp_chan, shdma_chan)
+#define to_desc(sdesc) container_of(sdesc, struct audmapp_desc, shdma_desc)
 #define to_dev(chan) container_of(chan->shdma_chan.dma_chan.device,	\
 				  struct audmapp_device, shdma_dev.dma_dev)
 
@@ -90,19 +98,20 @@ static void audmapp_halt(struct shdma_chan *schan)
 }
 
 static void audmapp_start_xfer(struct shdma_chan *schan,
-			       struct shdma_desc *sdecs)
+			       struct shdma_desc *sdesc)
 {
 	struct audmapp_chan *auchan = to_chan(schan);
 	struct audmapp_device *audev = to_dev(auchan);
+	struct audmapp_desc *desc = to_desc(sdesc);
 	struct audmapp_slave_config *cfg = auchan->config;
 	struct device *dev = audev->dev;
 	u32 chcr = cfg->chcr | PDMACHCR_DE;
 
-	dev_dbg(dev, "src/dst/chcr = %pad/%pad/%x\n",
-		&cfg->src, &cfg->dst, cfg->chcr);
+	dev_dbg(dev, "src/dst/chcr = %pad/%pad/%08x\n",
+		&desc->src, &desc->dst, chcr);
 
-	audmapp_write(auchan, cfg->src,	PDMASAR);
-	audmapp_write(auchan, cfg->dst,	PDMADAR);
+	audmapp_write(auchan, desc->src,	PDMASAR);
+	audmapp_write(auchan, desc->dst,	PDMADAR);
 	audmapp_write(auchan, chcr,	PDMACHCR);
 }
 
@@ -137,14 +146,16 @@ static int audmapp_set_slave(struct shdma_chan *schan, int slave_id,
 		return 0;
 
 	auchan->config	= cfg;
+	auchan->slave_addr = slave_addr ? : cfg->dst;
 
 	return 0;
 }
 
 static int audmapp_desc_setup(struct shdma_chan *schan,
-			      struct shdma_desc *sdecs,
+			      struct shdma_desc *sdesc,
 			      dma_addr_t src, dma_addr_t dst, size_t *len)
 {
+	struct audmapp_desc *desc = to_desc(sdesc);
 	struct audmapp_chan *auchan = to_chan(schan);
 	struct audmapp_slave_config *cfg = auchan->config;
 
@@ -154,6 +165,9 @@ static int audmapp_desc_setup(struct shdma_chan *schan,
 	if (*len > (size_t)AUDMAPP_LEN_MAX)
 		*len = (size_t)AUDMAPP_LEN_MAX;
 
+	desc->src = src;
+	desc->dst = dst;
+
 	return 0;
 }
 
@@ -164,7 +178,9 @@ static void audmapp_setup_xfer(struct shdma_chan *schan,
 
 static dma_addr_t audmapp_slave_addr(struct shdma_chan *schan)
 {
-	return 0; /* always fixed address */
+	struct audmapp_chan *auchan = to_chan(schan);
+
+	return auchan->slave_addr;
 }
 
 static bool audmapp_channel_busy(struct shdma_chan *schan)
@@ -183,7 +199,7 @@ static bool audmapp_desc_completed(struct shdma_chan *schan,
 
 static struct shdma_desc *audmapp_embedded_desc(void *buf, int i)
 {
-	return &((struct shdma_desc *)buf)[i];
+	return &((struct audmapp_desc *)buf)[i].shdma_desc;
 }
 
 static const struct shdma_ops audmapp_shdma_ops = {
@@ -260,7 +276,7 @@ static int audmapp_probe(struct platform_device *pdev)
 
 	sdev		= &audev->shdma_dev;
 	sdev->ops	= &audmapp_shdma_ops;
-	sdev->desc_size	= sizeof(struct shdma_desc);
+	sdev->desc_size	= sizeof(struct audmapp_desc);
 
 	dma_dev			= &sdev->dma_dev;
 	dma_dev->copy_align	= LOG2_DEFAULT_XFER_SIZE;
-- 
1.7.9.5

[PATCH 2/3] dma: rcar-audmapp: don't keep audmapp_slave_config for each channeles

[Kuninori Morimoto]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Current audmapp driver is keeping audmapp_slave_config
for each channeles, but, nessasary information is only "chcr".
Current style (= keeping audmapp_slave_config) is
not good match for DT support.
Keep "chcr" instead of audmapp_slave_config

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 drivers/dma/sh/rcar-audmapp.c |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/drivers/dma/sh/rcar-audmapp.c b/drivers/dma/sh/rcar-audmapp.c
index 858483b..dd00775 100644
--- a/drivers/dma/sh/rcar-audmapp.c
+++ b/drivers/dma/sh/rcar-audmapp.c
@@ -45,9 +45,9 @@
 
 struct audmapp_chan {
 	struct shdma_chan shdma_chan;
-	struct audmapp_slave_config *config;
 	void __iomem *base;
 	dma_addr_t slave_addr;
+	u32 chcr;
 };
 
 struct audmapp_device {
@@ -103,9 +103,8 @@ static void audmapp_start_xfer(struct shdma_chan *schan,
 	struct audmapp_chan *auchan = to_chan(schan);
 	struct audmapp_device *audev = to_dev(auchan);
 	struct audmapp_desc *desc = to_desc(sdesc);
-	struct audmapp_slave_config *cfg = auchan->config;
 	struct device *dev = audev->dev;
-	u32 chcr = cfg->chcr | PDMACHCR_DE;
+	u32 chcr = auchan->chcr | PDMACHCR_DE;
 
 	dev_dbg(dev, "src/dst/chcr = %pad/%pad/%08x\n",
 		&desc->src, &desc->dst, chcr);
@@ -145,7 +144,7 @@ static int audmapp_set_slave(struct shdma_chan *schan, int slave_id,
 	if (try)
 		return 0;
 
-	auchan->config	= cfg;
+	auchan->chcr	= cfg->chcr;
 	auchan->slave_addr = slave_addr ? : cfg->dst;
 
 	return 0;
@@ -156,11 +155,6 @@ static int audmapp_desc_setup(struct shdma_chan *schan,
 			      dma_addr_t src, dma_addr_t dst, size_t *len)
 {
 	struct audmapp_desc *desc = to_desc(sdesc);
-	struct audmapp_chan *auchan = to_chan(schan);
-	struct audmapp_slave_config *cfg = auchan->config;
-
-	if (!cfg)
-		return -ENODEV;
 
 	if (*len > (size_t)AUDMAPP_LEN_MAX)
 		*len = (size_t)AUDMAPP_LEN_MAX;
-- 
1.7.9.5

[PATCH 3/3] dma: rcar-audmapp: add DT support

[Kuninori Morimoto]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

This patch adds DT support to Audio DMAC peri peri driver.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 .../devicetree/bindings/dma/rcar-audmapp.txt       |   30 +++++++++
 drivers/dma/sh/rcar-audmapp.c                      |   71 ++++++++++++++++----
 2 files changed, 87 insertions(+), 14 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/dma/rcar-audmapp.txt

diff --git a/Documentation/devicetree/bindings/dma/rcar-audmapp.txt b/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
new file mode 100644
index 0000000..b4950c4
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
@@ -0,0 +1,30 @@
+* R-Car Audio DMAC peri peri Device Tree bindings
+
+Required properties:
+- compatible:	should be "renesas,rcar-audmapp"
+- #dma-cells:	should be <1>, see "dmas" property below
+
+Example:
+	audmapp: audio-dma-pp@0xec740000 {
+		compatible = "renesas,rcar-audmapp";
+		#dma-cells = <1>;
+
+		reg = <0 0xec740000 0 0x200>;
+	};
+
+
+* DMA client
+
+Required properties:
+- dmas:		a list of <[DMA multiplexer phandle] [SRS/DRS value]> pairs,
+		where SRS/DRS values are fixed handles, specified in the SoC
+		manual as the value that would be written into the PDMACHCR.
+- dma-names:	a list of DMA channel names, one per "dmas" entry
+
+Example:
+
+	dmas = <&audmapp 0x2d00
+		&audmapp 0x3700>;
+	dma-names =  "src0_ssiu0",
+		     "dvc0_ssiu0";
+
diff --git a/drivers/dma/sh/rcar-audmapp.c b/drivers/dma/sh/rcar-audmapp.c
index dd00775..0774c36 100644
--- a/drivers/dma/sh/rcar-audmapp.c
+++ b/drivers/dma/sh/rcar-audmapp.c
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/dmaengine.h>
+#include <linux/of_dma.h>
 #include <linux/platform_data/dma-rcar-audmapp.h>
 #include <linux/platform_device.h>
 #include <linux/shdma-base.h>
@@ -63,6 +64,8 @@ struct audmapp_desc {
 	dma_addr_t dst;
 };
 
+#define to_shdma_chan(c) container_of(c, struct shdma_chan, dma_chan)
+
 #define to_chan(chan) container_of(chan, struct audmapp_chan, shdma_chan)
 #define to_desc(sdesc) container_of(sdesc, struct audmapp_desc, shdma_desc)
 #define to_dev(chan) container_of(chan->shdma_chan.dma_chan.device,	\
@@ -114,38 +117,50 @@ static void audmapp_start_xfer(struct shdma_chan *schan,
 	audmapp_write(auchan, chcr,	PDMACHCR);
 }
 
-static struct audmapp_slave_config *
-audmapp_find_slave(struct audmapp_chan *auchan, int slave_id)
+static void audmapp_get_config(struct audmapp_chan *auchan, int slave_id,
+			      u32 *chcr, dma_addr_t *dst)
 {
 	struct audmapp_device *audev = to_dev(auchan);
 	struct audmapp_pdata *pdata = audev->pdata;
 	struct audmapp_slave_config *cfg;
 	int i;
 
+	*chcr	= 0;
+	*dst	= 0;
+
+	if (!pdata) { /* DT */
+		*chcr = ((u32)slave_id) << 16;
+		auchan->shdma_chan.slave_id = (slave_id) >> 8;
+		return;
+	}
+
+	/* non-DT */
+
 	if (slave_id >= AUDMAPP_SLAVE_NUMBER)
-		return NULL;
+		return;
 
 	for (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++)
-		if (cfg->slave_id = slave_id)
-			return cfg;
-
-	return NULL;
+		if (cfg->slave_id = slave_id) {
+			*chcr	= cfg->chcr;
+			*dst	= cfg->dst;
+			break;
+		}
 }
 
 static int audmapp_set_slave(struct shdma_chan *schan, int slave_id,
 			     dma_addr_t slave_addr, bool try)
 {
 	struct audmapp_chan *auchan = to_chan(schan);
-	struct audmapp_slave_config *cfg -		audmapp_find_slave(auchan, slave_id);
+	u32 chcr;
+	dma_addr_t dst;
+
+	audmapp_get_config(auchan, slave_id, &chcr, &dst);
 
-	if (!cfg)
-		return -ENODEV;
 	if (try)
 		return 0;
 
-	auchan->chcr	= cfg->chcr;
-	auchan->slave_addr = slave_addr ? : cfg->dst;
+	auchan->chcr		= chcr;
+	auchan->slave_addr	= slave_addr ? : dst;
 
 	return 0;
 }
@@ -244,16 +259,39 @@ static void audmapp_chan_remove(struct audmapp_device *audev)
 	dma_dev->chancnt = 0;
 }
 
+static struct dma_chan *audmapp_of_xlate(struct of_phandle_args *dma_spec,
+					 struct of_dma *ofdma)
+{
+	dma_cap_mask_t mask;
+	struct dma_chan *chan;
+	u32 chcr = dma_spec->args[0];
+
+	if (dma_spec->args_count != 1)
+		return NULL;
+
+	dma_cap_zero(mask);
+	dma_cap_set(DMA_SLAVE, mask);
+
+	chan = dma_request_channel(mask, shdma_chan_filter, NULL);
+	if (chan)
+		to_shdma_chan(chan)->hw_req = chcr;
+
+	return chan;
+}
+
 static int audmapp_probe(struct platform_device *pdev)
 {
 	struct audmapp_pdata *pdata = pdev->dev.platform_data;
+	struct device_node *np = pdev->dev.of_node;
 	struct audmapp_device *audev;
 	struct shdma_dev *sdev;
 	struct dma_device *dma_dev;
 	struct resource *res;
 	int err, i;
 
-	if (!pdata)
+	if (np)
+		of_dma_controller_register(np, audmapp_of_xlate, pdev);
+	else if (!pdata)
 		return -ENODEV;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -315,12 +353,17 @@ static int audmapp_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id audmapp_of_match[] = {
+	{ .compatible = "renesas,rcar-audmapp", },
+};
+
 static struct platform_driver audmapp_driver = {
 	.probe		= audmapp_probe,
 	.remove		= audmapp_remove,
 	.driver		= {
 		.owner	= THIS_MODULE,
 		.name	= "rcar-audmapp-engine",
+		.of_match_table = audmapp_of_match,
 	},
 };
 module_platform_driver(audmapp_driver);
-- 
1.7.9.5

[PATCH 3/3] dma: rcar-audmapp: add DT support

[Simon Horman]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

This patch adds DT support to Audio DMAC peri peri driver.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
[horms+renesas@verge.net.au: Do not add trailing blank line to rcar-audmapp.txt]
[horms+renesas@verge.net.au: squashed patch to add NULL terminater to audmapp_of_match]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 .../devicetree/bindings/dma/rcar-audmapp.txt       | 29 +++++++++
 drivers/dma/sh/rcar-audmapp.c                      | 72 +++++++++++++++++-----
 2 files changed, 87 insertions(+), 14 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/dma/rcar-audmapp.txt

diff --git a/Documentation/devicetree/bindings/dma/rcar-audmapp.txt b/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
new file mode 100644
index 0000000..9f1d750
--- /dev/null
+++ b/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
@@ -0,0 +1,29 @@
+* R-Car Audio DMAC peri peri Device Tree bindings
+
+Required properties:
+- compatible:	should be "renesas,rcar-audmapp"
+- #dma-cells:	should be <1>, see "dmas" property below
+
+Example:
+	audmapp: audio-dma-pp@0xec740000 {
+		compatible = "renesas,rcar-audmapp";
+		#dma-cells = <1>;
+
+		reg = <0 0xec740000 0 0x200>;
+	};
+
+
+* DMA client
+
+Required properties:
+- dmas:		a list of <[DMA multiplexer phandle] [SRS/DRS value]> pairs,
+		where SRS/DRS values are fixed handles, specified in the SoC
+		manual as the value that would be written into the PDMACHCR.
+- dma-names:	a list of DMA channel names, one per "dmas" entry
+
+Example:
+
+	dmas = <&audmapp 0x2d00
+		&audmapp 0x3700>;
+	dma-names =  "src0_ssiu0",
+		     "dvc0_ssiu0";
diff --git a/drivers/dma/sh/rcar-audmapp.c b/drivers/dma/sh/rcar-audmapp.c
index dd00775..dabbf0a 100644
--- a/drivers/dma/sh/rcar-audmapp.c
+++ b/drivers/dma/sh/rcar-audmapp.c
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/dmaengine.h>
+#include <linux/of_dma.h>
 #include <linux/platform_data/dma-rcar-audmapp.h>
 #include <linux/platform_device.h>
 #include <linux/shdma-base.h>
@@ -63,6 +64,8 @@ struct audmapp_desc {
 	dma_addr_t dst;
 };
 
+#define to_shdma_chan(c) container_of(c, struct shdma_chan, dma_chan)
+
 #define to_chan(chan) container_of(chan, struct audmapp_chan, shdma_chan)
 #define to_desc(sdesc) container_of(sdesc, struct audmapp_desc, shdma_desc)
 #define to_dev(chan) container_of(chan->shdma_chan.dma_chan.device,	\
@@ -114,38 +117,50 @@ static void audmapp_start_xfer(struct shdma_chan *schan,
 	audmapp_write(auchan, chcr,	PDMACHCR);
 }
 
-static struct audmapp_slave_config *
-audmapp_find_slave(struct audmapp_chan *auchan, int slave_id)
+static void audmapp_get_config(struct audmapp_chan *auchan, int slave_id,
+			      u32 *chcr, dma_addr_t *dst)
 {
 	struct audmapp_device *audev = to_dev(auchan);
 	struct audmapp_pdata *pdata = audev->pdata;
 	struct audmapp_slave_config *cfg;
 	int i;
 
+	*chcr	= 0;
+	*dst	= 0;
+
+	if (!pdata) { /* DT */
+		*chcr = ((u32)slave_id) << 16;
+		auchan->shdma_chan.slave_id = (slave_id) >> 8;
+		return;
+	}
+
+	/* non-DT */
+
 	if (slave_id >= AUDMAPP_SLAVE_NUMBER)
-		return NULL;
+		return;
 
 	for (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++)
-		if (cfg->slave_id = slave_id)
-			return cfg;
-
-	return NULL;
+		if (cfg->slave_id = slave_id) {
+			*chcr	= cfg->chcr;
+			*dst	= cfg->dst;
+			break;
+		}
 }
 
 static int audmapp_set_slave(struct shdma_chan *schan, int slave_id,
 			     dma_addr_t slave_addr, bool try)
 {
 	struct audmapp_chan *auchan = to_chan(schan);
-	struct audmapp_slave_config *cfg -		audmapp_find_slave(auchan, slave_id);
+	u32 chcr;
+	dma_addr_t dst;
+
+	audmapp_get_config(auchan, slave_id, &chcr, &dst);
 
-	if (!cfg)
-		return -ENODEV;
 	if (try)
 		return 0;
 
-	auchan->chcr	= cfg->chcr;
-	auchan->slave_addr = slave_addr ? : cfg->dst;
+	auchan->chcr		= chcr;
+	auchan->slave_addr	= slave_addr ? : dst;
 
 	return 0;
 }
@@ -244,16 +259,39 @@ static void audmapp_chan_remove(struct audmapp_device *audev)
 	dma_dev->chancnt = 0;
 }
 
+static struct dma_chan *audmapp_of_xlate(struct of_phandle_args *dma_spec,
+					 struct of_dma *ofdma)
+{
+	dma_cap_mask_t mask;
+	struct dma_chan *chan;
+	u32 chcr = dma_spec->args[0];
+
+	if (dma_spec->args_count != 1)
+		return NULL;
+
+	dma_cap_zero(mask);
+	dma_cap_set(DMA_SLAVE, mask);
+
+	chan = dma_request_channel(mask, shdma_chan_filter, NULL);
+	if (chan)
+		to_shdma_chan(chan)->hw_req = chcr;
+
+	return chan;
+}
+
 static int audmapp_probe(struct platform_device *pdev)
 {
 	struct audmapp_pdata *pdata = pdev->dev.platform_data;
+	struct device_node *np = pdev->dev.of_node;
 	struct audmapp_device *audev;
 	struct shdma_dev *sdev;
 	struct dma_device *dma_dev;
 	struct resource *res;
 	int err, i;
 
-	if (!pdata)
+	if (np)
+		of_dma_controller_register(np, audmapp_of_xlate, pdev);
+	else if (!pdata)
 		return -ENODEV;
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -315,12 +353,18 @@ static int audmapp_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id audmapp_of_match[] = {
+	{ .compatible = "renesas,rcar-audmapp", },
+	{},
+};
+
 static struct platform_driver audmapp_driver = {
 	.probe		= audmapp_probe,
 	.remove		= audmapp_remove,
 	.driver		= {
 		.owner	= THIS_MODULE,
 		.name	= "rcar-audmapp-engine",
+		.of_match_table = audmapp_of_match,
 	},
 };
 module_platform_driver(audmapp_driver);
-- 
2.0.0

Re: [PATCH 3/3] dma: rcar-audmapp: add DT support

[Geert Uytterhoeven]

Hi Morimoto-san,

On Tue, Jul 15, 2014 at 12:51 PM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
> @@ -0,0 +1,29 @@

> +Required properties:
> +- dmas:                a list of <[DMA multiplexer phandle] [SRS/DRS value]> pairs,
> +               where SRS/DRS values are fixed handles, specified in the SoC
> +               manual as the value that would be written into the PDMACHCR.

I think this wording is a little bit confusing.
It's not the "value that would be written into the PDMACHCR", but the
high 16-bit
part of that value, cfr. the example and the actual code below.

An alternative way of saying this could be "SRS << 8 | DRS", which clearly
shows how to combine SRS and DRS.
Unlike the docs for SYS-DMAC, which contains a table of combined MID/RID
values,  the Audio DMAC-peri-peri docs contain 2 separate tables for SRS and
DRS values, so the DTS writer has to combine them manually.

> +- dma-names:   a list of DMA channel names, one per "dmas" entry
> +
> +Example:
> +
> +       dmas = <&audmapp 0x2d00
> +               &audmapp 0x3700>;
> +       dma-names =  "src0_ssiu0",
> +                    "dvc0_ssiu0";

> --- a/drivers/dma/sh/rcar-audmapp.c
> +++ b/drivers/dma/sh/rcar-audmapp.c

> @@ -114,38 +117,50 @@ static void audmapp_start_xfer(struct shdma_chan *schan,
>         audmapp_write(auchan, chcr,     PDMACHCR);
>  }
>
> -static struct audmapp_slave_config *
> -audmapp_find_slave(struct audmapp_chan *auchan, int slave_id)
> +static void audmapp_get_config(struct audmapp_chan *auchan, int slave_id,
> +                             u32 *chcr, dma_addr_t *dst)
>  {

> +       if (!pdata) { /* DT */
> +               *chcr = ((u32)slave_id) << 16;

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.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

Re: [PATCH 3/3] dma: rcar-audmapp: add DT support

[Kuninori Morimoto]

Hi Geert

> > +Required properties:
> > +- dmas:                a list of <[DMA multiplexer phandle] [SRS/DRS value]> pairs,
> > +               where SRS/DRS values are fixed handles, specified in the SoC
> > +               manual as the value that would be written into the PDMACHCR.
> 
> I think this wording is a little bit confusing.
> It's not the "value that would be written into the PDMACHCR", but the
> high 16-bit
> part of that value, cfr. the example and the actual code below.
> 
> An alternative way of saying this could be "SRS << 8 | DRS", which clearly
> shows how to combine SRS and DRS.
> Unlike the docs for SYS-DMAC, which contains a table of combined MID/RID
> values,  the Audio DMAC-peri-peri docs contain 2 separate tables for SRS and
> DRS values, so the DTS writer has to combine them manually.

Hmm... indeed
OK, I understand.
I fix it and send patch.

Best regards
---
Kuninori Morimoto

[PATCH] dt/bindings: rcar-audmapp: tidyup dmas explanation

[Kuninori Morimoto]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Current dmas explanation of SRC/DRS is confusable.
This patch clarifies it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 .../devicetree/bindings/dma/rcar-audmapp.txt       |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/dma/rcar-audmapp.txt b/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
index 9f1d750..61bca50 100644
--- a/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
+++ b/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
@@ -16,9 +16,9 @@ Example:
 * DMA client
 
 Required properties:
-- dmas:		a list of <[DMA multiplexer phandle] [SRS/DRS value]> pairs,
-		where SRS/DRS values are fixed handles, specified in the SoC
-		manual as the value that would be written into the PDMACHCR.
+- dmas:		a list of <[DMA multiplexer phandle] [SRS << 8 | DRS]> pairs.
+		where SRS/DRS are specified in the SoC manual.
+		It will be written into PDMACHCR as high 16-bit parts.
 - dma-names:	a list of DMA channel names, one per "dmas" entry
 
 Example:
-- 
1.7.9.5

Re: [PATCH] dt/bindings: rcar-audmapp: tidyup dmas explanation

[Geert Uytterhoeven]

On Tue, Aug 5, 2014 at 4:16 AM, Kuninori Morimoto
<kuninori.morimoto.gx@gmail.com> wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> Current dmas explanation of SRC/DRS is confusable.
> This patch clarifies it.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.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

Re: [PATCH] dt/bindings: rcar-audmapp: tidyup dmas explanation

[Simon Horman]

On Tue, Aug 05, 2014 at 08:56:14AM +0200, Geert Uytterhoeven wrote:
> On Tue, Aug 5, 2014 at 4:16 AM, Kuninori Morimoto
> <kuninori.morimoto.gx@gmail.com> wrote:
> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >
> > Current dmas explanation of SRC/DRS is confusable.
> > This patch clarifies it.
> >
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thanks, I have queued this up for v3.17 and plan to pass
it on to Vinod real-soon-now.

[PATCH] dt/bindings: rcar-audmapp: tidyup dmas explanation

[Simon Horman]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Current dmas explanation of SRC/DRS is confusable.
This patch clarifies it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 Documentation/devicetree/bindings/dma/rcar-audmapp.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/dma/rcar-audmapp.txt b/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
index 9f1d750..61bca50 100644
--- a/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
+++ b/Documentation/devicetree/bindings/dma/rcar-audmapp.txt
@@ -16,9 +16,9 @@ Example:
 * DMA client
 
 Required properties:
-- dmas:		a list of <[DMA multiplexer phandle] [SRS/DRS value]> pairs,
-		where SRS/DRS values are fixed handles, specified in the SoC
-		manual as the value that would be written into the PDMACHCR.
+- dmas:		a list of <[DMA multiplexer phandle] [SRS << 8 | DRS]> pairs.
+		where SRS/DRS are specified in the SoC manual.
+		It will be written into PDMACHCR as high 16-bit parts.
 - dma-names:	a list of DMA channel names, one per "dmas" entry
 
 Example:
-- 
2.0.1

Re: [PATCH] dt/bindings: rcar-audmapp: tidyup dmas explanation

[Vinod Koul]

On Wed, Aug 06, 2014 at 10:37:59AM +0900, Simon Horman wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> 
> Current dmas explanation of SRC/DRS is confusable.
> This patch clarifies it.

Applied, now

Thanks
-- 
~Vinod

Re: [PATCH 0/3] dma: rcar-audmapp: add DT support

[Simon Horman]

Hi Morimoto-san,

in order to try and create a smoother path for changes in this area to land
I have pushed them to the rcar-audmapp-for-v3.17 branch of my renesas tree
on kernel.org. It is merged into the devel and next branches of that tree
and should appear in linux-next in the near future.

My intention is to send a pull-request for this branch once it has sat
in next for a short time. I hope that this approach is useful to all parties.

On Wed, Jun 18, 2014 at 01:58:41AM -0700, Kuninori Morimoto wrote:
> 
> Hi Vinod
> 
> These patches add DT support to Renesas Audio DMAC peri peri driver.
> 
> Kuninori Morimoto (3):
>       dma: rcar-audmapp: enable .set_slave
>       dma: rcar-audmapp: don't keep audmapp_slave_config for each channeles
>       dma: rcar-audmapp: add DT support
> 
>  .../devicetree/bindings/dma/rcar-audmapp.txt       |   30 ++++++
>  drivers/dma/sh/rcar-audmapp.c                      |  113 ++++++++++++++------
>  2 files changed, 113 insertions(+), 30 deletions(-)
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 0/3] dma: rcar-audmapp: add DT support

[Kuninori Morimoto]

Hi Simon

Thank you for your hard work.
It is very helpful for me/us !

> in order to try and create a smoother path for changes in this area to land
> I have pushed them to the rcar-audmapp-for-v3.17 branch of my renesas tree
> on kernel.org. It is merged into the devel and next branches of that tree
> and should appear in linux-next in the near future.
> 
> My intention is to send a pull-request for this branch once it has sat
> in next for a short time. I hope that this approach is useful to all parties.
> 
> On Wed, Jun 18, 2014 at 01:58:41AM -0700, Kuninori Morimoto wrote:
> > 
> > Hi Vinod
> > 
> > These patches add DT support to Renesas Audio DMAC peri peri driver.
> > 
> > Kuninori Morimoto (3):
> >       dma: rcar-audmapp: enable .set_slave
> >       dma: rcar-audmapp: don't keep audmapp_slave_config for each channeles
> >       dma: rcar-audmapp: add DT support
> > 
> >  .../devicetree/bindings/dma/rcar-audmapp.txt       |   30 ++++++
> >  drivers/dma/sh/rcar-audmapp.c                      |  113 ++++++++++++++------
> >  2 files changed, 113 insertions(+), 30 deletions(-)
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html


Best regards
---
Kuninori Morimoto