Add ethernet support for r7s72100
v8 cover Add ethernet support for r7s72100
From: Simon Horman <[email protected]>
Hi,
this series integrates ethernet support to sh-pfc for the r7s72100 SoC and Genmai board.
This series is based on renesas-devel-v3.14-rc1-20140204 but patches from topic/r7s72100-v3.14-rc1-20140206 are required in order to boot the Genmai board.
There are no changes to these patches since v7, however driver patches included in that series have been dropped as they are present in v3.14-rc1.
Simon Horman (2):
ARM: shmobile: r7s72100: Add clock for r7s72100-ether
ARM: shmobile: genmai: Enable r7s72100-ether
arch/arm/mach-shmobile/board-genmai.c | 21 +++++++++++++++++++++ arch/arm/mach-shmobile/clock-r7s72100.c | 4 ++++ 2 files changed, 25 insertions(+)
Signature · 1 line
1.8.5.2
PATCH v8 1/2 ARM: shmobile: r7s72100: Add clock for r7s72100-ether
---
v6 - v8
* No change
v5
* Rebase
v3 - v4
* No change
v2
* As suggested by Sergei Shtylyov
- Add MSTP74 to beginning of enum on a line by itself
* As suggested by Magnus Damm
- r7s72100 ethernet is not gigabit so do not refer to it as such
--- arch/arm/mach-shmobile/clock-r7s72100.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/arm/mach-shmobile/clock-r7s72100.c +4 -0
@@ -27,6 +27,7 @@#define FRQCR2 0xfcfe0014#define STBCR3 0xfcfe0420#define STBCR4 0xfcfe0424 +#define STBCR7 0xfcfe0430#define STBCR9 0xfcfe0438#define PLL_RATE 30
@@ -146,6 +147,7 @@ struct clk div4_clks[DIV4_NR] = { };enum {MSTP97 ,MSTP96 ,MSTP95 ,MSTP94 , +MSTP74 ,MSTP47 ,MSTP46 ,MSTP45 ,MSTP44 ,MSTP43 ,MSTP42 ,MSTP41 ,MSTP40 ,MSTP33 ,MSTP_NR };
@@ -154,6 +156,7 @@ static struct clk mstp_clks[MSTP_NR] = { [MSTP96] = SH_CLK_MSTP8(&peripheral0_clk, STBCR9, 6, 0), /* RIIC1 */ [MSTP95] = SH_CLK_MSTP8(&peripheral0_clk, STBCR9, 5, 0), /* RIIC2 */ [MSTP94] = SH_CLK_MSTP8(&peripheral0_clk, STBCR9, 4, 0), /* RIIC3 */ + [MSTP74] = SH_CLK_MSTP8(&peripheral1_clk, STBCR7, 4, 0), /* Ether */ [MSTP47] = SH_CLK_MSTP8(&peripheral1_clk, STBCR4, 7, 0), /* SCIF0 */ [MSTP46] = SH_CLK_MSTP8(&peripheral1_clk, STBCR4, 6, 0), /* SCIF1 */ [MSTP45] = SH_CLK_MSTP8(&peripheral1_clk, STBCR4, 5, 0), /* SCIF2 */
@@ -180,6 +183,7 @@ static struct clk_lookup lookups[] = {CLKDEV_DEV_ID ("fcfee400.i2c" , &mstp_clks[MSTP96 ]),CLKDEV_DEV_ID ("fcfee800.i2c" , &mstp_clks[MSTP95 ]),CLKDEV_DEV_ID ("fcfeec00.i2c" , &mstp_clks[MSTP94 ]), +CLKDEV_DEV_ID ("r7s72100-ether" , &mstp_clks[MSTP74 ]), CLKDEV_CON_ID("mtu2_fck", &mstp_clks[MSTP33]),/* ICK */
Signature · 1 line
1.8.5.2
PATCH v8 1/2 ARM: shmobile: r7s72100: Add clock for r7s72100-ether
Quoted 2 lines · Simon Horman
Signed-off-by Simon Horman <[email protected]>Acked-by Sergei Shtylyov <[email protected]>
I have queued this up.
PATCH v8 2/2 ARM: shmobile: genmai: Enable r7s72100-ether
In reply to Simon Horman---
v3 - v8
* No change
v2
* As suggested by Magnus Damm and Sergei Shtylyov
- r7s72100 ethernet is not gigabit so do not refer to it as such
* As suggested by Sergei Shtylyov
- set no_ether_link as there is no LINK signal documented in the manual
--- arch/arm/mach-shmobile/board-genmai.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/arm/mach-shmobile/board-genmai.c +21 -0
@@ -20,15 +20,36 @@#include <linux/kernel.h> #include <linux/platform_device.h> +#include <linux/sh_eth.h> #include <mach/common.h> +#include <mach/irqs.h> #include <mach/r7s72100.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> +/* Ether */ +static const struct sh_eth_plat_data ether_pdata__initconst = { + .phy =0x00 ,/* PD60610 */ + .edmac_endian =EDMAC_LITTLE_ENDIAN , + .phy_interface =PHY_INTERFACE_MODE_MII , + .no_ether_link =1 +}; + +static const struct resource ether_resources[]__initconst = { +DEFINE_RES_MEM (0xe8203000 ,0x800 ), +DEFINE_RES_MEM (0xe8204800 ,0x200 ), +DEFINE_RES_IRQ (gic_iid (359 )), +}; +static void __init genmai_add_standard_devices (void ) {r7s72100_clock_init ();r7s72100_add_dt_devices (); + +platform_device_register_resndata (&platform_bus,"r7s72100-ether" ,-1 , + ether_resources, +ARRAY_SIZE (ether_resources), + ðer_pdata,sizeof (ether_pdata)); }static const char *const genmai_boards_compat_dt[]__initconst = {
Signature · 1 line
1.8.5.2
PATCH v8 2/2 ARM: shmobile: genmai: Enable r7s72100-ether
Quoted 2 lines · Simon Horman
Signed-off-by Simon Horman <[email protected]>Acked-by Sergei Shtylyov <[email protected]>
I have queued this up.