[PATCH v3 0/2] ARM: shmobile: r8a7790: add thermal driver support

[PATCH v3 0/2] ARM: shmobile: r8a7790: add thermal driver support

[Simon Horman]

This short series enables the thermal driver on the r8a7790 SoC
and thus the lager board.

It is based on renesas-next-20130620

v3
* Correct title of clocks patch to refer to r8a7790

v2
* Add clocks patch

Simon Horman (2):
  ARM: shmobile: r8a7790: add clocks for thermal
  ARM: shmobile: r8a7790: add thermal driver support

 arch/arm/mach-shmobile/clock-r8a7790.c |  4 ++++
 arch/arm/mach-shmobile/setup-r8a7790.c | 12 ++++++++++++
 2 files changed, 16 insertions(+)

-- 
1.8.2.1

[PATCH v3 1/2] ARM: shmobile: r8a7790: add clocks for thermal

[Simon Horman]

Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

---

v3
* Correct title to refer to r8a7790

v2
* First post
---
 arch/arm/mach-shmobile/clock-r8a7790.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index 5d71313..28eccd1 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -49,6 +49,7 @@
 
 #define SMSTPCR2 0xe6150138
 #define SMSTPCR3 0xe615013c
+#define SMSTPCR5 0xe6150144
 #define SMSTPCR7 0xe615014c
 
 #define MODEMR		0xE6160060
@@ -182,6 +183,7 @@ static struct clk div6_clks[DIV6_NR] = {
 enum {
 	MSTP721, MSTP720,
 	MSTP717, MSTP716,
+	MSTP522,
 	MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
 	MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
 	MSTP_NR
@@ -203,6 +205,7 @@ static struct clk mstp_clks[MSTP_NR] = {
 	[MSTP204] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 4, 0), /* SCIFA0 */
 	[MSTP203] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 3, 0), /* SCIFA1 */
 	[MSTP202] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 2, 0), /* SCIFA2 */
+	[MSTP522] = SH_CLK_MSTP32(&extal_clk, SMSTPCR5, 22, 0), /* Thermal */
 	[MSTP717] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 17, 0), /* HSCIF0 */
 	[MSTP716] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 16, 0), /* HSCIF1 */
 };
@@ -254,6 +257,7 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]),
 	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
 	CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
+	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
 	CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]),
 	CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
 	CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]),
-- 
1.8.2.1

[PATCH V3 1/2] ARM: shmobile: r8a7790: Add VIN clock support

[Valentine Barshak]

This adds VIN[0-3] clock support to R8A7790 SoC.

Changes in V2:
* none.

Changes in V3:
* capitalized ARM in the subject.

Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
---
 arch/arm/mach-shmobile/clock-r8a7790.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index c5c60ec..81f45a0 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -188,6 +188,7 @@ enum {
 	MSTP931, MSTP930, MSTP929, MSTP928,
 	MSTP917,
 	MSTP813,
+	MSTP811, MSTP810, MSTP809, MSTP808,
 	MSTP726, MSTP725, MSTP724, MSTP723, MSTP722, MSTP721, MSTP720,
 	MSTP717, MSTP716,
 	MSTP704,
@@ -216,6 +217,10 @@ static struct clk mstp_clks[MSTP_NR] = {
 	[MSTP928] = SH_CLK_MSTP32(&p_clk, SMSTPCR9, 28, 0), /* I2C3 */
 	[MSTP917] = SH_CLK_MSTP32(&qspi_clk, SMSTPCR9, 17, 0), /* QSPI */
 	[MSTP813] = SH_CLK_MSTP32(&p_clk, SMSTPCR8, 13, 0), /* Ether */
+	[MSTP811] = SH_CLK_MSTP32(&zg_clk, SMSTPCR8, 11, 0), /* VIN0 */
+	[MSTP810] = SH_CLK_MSTP32(&zg_clk, SMSTPCR8, 10, 0), /* VIN1 */
+	[MSTP809] = SH_CLK_MSTP32(&zg_clk, SMSTPCR8,  9, 0), /* VIN2 */
+	[MSTP808] = SH_CLK_MSTP32(&zg_clk, SMSTPCR8,  8, 0), /* VIN3 */
 	[MSTP726] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 26, 0), /* LVDS0 */
 	[MSTP725] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 25, 0), /* LVDS1 */
 	[MSTP724] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 24, 0), /* DU0 */
@@ -300,6 +305,10 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]),
 	CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP928]),
 	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
+	CLKDEV_DEV_ID("r8a7790-vin.0", &mstp_clks[MSTP811]),
+	CLKDEV_DEV_ID("r8a7790-vin.1", &mstp_clks[MSTP810]),
+	CLKDEV_DEV_ID("r8a7790-vin.2", &mstp_clks[MSTP809]),
+	CLKDEV_DEV_ID("r8a7790-vin.3", &mstp_clks[MSTP808]),
 	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),
 	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
 	CLKDEV_DEV_ID("ee200000.mmc", &mstp_clks[MSTP315]),
-- 
1.8.3.1

Re: [PATCH V3 1/2] ARM: shmobile: r8a7790: Add VIN clock support

[Simon Horman]

On Fri, Dec 27, 2013 at 03:44:03PM +0400, Valentine Barshak wrote:
> This adds VIN[0-3] clock support to R8A7790 SoC.
> 
> Changes in V2:
> * none.
> 
> Changes in V3:
> * capitalized ARM in the subject.
> 
> Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>

Thanks, I will queue this up.

Re: [PATCH V3 1/2] ARM: shmobile: r8a7790: Add VIN clock support

[Simon Horman]

On Fri, Dec 27, 2013 at 03:44:03PM +0400, Valentine Barshak wrote:
> This adds VIN[0-3] clock support to R8A7790 SoC.
> 
> Changes in V2:
> * none.
> 
> Changes in V3:
> * capitalized ARM in the subject.
> 
> Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
> ---
>  arch/arm/mach-shmobile/clock-r8a7790.c | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
> index c5c60ec..81f45a0 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> @@ -188,6 +188,7 @@ enum {
>  	MSTP931, MSTP930, MSTP929, MSTP928,
>  	MSTP917,
>  	MSTP813,
> +	MSTP811, MSTP810, MSTP809, MSTP808,
>  	MSTP726, MSTP725, MSTP724, MSTP723, MSTP722, MSTP721, MSTP720,
>  	MSTP717, MSTP716,
>  	MSTP704,
> @@ -216,6 +217,10 @@ static struct clk mstp_clks[MSTP_NR] = {
>  	[MSTP928] = SH_CLK_MSTP32(&p_clk, SMSTPCR9, 28, 0), /* I2C3 */
>  	[MSTP917] = SH_CLK_MSTP32(&qspi_clk, SMSTPCR9, 17, 0), /* QSPI */
>  	[MSTP813] = SH_CLK_MSTP32(&p_clk, SMSTPCR8, 13, 0), /* Ether */
> +	[MSTP811] = SH_CLK_MSTP32(&zg_clk, SMSTPCR8, 11, 0), /* VIN0 */
> +	[MSTP810] = SH_CLK_MSTP32(&zg_clk, SMSTPCR8, 10, 0), /* VIN1 */
> +	[MSTP809] = SH_CLK_MSTP32(&zg_clk, SMSTPCR8,  9, 0), /* VIN2 */
> +	[MSTP808] = SH_CLK_MSTP32(&zg_clk, SMSTPCR8,  8, 0), /* VIN3 */
>  	[MSTP726] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 26, 0), /* LVDS0 */
>  	[MSTP725] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 25, 0), /* LVDS1 */
>  	[MSTP724] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 24, 0), /* DU0 */
> @@ -300,6 +305,10 @@ static struct clk_lookup lookups[] = {
>  	CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]),
>  	CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP928]),
>  	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
> +	CLKDEV_DEV_ID("r8a7790-vin.0", &mstp_clks[MSTP811]),
> +	CLKDEV_DEV_ID("r8a7790-vin.1", &mstp_clks[MSTP810]),
> +	CLKDEV_DEV_ID("r8a7790-vin.2", &mstp_clks[MSTP809]),
> +	CLKDEV_DEV_ID("r8a7790-vin.3", &mstp_clks[MSTP808]),
>  	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),
>  	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
>  	CLKDEV_DEV_ID("ee200000.mmc", &mstp_clks[MSTP315]),

Unfortunately this patch conflicts with "ARM: shmobile: r8a7790: Wait for
status on all MSTP clocks" which I have queued up as a fix for v3.14.

As this patch will be submitted for inclusion on v3.15 it will be in a
branch based on v3.14-rc1 which I expect to include (""ARM: shmobile:
r8a7790: Wait for status on all MSTP clocks").

Rather than risk messing up doing the non-trivial rebase of this
patch myself I have dropped this patch. Could you please rebase it
on top of the latest devel tag of the renesas tree, currently
renesas-devel-v3.13-rc7-20140108.

Re: [PATCH V3 1/2] ARM: shmobile: r8a7790: Add VIN clock support

[Valentine]

On 01/08/2014 08:17 AM, Simon Horman wrote:
> On Fri, Dec 27, 2013 at 03:44:03PM +0400, Valentine Barshak wrote:
>> This adds VIN[0-3] clock support to R8A7790 SoC.
>>
>> Changes in V2:
>> * none.
>>
>> Changes in V3:
>> * capitalized ARM in the subject.
>>
>> Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
>> ---
>>   arch/arm/mach-shmobile/clock-r8a7790.c | 9 +++++++++
>>   1 file changed, 9 insertions(+)
>>
>> diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
>> index c5c60ec..81f45a0 100644
>> --- a/arch/arm/mach-shmobile/clock-r8a7790.c
>> +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
>> @@ -188,6 +188,7 @@ enum {
>>   	MSTP931, MSTP930, MSTP929, MSTP928,
>>   	MSTP917,
>>   	MSTP813,
>> +	MSTP811, MSTP810, MSTP809, MSTP808,
>>   	MSTP726, MSTP725, MSTP724, MSTP723, MSTP722, MSTP721, MSTP720,
>>   	MSTP717, MSTP716,
>>   	MSTP704,
>> @@ -216,6 +217,10 @@ static struct clk mstp_clks[MSTP_NR] = {
>>   	[MSTP928] = SH_CLK_MSTP32(&p_clk, SMSTPCR9, 28, 0), /* I2C3 */
>>   	[MSTP917] = SH_CLK_MSTP32(&qspi_clk, SMSTPCR9, 17, 0), /* QSPI */
>>   	[MSTP813] = SH_CLK_MSTP32(&p_clk, SMSTPCR8, 13, 0), /* Ether */
>> +	[MSTP811] = SH_CLK_MSTP32(&zg_clk, SMSTPCR8, 11, 0), /* VIN0 */
>> +	[MSTP810] = SH_CLK_MSTP32(&zg_clk, SMSTPCR8, 10, 0), /* VIN1 */
>> +	[MSTP809] = SH_CLK_MSTP32(&zg_clk, SMSTPCR8,  9, 0), /* VIN2 */
>> +	[MSTP808] = SH_CLK_MSTP32(&zg_clk, SMSTPCR8,  8, 0), /* VIN3 */
>>   	[MSTP726] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 26, 0), /* LVDS0 */
>>   	[MSTP725] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 25, 0), /* LVDS1 */
>>   	[MSTP724] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 24, 0), /* DU0 */
>> @@ -300,6 +305,10 @@ static struct clk_lookup lookups[] = {
>>   	CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]),
>>   	CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP928]),
>>   	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
>> +	CLKDEV_DEV_ID("r8a7790-vin.0", &mstp_clks[MSTP811]),
>> +	CLKDEV_DEV_ID("r8a7790-vin.1", &mstp_clks[MSTP810]),
>> +	CLKDEV_DEV_ID("r8a7790-vin.2", &mstp_clks[MSTP809]),
>> +	CLKDEV_DEV_ID("r8a7790-vin.3", &mstp_clks[MSTP808]),
>>   	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),
>>   	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
>>   	CLKDEV_DEV_ID("ee200000.mmc", &mstp_clks[MSTP315]),
>
> Unfortunately this patch conflicts with "ARM: shmobile: r8a7790: Wait for
> status on all MSTP clocks" which I have queued up as a fix for v3.14.
>
> As this patch will be submitted for inclusion on v3.15 it will be in a
> branch based on v3.14-rc1 which I expect to include (""ARM: shmobile:
> r8a7790: Wait for status on all MSTP clocks").
>
> Rather than risk messing up doing the non-trivial rebase of this
> patch myself I have dropped this patch. Could you please rebase it
> on top of the latest devel tag of the renesas tree, currently
> renesas-devel-v3.13-rc7-20140108.

If you don't mind, I'll split out and bundle all the clock-related patches up in one series.
This includes VIN, USB host, SATA clocks.
Clocks do not depend on anything else and can be applied with no harm even if the
driver that needs them is still pending. Besides, it should minimize possible conflicts.

Thanks,
Val.

> --
> 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
>

[PATCH v3 2/2] ARM: shmobile: r8a7790: add thermal driver support

[Simon Horman]

The current temperature may be read using:
cat /sys/class/thermal/thermal_zone0/temp

Based on similar work for the r8a73a4 by Kuninori Morimoto.

Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm/mach-shmobile/setup-r8a7790.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 28f9475..06c720f 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -149,6 +149,17 @@ static struct resource irqc0_resources[] __initdata = {
 					  &irqc##idx##_data,		\
 					  sizeof(struct renesas_irqc_config))
 
+static struct resource thermal_resources[] __initdata = {
+	DEFINE_RES_MEM(0xe61f0000, 0x14),
+	DEFINE_RES_MEM(0xe61f0100, 0x38),
+	DEFINE_RES_IRQ(gic_spi(69)),
+};
+
+#define r8a7790_register_thermal()					\
+	platform_device_register_simple("rcar_thermal", -1,		\
+					thermal_resources,		\
+					ARRAY_SIZE(thermal_resources))
+
 void __init r8a7790_add_standard_devices(void)
 {
 	r8a7790_register_scif(SCIFA0);
@@ -162,6 +173,7 @@ void __init r8a7790_add_standard_devices(void)
 	r8a7790_register_scif(HSCIF0);
 	r8a7790_register_scif(HSCIF1);
 	r8a7790_register_irqc(0);
+	r8a7790_register_thermal();
 }
 
 void __init r8a7790_timer_init(void)
-- 
1.8.2.1

Re: [PATCH v3 0/2] ARM: shmobile: r8a7790: add thermal driver support

[Kuninori Morimoto]

Hi Simon

> This short series enables the thermal driver on the r8a7790 SoC
> and thus the lager board.
> 
> It is based on renesas-next-20130620
> 
> v3
> * Correct title of clocks patch to refer to r8a7790
> 
> v2
> * Add clocks patch
> 
> Simon Horman (2):
>   ARM: shmobile: r8a7790: add clocks for thermal
>   ARM: shmobile: r8a7790: add thermal driver support
> 
>  arch/arm/mach-shmobile/clock-r8a7790.c |  4 ++++
>  arch/arm/mach-shmobile/setup-r8a7790.c | 12 ++++++++++++
>  2 files changed, 16 insertions(+)

For all patches

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>



Best regards
---
Kuninori Morimoto

Re: [PATCH v3 0/2] ARM: shmobile: r8a7790: add thermal driver support

[Simon Horman]

On Wed, Jun 26, 2013 at 10:41:43PM -0700, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> > This short series enables the thermal driver on the r8a7790 SoC
> > and thus the lager board.
> > 
> > It is based on renesas-next-20130620
> > 
> > v3
> > * Correct title of clocks patch to refer to r8a7790
> > 
> > v2
> > * Add clocks patch
> > 
> > Simon Horman (2):
> >   ARM: shmobile: r8a7790: add clocks for thermal
> >   ARM: shmobile: r8a7790: add thermal driver support
> > 
> >  arch/arm/mach-shmobile/clock-r8a7790.c |  4 ++++
> >  arch/arm/mach-shmobile/setup-r8a7790.c | 12 ++++++++++++
> >  2 files changed, 16 insertions(+)
> 
> For all patches
> 
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Thanks, I have queued these up for v3.12 in the soc branch.

[PATCH v3 0/2] ARM: shmobile: r8a7790: add for USB-DMAC

[Yoshihiro Shimoda]

This patch set is based on renesas.git / renesas-devel-20150507-v4.1-rc1
tag. (commit id = c3059b3fff4ed6568783fdabdee1d62a55aa469c)

This patch set is related to the usb-dmac driver and renesas_usbhs driver.
Almost all patches for the drivers have been merged in Linus tree.
And a fixed patch for renesas_usbhs driver have beed merged in the subsystem:

[ linux repository ]
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/dma/sh/usb-dmac.c?id\f1c8ff32fa29e425b4938934c21afdb81104431
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/dma/sh/usb-dmac.c?id×d8e892aa6fe280a2e2974d9fd1ec9253ee1a05
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/usb/renesas_usbhs?idz96b78464bd8ba72c1c3095c543c1402db59e35
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/usb/renesas_usbhs?id›53d9af7aac09cf249d72bfbf15f08e47c4f7fe
https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/usb/renesas_usbhs?id«330cf3888d8e0779fa05a243d53ba9f53a7ba9

[ usb repository ]
https://git.kernel.org/cgit/linux/kernel/git/balbi/usb.git/commit/?h=testing/next&idZ294e5469891d0701183049c4a9678887fa7091

Changes from v2:
 - Add "Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>" in patch 1.
 - Change dma-names in patch 2.

Changes from v1:
 - Rebase the latest renesas-devel tag.

Yoshihiro Shimoda (2):
  ARM: shmobile: r8a7790: add USB-DMAC device nodes
  ARM: shmobile: r8a7790: Enable DMA for HSUSB

 arch/arm/boot/dts/r8a7790.dtsi | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

-- 
1.9.1

[PATCH v3 1/2] ARM: shmobile: r8a7790: add USB-DMAC device nodes

[Yoshihiro Shimoda]

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/boot/dts/r8a7790.dtsi | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index c9055e3..c03a915 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -371,6 +371,28 @@
 		dma-channels = <13>;
 	};
 
+	usb_dmac0: dma-controller@e65a0000 {
+		compatible = "renesas,usb-dmac";
+		reg = <0 0xe65a0000 0 0x100>;
+		interrupts = <0 109 IRQ_TYPE_LEVEL_HIGH
+			      0 109 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "ch0", "ch1";
+		clocks = <&mstp3_clks R8A7790_CLK_USBDMAC0>;
+		#dma-cells = <1>;
+		dma-channels = <2>;
+	};
+
+	usb_dmac1: dma-controller@e65b0000 {
+		compatible = "renesas,usb-dmac";
+		reg = <0 0xe65b0000 0 0x100>;
+		interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH
+			      0 110 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "ch0", "ch1";
+		clocks = <&mstp3_clks R8A7790_CLK_USBDMAC1>;
+		#dma-cells = <1>;
+		dma-channels = <2>;
+	};
+
 	i2c0: i2c@e6508000 {
 		#address-cells = <1>;
 		#size-cells = <0>;
-- 
1.9.1

[PATCH v3 2/2] ARM: shmobile: r8a7790: Enable DMA for HSUSB

[Yoshihiro Shimoda]

This patch adds DMA properties to the HSUSB node.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 arch/arm/boot/dts/r8a7790.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index c03a915..62a9086 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -673,6 +673,9 @@
 		renesas,buswait = <4>;
 		phys = <&usb0 1>;
 		phy-names = "usb";
+		dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
+		       <&usb_dmac1 0>, <&usb_dmac1 1>;
+		dma-names = "ch0", "ch1", "ch2", "ch3";
 		status = "disabled";
 	};
 
-- 
1.9.1

Re: [PATCH v3 0/2] ARM: shmobile: r8a7790: add for USB-DMAC

[Simon Horman]

On Fri, May 08, 2015 at 04:13:05PM +0900, Yoshihiro Shimoda wrote:
> This patch set is based on renesas.git / renesas-devel-20150507-v4.1-rc1
> tag. (commit id = c3059b3fff4ed6568783fdabdee1d62a55aa469c)
> 
> This patch set is related to the usb-dmac driver and renesas_usbhs driver.
> Almost all patches for the drivers have been merged in Linus tree.
> And a fixed patch for renesas_usbhs driver have beed merged in the subsystem:
> 
> [ linux repository ]
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/dma/sh/usb-dmac.c?id\f1c8ff32fa29e425b4938934c21afdb81104431
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/dma/sh/usb-dmac.c?id×d8e892aa6fe280a2e2974d9fd1ec9253ee1a05
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/usb/renesas_usbhs?idz96b78464bd8ba72c1c3095c543c1402db59e35
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/usb/renesas_usbhs?id›53d9af7aac09cf249d72bfbf15f08e47c4f7fe
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/usb/renesas_usbhs?id«330cf3888d8e0779fa05a243d53ba9f53a7ba9
> 
> [ usb repository ]
> https://git.kernel.org/cgit/linux/kernel/git/balbi/usb.git/commit/?h=testing/next&idZ294e5469891d0701183049c4a9678887fa7091

Thanks, I have queued these up for v4.2.