diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-04-09 18:43:36 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-04-09 18:43:36 +0000 |
| commit | b87e590b248286ac262d544414ac1d97a3f912d6 (patch) | |
| tree | cbc07ae0fe24fcc037f36c972681fed912121956 | |
| parent | 6139571932607e37a324bf641796af869f2f7ba9 (diff) | |
| download | upstream-b87e590b248286ac262d544414ac1d97a3f912d6.tar.gz upstream-b87e590b248286ac262d544414ac1d97a3f912d6.tar.bz2 upstream-b87e590b248286ac262d544414ac1d97a3f912d6.zip | |
do not overwrite ENET_CTL_REG, fixes ethernet on bcm6338
SVN-Revision: 20765
| -rw-r--r-- | target/linux/brcm63xx/patches-2.6.32/230-external_phy_fix.patch | 13 | ||||
| -rw-r--r-- | target/linux/brcm63xx/patches-2.6.33/230-external_phy_fix.patch | 13 |
2 files changed, 26 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.32/230-external_phy_fix.patch b/target/linux/brcm63xx/patches-2.6.32/230-external_phy_fix.patch new file mode 100644 index 0000000000..cd663dd239 --- /dev/null +++ b/target/linux/brcm63xx/patches-2.6.32/230-external_phy_fix.patch @@ -0,0 +1,13 @@ +--- linux-2.6.32.10.orig/drivers/net/bcm63xx_enet.c 2010-04-06 19:25:52.612158288 +0100 ++++ linux-2.6.32.10/drivers/net/bcm63xx_enet.c 2010-04-07 21:40:26.991801424 +0100 +@@ -965,7 +965,9 @@ + /* all set, enable mac and interrupts, start dma engine and + * kick rx dma channel */ + wmb(); +- enet_writel(priv, ENET_CTL_ENABLE_MASK, ENET_CTL_REG); ++ val = enet_readl(priv, ENET_CTL_REG); ++ val |= ENET_CTL_ENABLE_MASK; ++ enet_writel(priv, val, ENET_CTL_REG); + enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG); + enet_dma_writel(priv, ENETDMA_CHANCFG_EN_MASK, + ENETDMA_CHANCFG_REG(priv->rx_chan));
\ No newline at end of file diff --git a/target/linux/brcm63xx/patches-2.6.33/230-external_phy_fix.patch b/target/linux/brcm63xx/patches-2.6.33/230-external_phy_fix.patch new file mode 100644 index 0000000000..cd663dd239 --- /dev/null +++ b/target/linux/brcm63xx/patches-2.6.33/230-external_phy_fix.patch @@ -0,0 +1,13 @@ +--- linux-2.6.32.10.orig/drivers/net/bcm63xx_enet.c 2010-04-06 19:25:52.612158288 +0100 ++++ linux-2.6.32.10/drivers/net/bcm63xx_enet.c 2010-04-07 21:40:26.991801424 +0100 +@@ -965,7 +965,9 @@ + /* all set, enable mac and interrupts, start dma engine and + * kick rx dma channel */ + wmb(); +- enet_writel(priv, ENET_CTL_ENABLE_MASK, ENET_CTL_REG); ++ val = enet_readl(priv, ENET_CTL_REG); ++ val |= ENET_CTL_ENABLE_MASK; ++ enet_writel(priv, val, ENET_CTL_REG); + enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG); + enet_dma_writel(priv, ENETDMA_CHANCFG_EN_MASK, + ENETDMA_CHANCFG_REG(priv->rx_chan));
\ No newline at end of file |