sh: mac address through private data for sh_eth on ecovec24
PATCH 1/1 sh: mac address through private data for sh_eth on ecovec24
From: Magnus Damm <[email protected]>
Convert the ecovec24 board code to pass the mac address to the sh_eth driver using platform data. Also, remove the static clock to allow Runtime PM.
Signed-off-by Magnus Damm <[email protected]>
---
arch/sh/boards/mach-ecovec24/setup.c | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-)
arch/sh/boards/mach-ecovec24/setup.c +4 -29
@@ -414,12 +414,9 @@ static u8 mac_read(struct i2c_adapter *areturn buf; } -#define MAC_LEN 6 -static void __init sh_eth_init (void ) +static void __init sh_eth_init (struct sh_eth_plat_data *pd) {struct i2c_adapter *a =i2c_get_adapter (1 ); -struct clk *eth_clk; -u8 mac[MAC_LEN ];int i;if (!a) {
@@ -427,33 +424,11 @@ static void __init sh_eth_init(void)return ; } - eth_clk =clk_get (NULL ,"eth0" ); -if (!eth_clk) { -pr_err ("can not get eth0 clk\n" ); -return ; - } -/* read MAC address frome EEPROM */ -for (i =0 ; i <MAC_LEN ; i++) { - mac[i] =mac_read (a,0x10 + i); +for (i =0 ; i <sizeof (pd->mac_addr); i++) { + pd->mac_addr[i] =mac_read (a,0x10 + i);msleep (10 ); } - -/* clock enable */ -clk_enable (eth_clk); - -/* reset sh-eth */ -ctrl_outl (0x1 ,SH_ETH_ADDR +0x0 ); - -/* set MAC addr */ -ctrl_outl ((mac[0 ] <<24 ) | - (mac[1 ] <<16 ) | - (mac[2 ] <<8 ) | - (mac[3 ] <<0 ),SH_ETH_MAHR ); -ctrl_outl ((mac[4 ] <<8 ) | - (mac[5 ] <<0 ),SH_ETH_MALR ); - -clk_put (eth_clk); }#define PORT_HIZA 0xA4050158
@@ -665,7 +640,7 @@ arch_initcall(arch_setup);static int __init devices_setup (void ) { -sh_eth_init (); +sh_eth_init (&sh_eth_plat);return 0 ; }device_initcall (devices_setup);
PATCH 1/1 sh: mac address through private data for sh_eth on ms7724se
From: Magnus Damm <[email protected]>
Convert the ms7724se board code to pass the mac
address to the sh_eth driver using platform data.
Signed-off-by Magnus Damm <[email protected]>
---
This depends on the sh_eth platform data mac patch.
arch/sh/boards/mach-se/7724/setup.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
arch/sh/boards/mach-se/7724/setup.c +4 -10
@@ -507,7 +507,7 @@ static int __init sh_eth_is_eeprom_readystatic void __init sh_eth_init (void ) {int i; -u16 mac[3 ]; +u16 mac;/* check EEPROM status */ if (!sh_eth_is_eeprom_ready ())
@@ -521,16 +521,10 @@ static void __init sh_eth_init(void)if (!sh_eth_is_eeprom_ready ())return ; - mac[i] =ctrl_inw (EEPROM_DATA ); - mac[i] = ((mac[i] &0xFF ) <<8 ) | (mac[i] >>8 );/* swap */ + mac =ctrl_inw (EEPROM_DATA ); + sh_eth_plat.mac_addr[i <<1 ] = mac &0xff ; + sh_eth_plat.mac_addr[(i <<1 ) +1 ] = mac >>8 ; } - -/* reset sh-eth */ -ctrl_outl (0x1 ,SH_ETH_ADDR +0x0 ); - -/* set MAC addr */ -ctrl_outl (((mac[0 ] <<16 ) | (mac[1 ])),SH_ETH_MAHR ); -ctrl_outl ((mac[2 ]),SH_ETH_MALR ); }#define SW4140 0xBA201000
Paul Mundt
AppliedRe: [PATCH] sh: mac address through private data for sh_eth on ms7724se
In reply to Magnus DammQuoted 2 lines · Magnus Damm
Convert the ms7724se board code to pass the mac
address to thesh_ethdriver using platform data.
Quoted 1 line · Magnus Damm
Add support for cn8 and SDHI1 to the ms7724se board.
Applied, thanks.