* [PATCH 5/8] shdmac: fdt: wire r8a7790 for device tree usage.
@ 2014-06-04 16:14 Ben Dooks
2014-06-05 8:16 ` Kuninori Morimoto
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Ben Dooks @ 2014-06-04 16:14 UTC (permalink / raw)
To: linux-sh
Add support for R8A7790 with new device tree code
Note, not yet converted the only other user to dt yet
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
drivers/dma/sh/shdmac.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
index 146d5df..e525f80 100644
--- a/drivers/dma/sh/shdmac.c
+++ b/drivers/dma/sh/shdmac.c
@@ -680,7 +680,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);
@@ -699,10 +700,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)
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 5/8] shdmac: fdt: wire r8a7790 for device tree usage.
2014-06-04 16:14 [PATCH 5/8] shdmac: fdt: wire r8a7790 for device tree usage Ben Dooks
@ 2014-06-05 8:16 ` Kuninori Morimoto
2014-06-05 9:57 ` Ben Dooks
2014-06-05 10:09 ` Kuninori Morimoto
2 siblings, 0 replies; 4+ messages in thread
From: Kuninori Morimoto @ 2014-06-05 8:16 UTC (permalink / raw)
To: linux-sh
Hi Ben
> Add support for R8A7790 with new device tree code
>
> Note, not yet converted the only other user to dt yet
>
> 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 },
> {}
> };
renesas,shdma-r8a7790 ?
renesas,dma-r8a7790 ?
Is this typo ? or on purpose ?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 5/8] shdmac: fdt: wire r8a7790 for device tree usage.
2014-06-04 16:14 [PATCH 5/8] shdmac: fdt: wire r8a7790 for device tree usage Ben Dooks
2014-06-05 8:16 ` Kuninori Morimoto
@ 2014-06-05 9:57 ` Ben Dooks
2014-06-05 10:09 ` Kuninori Morimoto
2 siblings, 0 replies; 4+ messages in thread
From: Ben Dooks @ 2014-06-05 9:57 UTC (permalink / raw)
To: linux-sh
On 05/06/14 09:16, Kuninori Morimoto wrote:
>
> Hi Ben
>
>> Add support for R8A7790 with new device tree code
>>
>> Note, not yet converted the only other user to dt yet
>>
>> 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 },
>> {}
>> };
>
> renesas,shdma-r8a7790 ?
> renesas,dma-r8a7790 ?
>
> Is this typo ? or on purpose ?
Thanks for the feedback.
I thought dma was a pretty good description. Do we need to call this
shdma-r8a7790?
--
Ben Dooks http://www.codethink.co.uk/
Senior Engineer Codethink - Providing Genius
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 5/8] shdmac: fdt: wire r8a7790 for device tree usage.
2014-06-04 16:14 [PATCH 5/8] shdmac: fdt: wire r8a7790 for device tree usage Ben Dooks
2014-06-05 8:16 ` Kuninori Morimoto
2014-06-05 9:57 ` Ben Dooks
@ 2014-06-05 10:09 ` Kuninori Morimoto
2 siblings, 0 replies; 4+ messages in thread
From: Kuninori Morimoto @ 2014-06-05 10:09 UTC (permalink / raw)
To: linux-sh
Hi Ben
> >> 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 },
> >> {}
> >> };
> >
> > renesas,shdma-r8a7790 ?
> > renesas,dma-r8a7790 ?
> >
> > Is this typo ? or on purpose ?
>
> Thanks for the feedback.
>
> I thought dma was a pretty good description. Do we need to call this
> shdma-r8a7790?
I'm not sure, but historically we called it as "shdma".
Renesas SoC has many DMACs, not only SYS-DMAC.
Maybe, this is natural ?
SYS-DMAC -> shdma
USB-DMAC -> usbdma
SU-DMAC -> sudma
...
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-06-05 10:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-06-04 16:14 [PATCH 5/8] shdmac: fdt: wire r8a7790 for device tree usage Ben Dooks
2014-06-05 8:16 ` Kuninori Morimoto
2014-06-05 9:57 ` Ben Dooks
2014-06-05 10:09 ` Kuninori Morimoto
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.