Blackfin arch: change get_bf537_ether_addr() to bfin_get_ether_addr() since this is not BF537 specific and to better match other Blackfin-specific conventions
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com> Signed-off-by: Bryan Wu <bryan.wu@analog.com>
This commit is contained in:
parent
137b1529da
commit
9862cc5278
|
@ -813,9 +813,9 @@ void native_machine_restart(char *cmd)
|
||||||
* Currently the MAC address is saved in Flash by U-Boot
|
* Currently the MAC address is saved in Flash by U-Boot
|
||||||
*/
|
*/
|
||||||
#define FLASH_MAC 0x203f0000
|
#define FLASH_MAC 0x203f0000
|
||||||
void get_bf537_ether_addr(char *addr)
|
void bfin_get_ether_addr(char *addr)
|
||||||
{
|
{
|
||||||
*(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
|
*(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
|
||||||
*(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
|
*(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(get_bf537_ether_addr);
|
EXPORT_SYMBOL(bfin_get_ether_addr);
|
||||||
|
|
|
@ -428,9 +428,9 @@ static int __init cm_bf537_init(void)
|
||||||
|
|
||||||
arch_initcall(cm_bf537_init);
|
arch_initcall(cm_bf537_init);
|
||||||
|
|
||||||
void get_bf537_ether_addr(char *addr)
|
void bfin_get_ether_addr(char *addr)
|
||||||
{
|
{
|
||||||
random_ether_addr(addr);
|
random_ether_addr(addr);
|
||||||
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
|
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(get_bf537_ether_addr);
|
EXPORT_SYMBOL(bfin_get_ether_addr);
|
||||||
|
|
|
@ -733,9 +733,9 @@ void native_machine_restart(char *cmd)
|
||||||
bfin_gpio_reset_spi0_ssel1();
|
bfin_gpio_reset_spi0_ssel1();
|
||||||
}
|
}
|
||||||
|
|
||||||
void get_bf537_ether_addr(char *addr)
|
void bfin_get_ether_addr(char *addr)
|
||||||
{
|
{
|
||||||
random_ether_addr(addr);
|
random_ether_addr(addr);
|
||||||
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
|
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(get_bf537_ether_addr);
|
EXPORT_SYMBOL(bfin_get_ether_addr);
|
||||||
|
|
|
@ -511,9 +511,9 @@ static int __init stamp_init(void)
|
||||||
|
|
||||||
arch_initcall(stamp_init);
|
arch_initcall(stamp_init);
|
||||||
|
|
||||||
void get_bf537_ether_addr(char *addr)
|
void bfin_get_ether_addr(char *addr)
|
||||||
{
|
{
|
||||||
random_ether_addr(addr);
|
random_ether_addr(addr);
|
||||||
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
|
printk(KERN_WARNING "%s:%s: Setting Ethernet MAC to a random one\n", __FILE__, __func__);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(get_bf537_ether_addr);
|
EXPORT_SYMBOL(bfin_get_ether_addr);
|
||||||
|
|
|
@ -737,9 +737,9 @@ void native_machine_restart(char *cmd)
|
||||||
* Currently the MAC address is saved in Flash by U-Boot
|
* Currently the MAC address is saved in Flash by U-Boot
|
||||||
*/
|
*/
|
||||||
#define FLASH_MAC 0x203f0000
|
#define FLASH_MAC 0x203f0000
|
||||||
void get_bf537_ether_addr(char *addr)
|
void bfin_get_ether_addr(char *addr)
|
||||||
{
|
{
|
||||||
*(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
|
*(u32 *)(&(addr[0])) = bfin_read32(FLASH_MAC);
|
||||||
*(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
|
*(u16 *)(&(addr[4])) = bfin_read16(FLASH_MAC + 4);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(get_bf537_ether_addr);
|
EXPORT_SYMBOL(bfin_get_ether_addr);
|
||||||
|
|
|
@ -924,7 +924,7 @@ static int __init bf537mac_probe(struct net_device *dev)
|
||||||
if (!is_valid_ether_addr(dev->dev_addr)) {
|
if (!is_valid_ether_addr(dev->dev_addr)) {
|
||||||
/* Grab the MAC from the board somehow - this is done in the
|
/* Grab the MAC from the board somehow - this is done in the
|
||||||
arch/blackfin/mach-bf537/boards/eth_mac.c */
|
arch/blackfin/mach-bf537/boards/eth_mac.c */
|
||||||
get_bf537_ether_addr(dev->dev_addr);
|
bfin_get_ether_addr(dev->dev_addr);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* If still not valid, get a random one */
|
/* If still not valid, get a random one */
|
||||||
|
|
|
@ -92,4 +92,4 @@ struct bf537mac_local {
|
||||||
struct mii_bus mii_bus;
|
struct mii_bus mii_bus;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern void get_bf537_ether_addr(char *addr);
|
extern void bfin_get_ether_addr(char *addr);
|
||||||
|
|
Loading…
Reference in New Issue