| Message ID | 1397511312-4845-10-git-send-email-ben.dooks@codethink.co.uk (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Paul Mundt |
| Headers | show |
Hello. On 15-04-2014 1:35, Ben Dooks wrote: > Add support for R8A7790 with new device tree code. > Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> > --- > drivers/dma/sh/shdmac.c | 32 +++++++++++++++++++++++++------- > 1 file changed, 25 insertions(+), 7 deletions(-) > diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c > index 0d765c0..eb57cf2 100644 > --- a/drivers/dma/sh/shdmac.c > +++ b/drivers/dma/sh/shdmac.c > @@ -342,11 +342,21 @@ static const struct sh_dmae_slave_config *dmae_find_slave( > if (cfg->slave_id == match) > return cfg; > } else { > - for (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++) > - if (cfg->mid_rid == match) { > + if (!pdata->slave) { > + cfg = shdma_find_slave_of(shdev, match, &i); > + if (cfg) { > sh_chan->shdma_chan.slave_id = i; > return cfg; > } > + > + return NULL; > + } else All arms of the *if* statement should have {} if at least one arm has {}. > + for (i = 0, cfg = pdata->slave; i < pdata->slave_num; > + i++, cfg++) > + if (cfg->mid_rid == match) { > + sh_chan->shdma_chan.slave_id = i; > + return cfg; > + } > } > > return NULL; WBR, Sergei -- 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
Hi Ben Thank you for your patch > Add support for R8A7790 with new device tree code. > > Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> > --- (snip) > static const struct of_device_id sh_dmae_of_match[] = { > - {.compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid,}, > + { .compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid }, > + { .compatible = "renesas,dma-r8a7790", .data = &shdma_arm_info }, > {} > }; Here, new compatible name is "renesas,dma-r8a7790" ~~~ > + sysdma0: dma-controller@e6700000 { > + compatible = "renesas,shdma-r8a7790"; .. > + sysdma1: dma-controller@e6720000 { > + compatible = "renesas,shdma-r8a7790"; your [PATCH v2 3/9] ARM: shmobile: r8a7790: add dmac0 dmac1 nodes is using "renesas,shdma-r8a7790" ~~~~~ Is it miss/typo ? -- 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
On 18/04/14 02:32, Kuninori Morimoto wrote: > > Hi Ben > > Thank you for your patch > >> Add support for R8A7790 with new device tree code. >> >> Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> >> --- > (snip) >> static const struct of_device_id sh_dmae_of_match[] = { >> - {.compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid,}, >> + { .compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid }, >> + { .compatible = "renesas,dma-r8a7790", .data = &shdma_arm_info }, >> {} >> }; > > Here, new compatible name is "renesas,dma-r8a7790" > ~~~ > >> + sysdma0: dma-controller@e6700000 { >> + compatible = "renesas,shdma-r8a7790"; > .. >> + sysdma1: dma-controller@e6720000 { >> + compatible = "renesas,shdma-r8a7790"; > > your [PATCH v2 3/9] ARM: shmobile: r8a7790: add dmac0 dmac1 nodes > is using "renesas,shdma-r8a7790" > ~~~~~ > > Is it miss/typo ? I think it is a missed rebase, I will be away until next week so will check this out when I get back.
diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index 0d765c0..eb57cf2 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c @@ -342,11 +342,21 @@ static const struct sh_dmae_slave_config *dmae_find_slave( if (cfg->slave_id == match) return cfg; } else { - for (i = 0, cfg = pdata->slave; i < pdata->slave_num; i++, cfg++) - if (cfg->mid_rid == match) { + if (!pdata->slave) { + cfg = shdma_find_slave_of(shdev, match, &i); + if (cfg) { sh_chan->shdma_chan.slave_id = i; return cfg; } + + return NULL; + } else + for (i = 0, cfg = pdata->slave; i < pdata->slave_num; + i++, cfg++) + if (cfg->mid_rid == match) { + sh_chan->shdma_chan.slave_id = i; + return cfg; + } } return NULL; @@ -677,7 +687,8 @@ static const struct shdma_ops sh_dmae_shdma_ops = { }; static const struct of_device_id sh_dmae_of_match[] = { - {.compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid,}, + { .compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid }, + { .compatible = "renesas,dma-r8a7790", .data = &shdma_arm_info }, {} }; MODULE_DEVICE_TABLE(of, sh_dmae_of_match); @@ -693,10 +704,17 @@ static int sh_dmae_probe(struct platform_device *pdev) struct dma_device *dma_dev; struct resource *chan, *dmars, *errirq_res, *chanirq_res; - if (pdev->dev.of_node) - pdata = of_match_device(sh_dmae_of_match, &pdev->dev)->data; - else + if (pdev->dev.of_node) { + const struct of_device_id *match; + + match = of_match_device(sh_dmae_of_match, &pdev->dev); + if (match->data == r8a73a4_shdma_devid) + pdata = match->data; + else + pdata = sh_dma_probe_of(pdev, match); + } else { pdata = dev_get_platdata(&pdev->dev); + } /* get platform data */ if (!pdata || !pdata->channel_num) @@ -745,7 +763,7 @@ static int sh_dmae_probe(struct platform_device *pdev) if (!pdata->slave_only) dma_cap_set(DMA_MEMCPY, dma_dev->cap_mask); - if (pdata->slave && pdata->slave_num) + if ((pdata->slave && pdata->slave_num) || pdev->dev.of_node) dma_cap_set(DMA_SLAVE, dma_dev->cap_mask); /* Default transfer size of 32 bytes requires 32-byte alignment */
Add support for R8A7790 with new device tree code. Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk> --- drivers/dma/sh/shdmac.c | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-)