target/linux/orion/patches/014-avoid_setting_force_phy_addr.patch

   1 The mv643xx_eth platform data field ->force_phy_addr only needs
   2 to be set if the passed-in ->phy_addr field is zero (to distinguish
   3 the case of not having specified a phy address
   4 (force_phy_addr = 0) from the case where a phy address of zero needs
   5 to be used (force_phy_addr = 1.))
   6
   7 Also, the ->force_phy_addr field will hopefully disappear in a
   8 future mv643xx_eth reorganisation.
   9
  10 Therefore, this patch deletes the ->force_phy_addr field initialiser
  11 from all Orion board code.
  12
  13 Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
  14 ---
  15  arch/arm/mach-orion5x/db88f5281-setup.c   |    1 -
  16  arch/arm/mach-orion5x/dns323-setup.c      |    1 -
  17  arch/arm/mach-orion5x/kurobox_pro-setup.c |    1 -
  18  arch/arm/mach-orion5x/rd88f5182-setup.c   |    1 -
  19  arch/arm/mach-orion5x/ts209-setup.c       |    1 -
  20  5 files changed, 0 insertions(+), 5 deletions(-)
  21
  22 --- a/arch/arm/mach-orion5x/db88f5281-setup.c
  23 +++ b/arch/arm/mach-orion5x/db88f5281-setup.c
  24 @@ -286,7 +286,6 @@
  25   ****************************************************************************/
  26  static struct mv643xx_eth_platform_data db88f5281_eth_data = {
  27         .phy_addr       = 8,
  28 -       .force_phy_addr = 1,
  29  };
  30
  31  /*****************************************************************************
  32 --- a/arch/arm/mach-orion5x/dns323-setup.c
  33 +++ b/arch/arm/mach-orion5x/dns323-setup.c
  34 @@ -82,7 +82,6 @@
  35
  36  static struct mv643xx_eth_platform_data dns323_eth_data = {
  37         .phy_addr = 8,
  38 -       .force_phy_addr = 1,
  39  };
  40
  41  /****************************************************************************
  42 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
  43 +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
  44 @@ -160,7 +160,6 @@
  45
  46  static struct mv643xx_eth_platform_data kurobox_pro_eth_data = {
  47         .phy_addr       = 8,
  48 -       .force_phy_addr = 1,
  49  };
  50
  51  /*****************************************************************************
  52 --- a/arch/arm/mach-orion5x/rd88f5182-setup.c
  53 +++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
  54 @@ -222,7 +222,6 @@
  55
  56  static struct mv643xx_eth_platform_data rd88f5182_eth_data = {
  57         .phy_addr       = 8,
  58 -       .force_phy_addr = 1,
  59  };
  60
  61  /*****************************************************************************
  62 --- a/arch/arm/mach-orion5x/ts209-setup.c
  63 +++ b/arch/arm/mach-orion5x/ts209-setup.c
  64 @@ -191,7 +191,6 @@
  65
  66  static struct mv643xx_eth_platform_data qnap_ts209_eth_data = {
  67         .phy_addr       = 8,
  68 -       .force_phy_addr = 1,
  69  };
  70
  71  static int __init parse_hex_nibble(char n)