target/linux/ar7/patches-2.6.35/970-remove_fixed_phy.patch

   1 --- a/arch/mips/ar7/platform.c
   2 +++ b/arch/mips/ar7/platform.c
   3 @@ -33,7 +33,6 @@
   4  #include <linux/string.h>
   5  #include <linux/etherdevice.h>
   6  #include <linux/phy.h>
   7 -#include <linux/phy_fixed.h>
   8  #include <linux/gpio.h>
   9  #include <linux/clk.h>
  10
  11 @@ -370,12 +369,6 @@ static struct resource cpmac_high_res_ti
  12         },
  13  };
  14
  15 -static struct fixed_phy_status fixed_phy_status __initdata = {
  16 -       .link           = 1,
  17 -       .speed          = 100,
  18 -       .duplex         = 1,
  19 -};
  20 -
  21  static struct plat_cpmac_data cpmac_low_data = {
  22         .reset_bit      = 17,
  23         .power_bit      = 20,
  24 @@ -769,16 +762,13 @@ static int __init ar7_register_devices(v
  25         }
  26
  27         if (ar7_has_high_cpmac()) {
  28 -               fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_high_titan.id : cpmac_high.id,
  29 -                                                                       &fixed_phy_status);
  30 -               if (!res) {
  31 -                       cpmac_get_mac(1, ar7_is_titan() ? cpmac_high_data_titan.dev_addr :
  32 +               cpmac_get_mac(1, ar7_is_titan() ? cpmac_high_data_titan.dev_addr :
  33                                                         cpmac_high_data.dev_addr);
  34 -                       res = platform_device_register(ar7_is_titan() ? &cpmac_high_titan :
  35 +               res = platform_device_register(ar7_is_titan() ? &cpmac_high_titan :
  36                                                         &cpmac_high);
  37 -                       if (res)
  38 -                               pr_warning("unable to register cpmac-high: %d\n", res);
  39 -               } else
  40 +               if (res)
  41 +                       pr_warning("unable to register cpmac-high: %d\n", res);
  42 +               else
  43                         pr_warning("unable to add cpmac-high phy: %d\n", res);
  44         } else {
  45                 if (ar7_is_titan())
  46 @@ -787,16 +777,13 @@ static int __init ar7_register_devices(v
  47                         cpmac_low_data.phy_mask = 0xffffffff;
  48         }
  49
  50 -       res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_low_titan.id : cpmac_low.id,
  51 -                                                                       &fixed_phy_status);
  52 -       if (!res) {
  53 -               cpmac_get_mac(0, ar7_is_titan() ? cpmac_low_data_titan.dev_addr :
  54 +       cpmac_get_mac(0, ar7_is_titan() ? cpmac_low_data_titan.dev_addr :
  55                                                 cpmac_low_data.dev_addr);
  56 -               res = platform_device_register(ar7_is_titan() ? &cpmac_low_titan :
  57 +       res = platform_device_register(ar7_is_titan() ? &cpmac_low_titan :
  58                                                 &cpmac_low);
  59 -               if (res)
  60 -                       pr_warning("unable to register cpmac-low: %d\n", res);
  61 -       } else
  62 +       if (res)
  63 +               pr_warning("unable to register cpmac-low: %d\n", res);
  64 +       else
  65                 pr_warning("unable to add cpmac-low phy: %d\n", res);
  66
  67         detect_leds();
  68 --- a/drivers/net/cpmac.c
  69 +++ b/drivers/net/cpmac.c
  70 @@ -1273,7 +1273,7 @@ int __devinit cpmac_init(void)
  71         }
  72
  73         cpmac_mii->phy_mask = ar7_is_titan()? ~(mask | 0x80000000 | 0x40000000):
  74 -               ~(mask | 0x80000000);
  75 +               ~(mask | 0x80000001);
  76         snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
  77
  78         res = mdiobus_register(cpmac_mii);