Changeset 38288


Ignore:
Timestamp:
2013-10-03T00:24:01+02:00 (4 years ago)
Author:
hauke
Message:

kernel: bgmac: move bgmac patches already applied in mainline kernel to generic

The bgmac driver will be used on the brcm47xx and the bcm53xx target.
These are only the patches already applied in current net-next/master
branch.

Signed-off-by: Hauke Mehrtens <hauke@…>

Location:
trunk/target/linux
Files:
1 added
8 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/bcm53xx/patches-3.10/203-bgmac-register-phy.patch

    r38199 r38288  
    1 --- a/drivers/net/ethernet/broadcom/Kconfig 
    2 +++ b/drivers/net/ethernet/broadcom/Kconfig 
    3 @@ -133,6 +133,7 @@ config BNX2X_SRIOV 
    4  config BGMAC 
    5         tristate "BCMA bus GBit core support" 
    6         depends on BCMA_HOST_SOC && HAS_DMA 
    7 +       select PHYLIB 
    8         ---help--- 
    9           This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus. 
    10           They can be found on BCM47xx SoCs and provide gigabit ethernet. 
    111--- a/drivers/net/ethernet/broadcom/bgmac.c 
    122+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    13 @@ -1205,27 +1205,14 @@ static int bgmac_set_mac_address(struct 
     3@@ -1233,27 +1233,14 @@ static int bgmac_set_mac_address(struct 
    144 static int bgmac_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd) 
    155 { 
     
    4636  
    4737 static const struct net_device_ops bgmac_netdev_ops = { 
    48 @@ -1247,61 +1234,16 @@ static int bgmac_get_settings(struct net 
     38@@ -1275,61 +1262,16 @@ static int bgmac_get_settings(struct net 
    4939 { 
    5040        struct bgmac *bgmac = netdev_priv(net_dev); 
     
    110100 static void bgmac_get_drvinfo(struct net_device *net_dev, 
    111101                              struct ethtool_drvinfo *info) 
    112 @@ -1312,6 +1254,7 @@ static void bgmac_get_drvinfo(struct net 
     102@@ -1340,6 +1282,7 @@ static void bgmac_get_drvinfo(struct net 
    113103  
    114104 static const struct ethtool_ops bgmac_ethtool_ops = { 
     
    118108 }; 
    119109  
    120 @@ -1330,10 +1273,36 @@ static int bgmac_mii_write(struct mii_bu 
     110@@ -1358,10 +1301,36 @@ static int bgmac_mii_write(struct mii_bu 
    121111        return bgmac_phy_write(bus->priv, mii_id, regnum, value); 
    122112 } 
     
    155145        mii_bus = mdiobus_alloc(); 
    156146        if (!mii_bus) 
    157 @@ -1364,7 +1333,28 @@ static int bgmac_mii_register(struct bgm 
     147@@ -1392,7 +1361,28 @@ static int bgmac_mii_register(struct bgm 
    158148  
    159149        bgmac->mii_bus = mii_bus; 
     
    187177--- a/drivers/net/ethernet/broadcom/bgmac.h 
    188178+++ b/drivers/net/ethernet/broadcom/bgmac.h 
    189 @@ -399,7 +399,10 @@ struct bgmac { 
     179@@ -401,7 +401,10 @@ struct bgmac { 
    190180        struct bcma_device *cmn; /* Reference to CMN core for BCM4706 */ 
    191181        struct net_device *net_dev; 
  • trunk/target/linux/bcm53xx/patches-3.10/204-bgmac-add-supprot-for-BCM4707.patch

    r37586 r38288  
    1010--- a/drivers/net/ethernet/broadcom/bgmac.c 
    1111+++ b/drivers/net/ethernet/broadcom/bgmac.c 
    12 @@ -842,6 +842,8 @@ static void bgmac_speed(struct bgmac *bg 
     12@@ -868,6 +868,8 @@ static void bgmac_speed(struct bgmac *bg 
    1313                set |= BGMAC_CMDCFG_ES_100; 
    1414        if (speed & BGMAC_SPEED_1000) 
     
    1919                set |= BGMAC_CMDCFG_HD; 
    2020        bgmac_cmdcfg_maskset(bgmac, mask, set, true); 
    21 @@ -849,13 +851,28 @@ static void bgmac_speed(struct bgmac *bg 
     21@@ -875,13 +877,28 @@ static void bgmac_speed(struct bgmac *bg 
    2222  
    2323 static void bgmac_miiconfig(struct bgmac *bgmac) 
     
    5454 } 
    5555  
    56 @@ -901,7 +918,8 @@ static void bgmac_chip_reset(struct bgma 
     56@@ -927,7 +944,8 @@ static void bgmac_chip_reset(struct bgma 
    5757  
    5858        bcma_core_enable(core, flags); 
     
    6464                bgmac_wait_value(bgmac->core, BCMA_CLKCTLST, 1 << 24, 1 << 24, 
    6565                                 1000); 
    66 @@ -922,10 +940,13 @@ static void bgmac_chip_reset(struct bgma 
     66@@ -948,10 +966,13 @@ static void bgmac_chip_reset(struct bgma 
    6767                        et_swtype &= 0x0f; 
    6868                        et_swtype <<= 4; 
     
    8181                                  BGMAC_CHIPCTL_1_SW_TYPE_RGMII; 
    8282                } 
    83 @@ -1030,12 +1051,15 @@ static void bgmac_enable(struct bgmac *b 
     83@@ -1058,12 +1079,15 @@ static void bgmac_enable(struct bgmac *b 
    8484                break; 
    8585        } 
  • trunk/target/linux/bcm53xx/patches-3.10/205-bgmac-add-srab-switch.patch

    r38200 r38288  
    99 #include <bcm47xx_nvram.h> 
    1010 #else 
    11 @@ -1396,6 +1397,17 @@ static void bgmac_mii_unregister(struct 
     11@@ -1424,6 +1425,17 @@ static void bgmac_mii_unregister(struct 
    1212        mdiobus_free(mii_bus); 
    1313 } 
     
    2727  * BCMA bus ops 
    2828  **************************************************/ 
    29 @@ -1495,6 +1507,16 @@ static int bgmac_probe(struct bcma_devic 
     29@@ -1523,6 +1535,16 @@ static int bgmac_probe(struct bcma_devic 
    3030                goto err_dma_free; 
    3131        } 
     
    4444        if (err) { 
    4545                bgmac_err(bgmac, "Cannot register net device\n"); 
    46 @@ -1524,6 +1546,10 @@ static void bgmac_remove(struct bcma_dev 
     46@@ -1552,6 +1574,10 @@ static void bgmac_remove(struct bcma_dev 
    4747 { 
    4848        struct bgmac *bgmac = bcma_get_drvdata(core); 
     
    5757--- a/drivers/net/ethernet/broadcom/bgmac.h 
    5858+++ b/drivers/net/ethernet/broadcom/bgmac.h 
    59 @@ -428,6 +428,9 @@ struct bgmac { 
     59@@ -430,6 +430,9 @@ struct bgmac { 
    6060        bool has_robosw; 
    6161  
  • trunk/target/linux/brcm47xx/patches-3.10/770-bgmac-phylib.patch

    r38044 r38288  
    1 --- a/drivers/net/ethernet/broadcom/Kconfig 
    2 +++ b/drivers/net/ethernet/broadcom/Kconfig 
    3 @@ -133,6 +133,7 @@ config BNX2X_SRIOV 
    4  config BGMAC 
    5         tristate "BCMA bus GBit core support" 
    6         depends on BCMA_HOST_SOC && HAS_DMA 
    7 +       select PHYLIB 
    8         ---help--- 
    9           This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus. 
    10           They can be found on BCM47xx SoCs and provide gigabit ethernet. 
    111--- a/drivers/net/ethernet/broadcom/bgmac.c 
    122+++ b/drivers/net/ethernet/broadcom/bgmac.c 
Note: See TracChangeset for help on using the changeset viewer.