ARM: shmobile: R8A7779: add Ether support
PATCH v2 1/2 ARM: shmobile: R8A7779: add Ether support
Add Ether clock and platform device for R8A7779 SoC; add a function to register this device with board-specific platform data.
---
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(-)
arch/arm/mach-shmobile/clock-r8a7779.c +3 -1
@@ -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 */
arch/arm/mach-shmobile/include/mach/r8a7779.h +2 -0
@@ -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(voidextern 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 );
arch/arm/mach-shmobile/setup-r8a7779.c +22 -1
@@ -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 ) { }
PATCH v2 1/2 ARM: shmobile: R8A7779: add Ether support
Hi
Quoted 6 lines
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 <[email protected]>---
Quoted 114 lines
This patch is atop of the 'renesas-next-20130404v2' tag of Simon Horman's 'renesas.git'.
Changes since original posting:
- use 'structsh_eth_plat_data*' as an argument tor8a7779_add_ether_device();
- useplatform_device_register_resndata()inr8a7779_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
===================================================================arch/arm/mach-shmobile/clock-r8a7779.c +3
-1@@ -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
===================================================================arch/arm/mach-shmobile/include/mach/r8a7779.h +2
-0@@ -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(voidextern 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
===================================================================arch/arm/mach-shmobile/setup-r8a7779.c +22
-2@@ -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 at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 1/2 ARM: shmobile: R8A7779: add Ether support
Quoted 11 lines · Kuninori Morimoto
Hi
Quoted 6 lines
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 <[email protected]>---
Thanks, queued-up in the soc-r8a7779 branch.
PATCH v2 1/2 ARM: shmobile: R8A7779: add Ether support
In reply to Sergei Shtylyovarch/arm/mach-shmobile/setup-r8a7779.c static struct platform_device sata_devic · line 406
Quoted 10 lines · Sergei Shtylyov
arch/arm/mach-shmobile/setup-r8a7779.c +10
-0+/* 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.
PATCH v2 1/2 ARM: shmobile: R8A7779: add Ether support
Hello.
Quoted 5 lines · Russell King - ARM Linux
Quoted 5 lines
arch/arm/mach-shmobile/setup-r8a7779.c +5
-0+/* Ether */ +static struct resource ether_resources[] = { + { + .start =0xfde00000 , + .end =0xfde003ff ,
Quoted 8 lines
arch/arm/mach-shmobile/setup-r8a7779.c static struct platform_device sata_devic · line 406
Quoted 5 lines
arch/arm/mach-shmobile/setup-r8a7779.c +5
-0+ .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.
Quoted 1 line
Please consider using them in future.
This file uses the old style resource intializers generally, it just needs
wholesale conversion.
WBR, Sergei
PATCH v2 1/2 ARM: shmobile: R8A7779: add Ether support
Quoted 18 lines · Sergei Shtylyov
Hello.
Quoted 5 lines · Russell King - ARM Linux
Quoted 5 lines
arch/arm/mach-shmobile/setup-r8a7779.c +5
-0+/* Ether */ +static struct resource ether_resources[] = { + { + .start =0xfde00000 , + .end =0xfde003ff ,Quoted 8 lines
arch/arm/mach-shmobile/setup-r8a7779.c static struct platform_device sata_devic · line 406
Quoted 5 lines
arch/arm/mach-shmobile/setup-r8a7779.c +5
-0+ .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.
Quoted 6 lines
I know, I know, just didn't know they're that old.
Quoted 1 line
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.