From 6983aacd37e799b035732187aab6896f46f57a60 Mon Sep 17 00:00:00 2001 From: juhosg Date: Thu, 22 Apr 2010 07:12:09 +0000 Subject: 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 --- .../brcm63xx/patches-2.6.33/110-gpiodev.patch | 2 +- .../180-udc_preliminary_support.patch | 2 +- .../brcm63xx/patches-2.6.33/220-board-D4PW.patch | 4 ++-- .../patches-2.6.33/230-external_phy_fix.patch | 26 +++++++++++----------- 4 files changed, 17 insertions(+), 17 deletions(-) (limited to 'target/linux/brcm63xx') 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 8530c4e87..9d4196fcf 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 e0999da41..74140339f 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 528b6fdb8..46e2595ea 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 5edcfe8ef..c887a4ed9 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)); -- cgit v1.2.3