target/linux/brcm47xx/patches-3.10/202-b44-rename-B44_PHY_ADDR_NO_PHY-to-B44_PHY_ADDR_NO_LO.patch

   1 From 888594b4a1f70d02b7f6b05e868b00514b5cf559 Mon Sep 17 00:00:00 2001
   2 From: Hauke Mehrtens <hauke@hauke-m.de>
   3 Date: Thu, 3 Oct 2013 20:41:29 +0200
   4 Subject: [PATCH 3/9] b44: rename B44_PHY_ADDR_NO_PHY to
   5  B44_PHY_ADDR_NO_LOCAL_PHY
   6
   7 The PHY address 30 means there is no local PHY, but there could be an
   8 external PHY like a switch connected via MII. This is the case on most
   9 embedded home routers where this driver is used.
  10
  11 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
  12 ---
  13  drivers/net/ethernet/broadcom/b44.c |    2 +-
  14  drivers/net/ethernet/broadcom/b44.h |    6 +++---
  15  2 files changed, 4 insertions(+), 4 deletions(-)
  16
  17 --- a/drivers/net/ethernet/broadcom/b44.c
  18 +++ b/drivers/net/ethernet/broadcom/b44.c
  19 @@ -2238,7 +2238,7 @@ static int b44_init_one(struct ssb_devic
  20
  21         /* do a phy reset to test if there is an active phy */
  22         if (b44_phy_reset(bp) < 0)
  23 -               bp->phy_addr = B44_PHY_ADDR_NO_PHY;
  24 +               bp->phy_addr = B44_PHY_ADDR_NO_LOACL_PHY;
  25
  26         netdev_info(dev, "%s %pM\n", DRV_DESCRIPTION, dev->dev_addr);
  27
  28 --- a/drivers/net/ethernet/broadcom/b44.h
  29 +++ b/drivers/net/ethernet/broadcom/b44.h
  30 @@ -280,9 +280,9 @@ struct ring_info {
  31         dma_addr_t      mapping;
  32  };
  33
  34 -#define B44_MCAST_TABLE_SIZE   32
  35 -#define B44_PHY_ADDR_NO_PHY    30
  36 -#define B44_MDC_RATIO          5000000
  37 +#define B44_MCAST_TABLE_SIZE           32
  38 +#define B44_PHY_ADDR_NO_LOACL_PHY      30 /* no local phy regs */
  39 +#define B44_MDC_RATIO                  5000000
  40
  41  #define        B44_STAT_REG_DECLARE            \
  42         _B44(tx_good_octets)            \