aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-04-22 07:12:09 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-04-22 07:12:09 +0000
commita0a67ed36661e2252b635e8eb2e2debaa7f2c791 (patch)
tree0c7e52610b4ffe5971af3fcc7e40d0bb8197cd73 /target/linux/brcm63xx
parent934a7884541a41513d9b168fa342ba2d8295b001 (diff)
downloadmaster-187ad058-a0a67ed36661e2252b635e8eb2e2debaa7f2c791.tar.gz
master-187ad058-a0a67ed36661e2252b635e8eb2e2debaa7f2c791.tar.bz2
master-187ad058-a0a67ed36661e2252b635e8eb2e2debaa7f2c791.zip
kernel: refresh patches for 2.6.33.2, and drop md5sum for older 2.6.32 kernels
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21081 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx')
-rw-r--r--target/linux/brcm63xx/patches-2.6.33/110-gpiodev.patch2
-rw-r--r--target/linux/brcm63xx/patches-2.6.33/180-udc_preliminary_support.patch2
-rw-r--r--target/linux/brcm63xx/patches-2.6.33/220-board-D4PW.patch4
-rw-r--r--target/linux/brcm63xx/patches-2.6.33/230-external_phy_fix.patch26
4 files changed, 17 insertions, 17 deletions
diff --git a/target/linux/brcm63xx/patches-2.6.33/110-gpiodev.patch b/target/linux/brcm63xx/patches-2.6.33/110-gpiodev.patch
index 8530c4e872..9d4196fcf0 100644
--- a/target/linux/brcm63xx/patches-2.6.33/110-gpiodev.patch
+++ b/target/linux/brcm63xx/patches-2.6.33/110-gpiodev.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -784,6 +784,10 @@ static struct ssb_sprom bcm63xx_sprom =
+@@ -784,6 +784,10 @@ static struct ssb_sprom bcm63xx_sprom =
};
#endif
diff --git a/target/linux/brcm63xx/patches-2.6.33/180-udc_preliminary_support.patch b/target/linux/brcm63xx/patches-2.6.33/180-udc_preliminary_support.patch
index e0999da41c..74140339f0 100644
--- a/target/linux/brcm63xx/patches-2.6.33/180-udc_preliminary_support.patch
+++ b/target/linux/brcm63xx/patches-2.6.33/180-udc_preliminary_support.patch
@@ -214,7 +214,7 @@
* SPI clock
*/
static void spi_set(struct clk *clk, int enable)
-@@ -208,6 +232,8 @@ struct clk *clk_get(struct device *dev,
+@@ -208,6 +232,8 @@ struct clk *clk_get(struct device *dev,
return &clk_ephy;
if (!strcmp(id, "usbh"))
return &clk_usbh;
diff --git a/target/linux/brcm63xx/patches-2.6.33/220-board-D4PW.patch b/target/linux/brcm63xx/patches-2.6.33/220-board-D4PW.patch
index 528b6fdb8b..46e2595ea2 100644
--- a/target/linux/brcm63xx/patches-2.6.33/220-board-D4PW.patch
+++ b/target/linux/brcm63xx/patches-2.6.33/220-board-D4PW.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -467,6 +467,49 @@
+@@ -467,6 +467,49 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
@@ -50,7 +50,7 @@
#endif
/*
-@@ -692,6 +735,7 @@
+@@ -692,6 +735,7 @@ static const struct board_info __initdat
&board_DV201AMR,
&board_96348gw_a,
&board_rta1025w_16,
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
index 5edcfe8efa..c887a4ed94 100644
--- 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
@@ -1,13 +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
+--- a/drivers/net/bcm63xx_enet.c
++++ b/drivers/net/bcm63xx_enet.c
+@@ -962,7 +962,9 @@ static int bcm_enet_open(struct net_devi
+ /* 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));