linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support
@ 2013-11-29  3:02 Kuninori Morimoto
  2013-11-29 17:32 ` Laurent Pinchart
                   ` (8 more replies)
  0 siblings, 9 replies; 10+ messages in thread
From: Kuninori Morimoto @ 2013-11-29  3:02 UTC (permalink / raw)
  To: linux-sh

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm/mach-shmobile/clock-r8a7790.c |    4 ++++
 arch/arm/mach-shmobile/setup-r8a7790.c |   25 +++++++++++++++++++++++++
 2 files changed, 29 insertions(+)

diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index 7960dc0..cf6dd7f 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -277,9 +277,13 @@ static struct clk_lookup lookups[] = {
 	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
 	CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
 	CLKDEV_DEV_ID("e6508000.i2c", &mstp_clks[MSTP931]),
+	CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP931]),
 	CLKDEV_DEV_ID("e6518000.i2c", &mstp_clks[MSTP930]),
+	CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP930]),
 	CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]),
+	CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP929]),
 	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("e61f0000.thermal", &mstp_clks[MSTP522]),
 	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 3543c3b..8474818 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -67,6 +67,27 @@ R8A7790_GPIO(5);
 		&r8a7790_gpio##idx##_platform_data,			\
 		sizeof(r8a7790_gpio##idx##_platform_data))
 
+static struct resource i2c_resources[] __initdata = {
+	/* I2C0 */
+	DEFINE_RES_MEM(0xE6508000, 0x40),
+	DEFINE_RES_IRQ(gic_spi(287)),
+	/* I2C1 */
+	DEFINE_RES_MEM(0xE6518000, 0x40),
+	DEFINE_RES_IRQ(gic_spi(288)),
+	/* I2C2 */
+	DEFINE_RES_MEM(0xE6530000, 0x40),
+	DEFINE_RES_IRQ(gic_spi(286)),
+	/* I2C3 */
+	DEFINE_RES_MEM(0xE6540000, 0x40),
+	DEFINE_RES_IRQ(gic_spi(290)),
+
+};
+
+#define r8a7790_register_i2c(idx)		\
+	platform_device_register_simple(	\
+		"i2c-rcar", idx,		\
+		i2c_resources + (2 * idx), 2);	\
+
 void __init r8a7790_pinmux_init(void)
 {
 	r8a7790_register_pfc();
@@ -76,6 +97,10 @@ void __init r8a7790_pinmux_init(void)
 	r8a7790_register_gpio(3);
 	r8a7790_register_gpio(4);
 	r8a7790_register_gpio(5);
+	r8a7790_register_i2c(0);
+	r8a7790_register_i2c(1);
+	r8a7790_register_i2c(2);
+	r8a7790_register_i2c(3);
 }
 
 #define SCIF_COMMON(scif_type, baseaddr, irq)			\
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support
  2013-11-29  3:02 [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support Kuninori Morimoto
@ 2013-11-29 17:32 ` Laurent Pinchart
  2013-12-02  1:32 ` Kuninori Morimoto
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Laurent Pinchart @ 2013-11-29 17:32 UTC (permalink / raw)
  To: linux-sh

Hi Morimoto-san,

Thank you for the patch.

On Thursday 28 November 2013 19:02:12 Kuninori Morimoto wrote:
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
>  arch/arm/mach-shmobile/clock-r8a7790.c |    4 ++++
>  arch/arm/mach-shmobile/setup-r8a7790.c |   25 +++++++++++++++++++++++++
>  2 files changed, 29 insertions(+)
> 
> diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c
> b/arch/arm/mach-shmobile/clock-r8a7790.c index 7960dc0..cf6dd7f 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> @@ -277,9 +277,13 @@ static struct clk_lookup lookups[] = {
>  	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
>  	CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
>  	CLKDEV_DEV_ID("e6508000.i2c", &mstp_clks[MSTP931]),
> +	CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP931]),
>  	CLKDEV_DEV_ID("e6518000.i2c", &mstp_clks[MSTP930]),
> +	CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP930]),
>  	CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]),
> +	CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP929]),
>  	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("e61f0000.thermal", &mstp_clks[MSTP522]),
>  	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
> diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c
> b/arch/arm/mach-shmobile/setup-r8a7790.c index 3543c3b..8474818 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7790.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7790.c
> @@ -67,6 +67,27 @@ R8A7790_GPIO(5);
>  		&r8a7790_gpio##idx##_platform_data,			\
>  		sizeof(r8a7790_gpio##idx##_platform_data))
> 
> +static struct resource i2c_resources[] __initdata = {
> +	/* I2C0 */
> +	DEFINE_RES_MEM(0xE6508000, 0x40),
> +	DEFINE_RES_IRQ(gic_spi(287)),
> +	/* I2C1 */
> +	DEFINE_RES_MEM(0xE6518000, 0x40),
> +	DEFINE_RES_IRQ(gic_spi(288)),
> +	/* I2C2 */
> +	DEFINE_RES_MEM(0xE6530000, 0x40),
> +	DEFINE_RES_IRQ(gic_spi(286)),
> +	/* I2C3 */
> +	DEFINE_RES_MEM(0xE6540000, 0x40),
> +	DEFINE_RES_IRQ(gic_spi(290)),
> +
> +};
> +
> +#define r8a7790_register_i2c(idx)		\
> +	platform_device_register_simple(	\
> +		"i2c-rcar", idx,		\
> +		i2c_resources + (2 * idx), 2);	\
> +
>  void __init r8a7790_pinmux_init(void)
>  {
>  	r8a7790_register_pfc();
> @@ -76,6 +97,10 @@ void __init r8a7790_pinmux_init(void)
>  	r8a7790_register_gpio(3);
>  	r8a7790_register_gpio(4);
>  	r8a7790_register_gpio(5);
> +	r8a7790_register_i2c(0);
> +	r8a7790_register_i2c(1);
> +	r8a7790_register_i2c(2);
> +	r8a7790_register_i2c(3);
>  }

I might be wrong, but I believe we have been requested to add new devices 
directly to the board-*.c files, not to the setup-*.c files.

> 
>  #define SCIF_COMMON(scif_type, baseaddr, irq)			\
-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support
  2013-11-29  3:02 [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support Kuninori Morimoto
  2013-11-29 17:32 ` Laurent Pinchart
@ 2013-12-02  1:32 ` Kuninori Morimoto
  2013-12-02 11:38 ` Laurent Pinchart
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Kuninori Morimoto @ 2013-12-02  1:32 UTC (permalink / raw)
  To: linux-sh


Hi Laurent

> > @@ -76,6 +97,10 @@ void __init r8a7790_pinmux_init(void)
> >  	r8a7790_register_gpio(3);
> >  	r8a7790_register_gpio(4);
> >  	r8a7790_register_gpio(5);
> > +	r8a7790_register_i2c(0);
> > +	r8a7790_register_i2c(1);
> > +	r8a7790_register_i2c(2);
> > +	r8a7790_register_i2c(3);
> >  }
> 
> I might be wrong, but I believe we have been requested to add new devices 
> directly to the board-*.c files, not to the setup-*.c files.

It depends on device.
I2C host doesn't request board/platform information,
so, setup-xxxx.c is fine.
Please check other setup-xxx.c


Best regards
---
Kuninori Morimoto

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support
  2013-11-29  3:02 [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support Kuninori Morimoto
  2013-11-29 17:32 ` Laurent Pinchart
  2013-12-02  1:32 ` Kuninori Morimoto
@ 2013-12-02 11:38 ` Laurent Pinchart
  2013-12-05  3:12 ` Simon Horman
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Laurent Pinchart @ 2013-12-02 11:38 UTC (permalink / raw)
  To: linux-sh

Hi Morimoto-san,

On Sunday 01 December 2013 17:32:37 Kuninori Morimoto wrote:
> Hi Laurent
> 
> > > @@ -76,6 +97,10 @@ void __init r8a7790_pinmux_init(void)
> > > 
> > >  	r8a7790_register_gpio(3);
> > >  	r8a7790_register_gpio(4);
> > >  	r8a7790_register_gpio(5);
> > > 
> > > +	r8a7790_register_i2c(0);
> > > +	r8a7790_register_i2c(1);
> > > +	r8a7790_register_i2c(2);
> > > +	r8a7790_register_i2c(3);
> > > 
> > >  }
> > 
> > I might be wrong, but I believe we have been requested to add new devices
> > directly to the board-*.c files, not to the setup-*.c files.
> 
> It depends on device.
> I2C host doesn't request board/platform information,
> so, setup-xxxx.c is fine.
> Please check other setup-xxx.c

Sure, that's how it's currently done for other SoCs, but I thought we were 
asked to change that for new patches. I might be wrong, Magnus, Simon, could 
you please comment on this ?

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support
  2013-11-29  3:02 [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support Kuninori Morimoto
                   ` (2 preceding siblings ...)
  2013-12-02 11:38 ` Laurent Pinchart
@ 2013-12-05  3:12 ` Simon Horman
  2013-12-05  5:49 ` Laurent Pinchart
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2013-12-05  3:12 UTC (permalink / raw)
  To: linux-sh

On Mon, Dec 02, 2013 at 12:38:54PM +0100, Laurent Pinchart wrote:
> Hi Morimoto-san,
> 
> On Sunday 01 December 2013 17:32:37 Kuninori Morimoto wrote:
> > Hi Laurent
> > 
> > > > @@ -76,6 +97,10 @@ void __init r8a7790_pinmux_init(void)
> > > > 
> > > >  	r8a7790_register_gpio(3);
> > > >  	r8a7790_register_gpio(4);
> > > >  	r8a7790_register_gpio(5);
> > > > 
> > > > +	r8a7790_register_i2c(0);
> > > > +	r8a7790_register_i2c(1);
> > > > +	r8a7790_register_i2c(2);
> > > > +	r8a7790_register_i2c(3);
> > > > 
> > > >  }
> > > 
> > > I might be wrong, but I believe we have been requested to add new devices
> > > directly to the board-*.c files, not to the setup-*.c files.
> > 
> > It depends on device.
> > I2C host doesn't request board/platform information,
> > so, setup-xxxx.c is fine.
> > Please check other setup-xxx.c
> 
> Sure, that's how it's currently done for other SoCs, but I thought we were 
> asked to change that for new patches. I might be wrong, Magnus, Simon, could 
> you please comment on this ?

I think that if the device can be initialised entirely
in the setup- file then its clean enough to put it there.
However, if any part of the initialisation should
go in the board- code then all of it should go there.

This is different to how we previously handled things
where board- code may call some setup- code.
That made a lot of sense in terms of the hardware.
But it added some complexity.

As we would like to ultimately move to DT it seems that there
is little point in adding such complexity now to legacy code. So the
idea is just to completely initialise the devices in one file
or another.

At least, that is my understanding :)

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support
  2013-11-29  3:02 [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support Kuninori Morimoto
                   ` (3 preceding siblings ...)
  2013-12-05  3:12 ` Simon Horman
@ 2013-12-05  5:49 ` Laurent Pinchart
  2013-12-12 11:53 ` Simon Horman
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Laurent Pinchart @ 2013-12-05  5:49 UTC (permalink / raw)
  To: linux-sh

Hi Simon,

On Thursday 05 December 2013 12:12:43 Simon Horman wrote:
> On Mon, Dec 02, 2013 at 12:38:54PM +0100, Laurent Pinchart wrote:
> > On Sunday 01 December 2013 17:32:37 Kuninori Morimoto wrote:
> > > Hi Laurent
> > > 
> > > > > @@ -76,6 +97,10 @@ void __init r8a7790_pinmux_init(void)
> > > > > 
> > > > >  	r8a7790_register_gpio(3);
> > > > >  	r8a7790_register_gpio(4);
> > > > >  	r8a7790_register_gpio(5);
> > > > > 
> > > > > +	r8a7790_register_i2c(0);
> > > > > +	r8a7790_register_i2c(1);
> > > > > +	r8a7790_register_i2c(2);
> > > > > +	r8a7790_register_i2c(3);
> > > > > 
> > > > >  }
> > > > 
> > > > I might be wrong, but I believe we have been requested to add new
> > > > devices directly to the board-*.c files, not to the setup-*.c files.
> > > 
> > > It depends on device.
> > > I2C host doesn't request board/platform information,
> > > so, setup-xxxx.c is fine.
> > > Please check other setup-xxx.c
> > 
> > Sure, that's how it's currently done for other SoCs, but I thought we were
> > asked to change that for new patches. I might be wrong, Magnus, Simon,
> > could you please comment on this ?
> 
> I think that if the device can be initialised entirely
> in the setup- file then its clean enough to put it there.
> However, if any part of the initialisation should
> go in the board- code then all of it should go there.
> 
> This is different to how we previously handled things
> where board- code may call some setup- code.
> That made a lot of sense in terms of the hardware.
> But it added some complexity.
> 
> As we would like to ultimately move to DT it seems that there
> is little point in adding such complexity now to legacy code. So the
> idea is just to completely initialise the devices in one file
> or another.
> 
> At least, that is my understanding :)

Thank you for the clarification.

-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support
  2013-11-29  3:02 [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support Kuninori Morimoto
                   ` (4 preceding siblings ...)
  2013-12-05  5:49 ` Laurent Pinchart
@ 2013-12-12 11:53 ` Simon Horman
  2014-01-07  8:22 ` [PATCH 3/4] ARM: shmobile: r8a7790: Add SATA clocks to device tree Laurent Pinchart
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2013-12-12 11:53 UTC (permalink / raw)
  To: linux-sh

On Thu, Nov 28, 2013 at 07:02:12PM -0800, Kuninori Morimoto wrote:
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
>  arch/arm/mach-shmobile/clock-r8a7790.c |    4 ++++
>  arch/arm/mach-shmobile/setup-r8a7790.c |   25 +++++++++++++++++++++++++
>  2 files changed, 29 insertions(+)

Thanks, I will queue this up.

> 
> diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
> index 7960dc0..cf6dd7f 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> @@ -277,9 +277,13 @@ static struct clk_lookup lookups[] = {
>  	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
>  	CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
>  	CLKDEV_DEV_ID("e6508000.i2c", &mstp_clks[MSTP931]),
> +	CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP931]),
>  	CLKDEV_DEV_ID("e6518000.i2c", &mstp_clks[MSTP930]),
> +	CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP930]),
>  	CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]),
> +	CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP929]),
>  	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("e61f0000.thermal", &mstp_clks[MSTP522]),
>  	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
> diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
> index 3543c3b..8474818 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7790.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7790.c
> @@ -67,6 +67,27 @@ R8A7790_GPIO(5);
>  		&r8a7790_gpio##idx##_platform_data,			\
>  		sizeof(r8a7790_gpio##idx##_platform_data))
>  
> +static struct resource i2c_resources[] __initdata = {
> +	/* I2C0 */
> +	DEFINE_RES_MEM(0xE6508000, 0x40),
> +	DEFINE_RES_IRQ(gic_spi(287)),
> +	/* I2C1 */
> +	DEFINE_RES_MEM(0xE6518000, 0x40),
> +	DEFINE_RES_IRQ(gic_spi(288)),
> +	/* I2C2 */
> +	DEFINE_RES_MEM(0xE6530000, 0x40),
> +	DEFINE_RES_IRQ(gic_spi(286)),
> +	/* I2C3 */
> +	DEFINE_RES_MEM(0xE6540000, 0x40),
> +	DEFINE_RES_IRQ(gic_spi(290)),
> +
> +};
> +
> +#define r8a7790_register_i2c(idx)		\
> +	platform_device_register_simple(	\
> +		"i2c-rcar", idx,		\
> +		i2c_resources + (2 * idx), 2);	\
> +
>  void __init r8a7790_pinmux_init(void)
>  {
>  	r8a7790_register_pfc();
> @@ -76,6 +97,10 @@ void __init r8a7790_pinmux_init(void)
>  	r8a7790_register_gpio(3);
>  	r8a7790_register_gpio(4);
>  	r8a7790_register_gpio(5);
> +	r8a7790_register_i2c(0);
> +	r8a7790_register_i2c(1);
> +	r8a7790_register_i2c(2);
> +	r8a7790_register_i2c(3);
>  }
>  
>  #define SCIF_COMMON(scif_type, baseaddr, irq)			\
> -- 
> 1.7.9.5
> 
> --
> 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
> 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 3/4] ARM: shmobile: r8a7790: Add SATA clocks to device tree
  2013-11-29  3:02 [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support Kuninori Morimoto
                   ` (5 preceding siblings ...)
  2013-12-12 11:53 ` Simon Horman
@ 2014-01-07  8:22 ` Laurent Pinchart
  2014-01-09 14:29 ` Valentine
  2015-01-16  1:10 ` [PATCH 3/4] ARM: shmobile: r8a7790: add SDHI DMA channels on DTSI Kuninori Morimoto
  8 siblings, 0 replies; 10+ messages in thread
From: Laurent Pinchart @ 2014-01-07  8:22 UTC (permalink / raw)
  To: linux-sh

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm/boot/dts/r8a7790.dtsi | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index ae7d77e..26ec957 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -707,13 +707,16 @@
 		mstp8_clks: mstp8_clks@e6150990 {
 			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 			reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
-			clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>;
+			clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>,
+				 <&zs_clk>, <&zs_clk>;
 			#clock-cells = <1>;
 			renesas,clock-indices = <
 				R8A7790_CLK_VIN3 R8A7790_CLK_VIN2 R8A7790_CLK_VIN1
-				R8A7790_CLK_VIN0 R8A7790_CLK_ETHER
+				R8A7790_CLK_VIN0 R8A7790_CLK_ETHER R8A7790_CLK_SATA1
+				R8A7790_CLK_SATA0
 			>;
-			clock-output-names = "vin3", "vin2", "vin1", "vin0", "ether";
+			clock-output-names +				"vin3", "vin2", "vin1", "vin0", "ether", "sata1", "sata0";
 		};
 		mstp9_clks: mstp9_clks@e6150994 {
 			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
-- 
1.8.3.2


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH 3/4] ARM: shmobile: r8a7790: Add SATA clocks to device tree
  2013-11-29  3:02 [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support Kuninori Morimoto
                   ` (6 preceding siblings ...)
  2014-01-07  8:22 ` [PATCH 3/4] ARM: shmobile: r8a7790: Add SATA clocks to device tree Laurent Pinchart
@ 2014-01-09 14:29 ` Valentine
  2015-01-16  1:10 ` [PATCH 3/4] ARM: shmobile: r8a7790: add SDHI DMA channels on DTSI Kuninori Morimoto
  8 siblings, 0 replies; 10+ messages in thread
From: Valentine @ 2014-01-09 14:29 UTC (permalink / raw)
  To: linux-sh

On 01/07/2014 12:22 PM, Laurent Pinchart wrote:
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Tested-by: Valentine Barshak <valentine.barshak@cogentembedded.com>

Thanks,
Val.

> ---
>   arch/arm/boot/dts/r8a7790.dtsi | 9 ++++++---
>   1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
> index ae7d77e..26ec957 100644
> --- a/arch/arm/boot/dts/r8a7790.dtsi
> +++ b/arch/arm/boot/dts/r8a7790.dtsi
> @@ -707,13 +707,16 @@
>   		mstp8_clks: mstp8_clks@e6150990 {
>   			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
>   			reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
> -			clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>;
> +			clocks = <&zg_clk>, <&zg_clk>, <&zg_clk>, <&zg_clk>, <&p_clk>,
> +				 <&zs_clk>, <&zs_clk>;
>   			#clock-cells = <1>;
>   			renesas,clock-indices = <
>   				R8A7790_CLK_VIN3 R8A7790_CLK_VIN2 R8A7790_CLK_VIN1
> -				R8A7790_CLK_VIN0 R8A7790_CLK_ETHER
> +				R8A7790_CLK_VIN0 R8A7790_CLK_ETHER R8A7790_CLK_SATA1
> +				R8A7790_CLK_SATA0
>   			>;
> -			clock-output-names = "vin3", "vin2", "vin1", "vin0", "ether";
> +			clock-output-names > +				"vin3", "vin2", "vin1", "vin0", "ether", "sata1", "sata0";
>   		};
>   		mstp9_clks: mstp9_clks@e6150994 {
>   			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
>


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH 3/4] ARM: shmobile: r8a7790: add SDHI DMA channels on DTSI
  2013-11-29  3:02 [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support Kuninori Morimoto
                   ` (7 preceding siblings ...)
  2014-01-09 14:29 ` Valentine
@ 2015-01-16  1:10 ` Kuninori Morimoto
  8 siblings, 0 replies; 10+ messages in thread
From: Kuninori Morimoto @ 2015-01-16  1:10 UTC (permalink / raw)
  To: linux-sh

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

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 arch/arm/boot/dts/r8a7790.dtsi |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 0010600..56847bf 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -496,6 +496,8 @@
 		reg = <0 0xee100000 0 0x328>;
 		interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
+		dmas = <&dmac1 0xcd>, <&dmac1 0xce>;
+		dma-names = "tx", "rx";
 		status = "disabled";
 	};
 
@@ -504,6 +506,8 @@
 		reg = <0 0xee120000 0 0x328>;
 		interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;
+		dmas = <&dmac1 0xc9>, <&dmac1 0xca>;
+		dma-names = "tx", "rx";
 		status = "disabled";
 	};
 
@@ -512,6 +516,8 @@
 		reg = <0 0xee140000 0 0x100>;
 		interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp3_clks R8A7790_CLK_SDHI2>;
+		dmas = <&dmac1 0xc1>, <&dmac1 0xc2>;
+		dma-names = "tx", "rx";
 		status = "disabled";
 	};
 
@@ -520,6 +526,8 @@
 		reg = <0 0xee160000 0 0x100>;
 		interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp3_clks R8A7790_CLK_SDHI3>;
+		dmas = <&dmac1 0xd3>, <&dmac1 0xd4>;
+		dma-names = "tx", "rx";
 		status = "disabled";
 	};
 
-- 
1.7.9.5


^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2015-01-16  1:10 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-29  3:02 [PATCH 3/4] ARM: shmobile: r8a7790: add I2C support Kuninori Morimoto
2013-11-29 17:32 ` Laurent Pinchart
2013-12-02  1:32 ` Kuninori Morimoto
2013-12-02 11:38 ` Laurent Pinchart
2013-12-05  3:12 ` Simon Horman
2013-12-05  5:49 ` Laurent Pinchart
2013-12-12 11:53 ` Simon Horman
2014-01-07  8:22 ` [PATCH 3/4] ARM: shmobile: r8a7790: Add SATA clocks to device tree Laurent Pinchart
2014-01-09 14:29 ` Valentine
2015-01-16  1:10 ` [PATCH 3/4] ARM: shmobile: r8a7790: add SDHI DMA channels on DTSI Kuninori Morimoto

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).