Commit 2850a037 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Lennert Buytenhek
Browse files

[ARM] Orion: avoid setting ->force_phy_addr



The mv643xx_eth platform data field ->force_phy_addr only needs
to be set if the passed-in ->phy_addr field is zero (to distinguish
the case of not having specified a phy address
(force_phy_addr = 0) from the case where a phy address of zero needs
to be used (force_phy_addr = 1.))

Also, the ->force_phy_addr field will hopefully disappear in a
future mv643xx_eth reorganisation.

Therefore, this patch deletes the ->force_phy_addr field initialiser
from all Orion board code.
Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
parent b206ed04
...@@ -286,7 +286,6 @@ subsys_initcall(db88f5281_pci_init); ...@@ -286,7 +286,6 @@ subsys_initcall(db88f5281_pci_init);
****************************************************************************/ ****************************************************************************/
static struct mv643xx_eth_platform_data db88f5281_eth_data = { static struct mv643xx_eth_platform_data db88f5281_eth_data = {
.phy_addr = 8, .phy_addr = 8,
.force_phy_addr = 1,
}; };
/***************************************************************************** /*****************************************************************************
......
...@@ -80,7 +80,6 @@ subsys_initcall(dns323_pci_init); ...@@ -80,7 +80,6 @@ subsys_initcall(dns323_pci_init);
static struct mv643xx_eth_platform_data dns323_eth_data = { static struct mv643xx_eth_platform_data dns323_eth_data = {
.phy_addr = 8, .phy_addr = 8,
.force_phy_addr = 1,
}; };
/**************************************************************************** /****************************************************************************
......
...@@ -158,7 +158,6 @@ subsys_initcall(kurobox_pro_pci_init); ...@@ -158,7 +158,6 @@ subsys_initcall(kurobox_pro_pci_init);
static struct mv643xx_eth_platform_data kurobox_pro_eth_data = { static struct mv643xx_eth_platform_data kurobox_pro_eth_data = {
.phy_addr = 8, .phy_addr = 8,
.force_phy_addr = 1,
}; };
/***************************************************************************** /*****************************************************************************
......
...@@ -222,7 +222,6 @@ subsys_initcall(rd88f5182_pci_init); ...@@ -222,7 +222,6 @@ subsys_initcall(rd88f5182_pci_init);
static struct mv643xx_eth_platform_data rd88f5182_eth_data = { static struct mv643xx_eth_platform_data rd88f5182_eth_data = {
.phy_addr = 8, .phy_addr = 8,
.force_phy_addr = 1,
}; };
/***************************************************************************** /*****************************************************************************
......
...@@ -191,7 +191,6 @@ subsys_initcall(qnap_ts209_pci_init); ...@@ -191,7 +191,6 @@ subsys_initcall(qnap_ts209_pci_init);
static struct mv643xx_eth_platform_data qnap_ts209_eth_data = { static struct mv643xx_eth_platform_data qnap_ts209_eth_data = {
.phy_addr = 8, .phy_addr = 8,
.force_phy_addr = 1,
}; };
static int __init parse_hex_nibble(char n) static int __init parse_hex_nibble(char n)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment