Skip to content

Commit

Permalink
[ARM] Orion: avoid setting ->force_phy_addr
Browse files Browse the repository at this point in the history
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: Lennert Buytenhek <buytenh@marvell.com>
  • Loading branch information
Lennert Buytenhek authored and Lennert Buytenhek committed Jun 22, 2008
1 parent b206ed0 commit 2850a03
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 5 deletions.
1 change: 0 additions & 1 deletion arch/arm/mach-orion5x/db88f5281-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,6 @@ subsys_initcall(db88f5281_pci_init);
****************************************************************************/
static struct mv643xx_eth_platform_data db88f5281_eth_data = {
.phy_addr = 8,
.force_phy_addr = 1,
};

/*****************************************************************************
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-orion5x/dns323-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ subsys_initcall(dns323_pci_init);

static struct mv643xx_eth_platform_data dns323_eth_data = {
.phy_addr = 8,
.force_phy_addr = 1,
};

/****************************************************************************
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-orion5x/kurobox_pro-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ subsys_initcall(kurobox_pro_pci_init);

static struct mv643xx_eth_platform_data kurobox_pro_eth_data = {
.phy_addr = 8,
.force_phy_addr = 1,
};

/*****************************************************************************
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-orion5x/rd88f5182-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ subsys_initcall(rd88f5182_pci_init);

static struct mv643xx_eth_platform_data rd88f5182_eth_data = {
.phy_addr = 8,
.force_phy_addr = 1,
};

/*****************************************************************************
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-orion5x/ts209-setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ subsys_initcall(qnap_ts209_pci_init);

static struct mv643xx_eth_platform_data qnap_ts209_eth_data = {
.phy_addr = 8,
.force_phy_addr = 1,
};

static int __init parse_hex_nibble(char n)
Expand Down

0 comments on commit 2850a03

Please sign in to comment.