[v2,1/2] ARM: shmobile: R8A7779: add Ether support

Message ID	201304042253.50662.sergei.shtylyov@cogentembedded.com (mailing list archive)
State	Superseded
Commit	dace48d04dee46a3409d5e13cd98031522e46377
Headers	show Return-Path: <linux-sh-owner@vger.kernel.org> To: horms@verge.net.au, magnus.damm@gmail.com, linux@arm.linux.org.uk, linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/2] ARM: shmobile: R8A7779: add Ether support From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> Organization: Cogent Embedded Date: Thu, 4 Apr 2013 22:53:50 +0400 MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201304042253.50662.sergei.shtylyov@cogentembedded.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk

Sergei Shtylyov April 4, 2013, 6:53 p.m. UTC

Add Ether clock and platform device for R8A7779 SoC; add a function to register
this device with board-specific platform data.

Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>

---
This patch is atop of the 'renesas-next-20130404v2' tag of Simon Horman's
'renesas.git'.

Changes since original posting:
- use 'struct sh_eth_plat_data *' as an argument to r8a7779_add_ether_device();
- use platform_device_register_resndata() in r8a7779_add_ether_device().

 arch/arm/mach-shmobile/clock-r8a7779.c        |    4 +++-
 arch/arm/mach-shmobile/include/mach/r8a7779.h |    2 ++
 arch/arm/mach-shmobile/setup-r8a7779.c        |   23 ++++++++++++++++++++++-
 3 files changed, 27 insertions(+), 2 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

Kuninori Morimoto April 5, 2013, 1:21 a.m. UTC | #1

Hi

> Add Ether clock and platform device for R8A7779 SoC; add a function to register
> this device with board-specific platform data.
> 
> Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> 
> ---

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


> This patch is atop of the 'renesas-next-20130404v2' tag of Simon Horman's
> 'renesas.git'.
> 
> Changes since original posting:
> - use 'struct sh_eth_plat_data *' as an argument to r8a7779_add_ether_device();
> - use platform_device_register_resndata() in r8a7779_add_ether_device().
> 
>  arch/arm/mach-shmobile/clock-r8a7779.c        |    4 +++-
>  arch/arm/mach-shmobile/include/mach/r8a7779.h |    2 ++
>  arch/arm/mach-shmobile/setup-r8a7779.c        |   23 ++++++++++++++++++++++-
>  3 files changed, 27 insertions(+), 2 deletions(-)
> 
> Index: renesas/arch/arm/mach-shmobile/clock-r8a7779.c
> ===================================================================
> --- renesas.orig/arch/arm/mach-shmobile/clock-r8a7779.c
> +++ renesas/arch/arm/mach-shmobile/clock-r8a7779.c
> @@ -112,7 +112,7 @@ static struct clk *main_clks[] = {
>  };
>  
>  enum { MSTP323, MSTP322, MSTP321, MSTP320,
> -	MSTP115,
> +	MSTP115, MSTP114,
>  	MSTP103, MSTP101, MSTP100,
>  	MSTP030,
>  	MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,
> @@ -126,6 +126,7 @@ static struct clk mstp_clks[MSTP_NR] = {
>  	[MSTP321] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 21, 0), /* SDHI2 */
>  	[MSTP320] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 20, 0), /* SDHI3 */
>  	[MSTP115] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 15, 0), /* SATA */
> +	[MSTP114] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 14, 0), /* Ether */
>  	[MSTP103] = SH_CLK_MSTP32(&clks_clk, MSTPCR1,  3, 0), /* DU */
>  	[MSTP101] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1,  1, 0), /* USB2 */
>  	[MSTP100] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1,  0, 0), /* USB0/1 */
> @@ -162,6 +163,7 @@ static struct clk_lookup lookups[] = {
>  	/* MSTP32 clocks */
>  	CLKDEV_DEV_ID("sata_rcar", &mstp_clks[MSTP115]), /* SATA */
>  	CLKDEV_DEV_ID("fc600000.sata", &mstp_clks[MSTP115]), /* SATA w/DT */
> +	CLKDEV_DEV_ID("sh-eth", &mstp_clks[MSTP114]), /* Ether */
>  	CLKDEV_DEV_ID("ehci-platform.1", &mstp_clks[MSTP101]), /* USB EHCI port2 */
>  	CLKDEV_DEV_ID("ohci-platform.1", &mstp_clks[MSTP101]), /* USB OHCI port2 */
>  	CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */
> Index: renesas/arch/arm/mach-shmobile/include/mach/r8a7779.h
> ===================================================================
> --- renesas.orig/arch/arm/mach-shmobile/include/mach/r8a7779.h
> +++ renesas/arch/arm/mach-shmobile/include/mach/r8a7779.h
> @@ -3,6 +3,7 @@
>  
>  #include <linux/sh_clk.h>
>  #include <linux/pm_domain.h>
> +#include <linux/sh_eth.h>
>  
>  struct platform_device;
>  
> @@ -31,6 +32,7 @@ extern void r8a7779_earlytimer_init(void
>  extern void r8a7779_add_early_devices(void);
>  extern void r8a7779_add_standard_devices(void);
>  extern void r8a7779_add_standard_devices_dt(void);
> +extern void r8a7779_add_ether_device(struct sh_eth_plat_data *pdata);
>  extern void r8a7779_clock_init(void);
>  extern void r8a7779_pinmux_init(void);
>  extern void r8a7779_pm_init(void);
> Index: renesas/arch/arm/mach-shmobile/setup-r8a7779.c
> ===================================================================
> --- renesas.orig/arch/arm/mach-shmobile/setup-r8a7779.c
> +++ renesas/arch/arm/mach-shmobile/setup-r8a7779.c
> @@ -1,8 +1,9 @@
>  /*
>   * r8a7779 processor support
>   *
> - * Copyright (C) 2011  Renesas Solutions Corp.
> + * Copyright (C) 2011, 2013  Renesas Solutions Corp.
>   * Copyright (C) 2011  Magnus Damm
> + * Copyright (C) 2013  Cogent Embedded, Inc.
>   *
>   * This program is free software; you can redistribute it and/or modify
>   * it under the terms of the GNU General Public License as published by
> @@ -393,6 +394,18 @@ static struct platform_device sata_devic
>  	},
>  };
>  
> +/* Ether */
> +static struct resource ether_resources[] = {
> +	{
> +		.start	= 0xfde00000,
> +		.end	= 0xfde003ff,
> +		.flags	= IORESOURCE_MEM,
> +	}, {
> +		.start	= gic_iid(0xb4),
> +		.flags	= IORESOURCE_IRQ,
> +	},
> +};
> +
>  static struct platform_device *r8a7779_devices_dt[] __initdata = {
>  	&scif0_device,
>  	&scif1_device,
> @@ -428,6 +441,14 @@ void __init r8a7779_add_standard_devices
>  			    ARRAY_SIZE(r8a7779_late_devices));
>  }
>  
> +void __init r8a7779_add_ether_device(struct sh_eth_plat_data *pdata)
> +{
> +	platform_device_register_resndata(&platform_bus, "sh_eth", -1,
> +					  ether_resources,
> +					  ARRAY_SIZE(ether_resources),
> +					  pdata, sizeof(*pdata));
> +}
> +
>  /* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
>  void __init __weak r8a7779_register_twd(void) { }
>  
> --
> 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

Simon Horman April 5, 2013, 1:47 a.m. UTC | #2

On Fri, Apr 05, 2013 at 10:21:14AM +0900, Kuninori Morimoto wrote:
> 
> Hi
> 
> > Add Ether clock and platform device for R8A7779 SoC; add a function to register
> > this device with board-specific platform data.
> > 
> > Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
> > 
> > ---
> 
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Thanks, queued-up in the soc-r8a7779 branch.
--
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

Russell King - ARM Linux April 18, 2013, 3:36 p.m. UTC | #3

On Thu, Apr 04, 2013 at 10:53:50PM +0400, Sergei Shtylyov wrote:
> +/* Ether */
> +static struct resource ether_resources[] = {
> +	{
> +		.start	= 0xfde00000,
> +		.end	= 0xfde003ff,
> +		.flags	= IORESOURCE_MEM,
> +	}, {
> +		.start	= gic_iid(0xb4),
> +		.flags	= IORESOURCE_IRQ,
> +	},

There are macros for initializing these which have been around for a
few years now.  Please consider using them in future.
--
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

Sergei Shtylyov April 18, 2013, 5:38 p.m. UTC | #4

Hello.

On 18-04-2013 19:36, Russell King - ARM Linux wrote:

>> +/* Ether */
>> +static struct resource ether_resources[] = {
>> +	{
>> +		.start	= 0xfde00000,
>> +		.end	= 0xfde003ff,
>> +		.flags	= IORESOURCE_MEM,
>> +	}, {
>> +		.start	= gic_iid(0xb4),
>> +		.flags	= IORESOURCE_IRQ,
>> +	},

> There are macros for initializing these which have been around for a
> few years now.

    I know, I know, just didn't know they're that old.

> Please consider using them in future.

    This file uses the old style resource intializers generally, it just needs 
wholesale conversion.

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

Simon Horman April 19, 2013, 2:16 a.m. UTC | #5

On Thu, Apr 18, 2013 at 09:38:54PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 18-04-2013 19:36, Russell King - ARM Linux wrote:
> 
> >>+/* Ether */
> >>+static struct resource ether_resources[] = {
> >>+	{
> >>+		.start	= 0xfde00000,
> >>+		.end	= 0xfde003ff,
> >>+		.flags	= IORESOURCE_MEM,
> >>+	}, {
> >>+		.start	= gic_iid(0xb4),
> >>+		.flags	= IORESOURCE_IRQ,
> >>+	},
> 
> >There are macros for initializing these which have been around for a
> >few years now.
> 
>    I know, I know, just didn't know they're that old.
> 
> >Please consider using them in future.
> 
>    This file uses the old style resource intializers generally, it
> just needs wholesale conversion.

I'd be happy to review such a patch.
--
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

[v2,1/2] ARM: shmobile: R8A7779: add Ether support

Commit Message

Comments

Patch