diff options
Diffstat (limited to 'target/linux/generic-2.6')
7 files changed, 9 insertions, 163 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.30/208-rtl8110sb_fix.patch deleted file mode 100644 index 7f46c0b51..000000000 --- a/target/linux/generic-2.6/patches-2.6.30/208-rtl8110sb_fix.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/drivers/net/r8169.c -+++ b/drivers/net/r8169.c -@@ -1890,7 +1890,7 @@ static const struct rtl_cfg_info { - .hw_start = rtl_hw_start_8169, - .region = 1, - .align = 0, -- .intr_event = SYSErr | LinkChg | RxOverflow | -+ .intr_event = LinkChg | RxOverflow | - RxFIFOOver | TxErr | TxOK | RxOK | RxErr, - .napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow, - .features = RTL_FEATURE_GMII -@@ -1899,7 +1899,7 @@ static const struct rtl_cfg_info { - .hw_start = rtl_hw_start_8168, - .region = 2, - .align = 8, -- .intr_event = SYSErr | LinkChg | RxOverflow | -+ .intr_event = LinkChg | RxOverflow | - TxErr | TxOK | RxOK | RxErr, - .napi_event = TxErr | TxOK | RxOK | RxOverflow, - .features = RTL_FEATURE_GMII | RTL_FEATURE_MSI -@@ -1908,7 +1908,7 @@ static const struct rtl_cfg_info { - .hw_start = rtl_hw_start_8101, - .region = 2, - .align = 8, -- .intr_event = SYSErr | LinkChg | RxOverflow | PCSTimeout | -+ .intr_event = LinkChg | RxOverflow | PCSTimeout | - RxFIFOOver | TxErr | TxOK | RxOK | RxErr, - .napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow, - .features = RTL_FEATURE_MSI -@@ -3582,10 +3582,12 @@ static irqreturn_t rtl8169_interrupt(int - goto out; - } - -+#if 0 - if (unlikely(status & SYSErr)) { - rtl8169_pcierr_interrupt(dev); - goto out; - } -+#endif - - if (status & LinkChg) - rtl8169_check_link_status(dev, tp, ioaddr); diff --git a/target/linux/generic-2.6/patches-2.6.30/680-phy_ar8216.patch b/target/linux/generic-2.6/patches-2.6.30/680-phy_ar8216.patch index 6cb3fd417..d9d3ce772 100644 --- a/target/linux/generic-2.6/patches-2.6.30/680-phy_ar8216.patch +++ b/target/linux/generic-2.6/patches-2.6.30/680-phy_ar8216.patch @@ -1,8 +1,8 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -96,6 +96,10 @@ config ADM6996_PHY - config MVSWITCH_PHY - tristate "Driver for Marvell 88E6060 switches" +@@ -100,6 +100,10 @@ config IP175C_PHY + tristate "Driver for IC+ IP175C/IP178C switches" + select SWCONFIG +config AR8216_PHY + tristate "Driver for Atheros AR8216 switches" @@ -13,9 +13,9 @@ depends on PHYLIB=y --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile -@@ -16,6 +16,7 @@ obj-$(CONFIG_ICPLUS_PHY) += icplus.o - obj-$(CONFIG_ADM6996_PHY) += adm6996.o +@@ -17,6 +17,7 @@ obj-$(CONFIG_ADM6996_PHY) += adm6996.o obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o + obj-$(CONFIG_IP175C_PHY) += ip175c.o obj-$(CONFIG_REALTEK_PHY) += realtek.o +obj-$(CONFIG_AR8216_PHY) += ar8216.o obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o diff --git a/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch index 61730540f..01fa4310b 100644 --- a/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch @@ -17,7 +17,7 @@ port->bulk_in_size = buffer_size; port->bulk_in_endpointAddress = endpoint->bEndpointAddress; port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL); -@@ -1311,3 +1312,5 @@ MODULE_LICENSE("GPL"); +@@ -1312,3 +1313,5 @@ MODULE_LICENSE("GPL"); module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/target/linux/generic-2.6/patches-2.6.30/840-unable_to_open_console.patch b/target/linux/generic-2.6/patches-2.6.30/840-unable_to_open_console.patch index c9a277468..eb6bd8c2b 100644 --- a/target/linux/generic-2.6/patches-2.6.30/840-unable_to_open_console.patch +++ b/target/linux/generic-2.6/patches-2.6.30/840-unable_to_open_console.patch @@ -1,6 +1,6 @@ --- a/init/main.c +++ b/init/main.c -@@ -812,7 +812,7 @@ static noinline int init_post(void) +@@ -811,7 +811,7 @@ static noinline int init_post(void) numa_default_policy(); if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) diff --git a/target/linux/generic-2.6/patches-2.6.30/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.30/922-gpiommc.patch index 467187c10..ad35996a9 100644 --- a/target/linux/generic-2.6/patches-2.6.30/922-gpiommc.patch +++ b/target/linux/generic-2.6/patches-2.6.30/922-gpiommc.patch @@ -824,7 +824,7 @@ +be done automatically. --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2495,6 +2495,11 @@ T: git git://git.kernel.org/pub/scm/linu +@@ -2504,6 +2504,11 @@ T: git git://git.kernel.org/pub/scm/linu S: Maintained F: drivers/media/video/gspca/ diff --git a/target/linux/generic-2.6/patches-2.6.30/991-mv643xx_eth_coherent_dma_mask.patch b/target/linux/generic-2.6/patches-2.6.30/991-mv643xx_eth_coherent_dma_mask.patch deleted file mode 100644 index 1a8012f08..000000000 --- a/target/linux/generic-2.6/patches-2.6.30/991-mv643xx_eth_coherent_dma_mask.patch +++ /dev/null @@ -1,112 +0,0 @@ -From: Nicolas Pitre <nico@cam.org> -Date: Fri, 22 May 2009 20:53:40 +0000 (-0400) -Subject: [ARM] add coherent DMA mask for mv643xx_eth -X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=a49a018a6ea6d73742a81d673fe5ec4a7d2137b3 - -[ARM] add coherent DMA mask for mv643xx_eth - -Since commit eb0519b5a1cf, mv643xx_eth is non functional on ARM because -the platform device declaration does not include any coherent DMA mask -and coherent memory allocations fail. - -Signed-off-by: Nicolas Pitre <nico@marvell.com> ---- - ---- a/arch/arm/mach-kirkwood/common.c -+++ b/arch/arm/mach-kirkwood/common.c -@@ -144,6 +144,9 @@ static struct platform_device kirkwood_g - .id = 0, - .num_resources = 1, - .resource = kirkwood_ge00_resources, -+ .dev = { -+ .coherent_dma_mask = 0xffffffff, -+ }, - }; - - void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data) -@@ -202,6 +205,9 @@ static struct platform_device kirkwood_g - .id = 1, - .num_resources = 1, - .resource = kirkwood_ge01_resources, -+ .dev = { -+ .coherent_dma_mask = 0xffffffff, -+ }, - }; - - void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data) ---- a/arch/arm/mach-loki/common.c -+++ b/arch/arm/mach-loki/common.c -@@ -82,6 +82,9 @@ static struct platform_device loki_ge0 = - .id = 0, - .num_resources = 1, - .resource = loki_ge0_resources, -+ .dev = { -+ .coherent_dma_mask = 0xffffffff, -+ }, - }; - - void __init loki_ge0_init(struct mv643xx_eth_platform_data *eth_data) -@@ -136,6 +139,9 @@ static struct platform_device loki_ge1 = - .id = 1, - .num_resources = 1, - .resource = loki_ge1_resources, -+ .dev = { -+ .coherent_dma_mask = 0xffffffff, -+ }, - }; - - void __init loki_ge1_init(struct mv643xx_eth_platform_data *eth_data) ---- a/arch/arm/mach-mv78xx0/common.c -+++ b/arch/arm/mach-mv78xx0/common.c -@@ -321,6 +321,9 @@ static struct platform_device mv78xx0_ge - .id = 0, - .num_resources = 1, - .resource = mv78xx0_ge00_resources, -+ .dev = { -+ .coherent_dma_mask = 0xffffffff, -+ }, - }; - - void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data) -@@ -375,6 +378,9 @@ static struct platform_device mv78xx0_ge - .id = 1, - .num_resources = 1, - .resource = mv78xx0_ge01_resources, -+ .dev = { -+ .coherent_dma_mask = 0xffffffff, -+ }, - }; - - void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data) -@@ -429,6 +435,9 @@ static struct platform_device mv78xx0_ge - .id = 2, - .num_resources = 1, - .resource = mv78xx0_ge10_resources, -+ .dev = { -+ .coherent_dma_mask = 0xffffffff, -+ }, - }; - - void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data) -@@ -496,6 +505,9 @@ static struct platform_device mv78xx0_ge - .id = 3, - .num_resources = 1, - .resource = mv78xx0_ge11_resources, -+ .dev = { -+ .coherent_dma_mask = 0xffffffff, -+ }, - }; - - void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data) ---- a/arch/arm/mach-orion5x/common.c -+++ b/arch/arm/mach-orion5x/common.c -@@ -188,6 +188,9 @@ static struct platform_device orion5x_et - .id = 0, - .num_resources = 1, - .resource = orion5x_eth_resources, -+ .dev = { -+ .coherent_dma_mask = 0xffffffff, -+ }, - }; - - void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data) diff --git a/target/linux/generic-2.6/patches-2.6.30/999-use_preinit_as_init.patch b/target/linux/generic-2.6/patches-2.6.30/999-use_preinit_as_init.patch index 0a52a87e8..631da6d76 100644 --- a/target/linux/generic-2.6/patches-2.6.30/999-use_preinit_as_init.patch +++ b/target/linux/generic-2.6/patches-2.6.30/999-use_preinit_as_init.patch @@ -1,6 +1,6 @@ --- a/init/main.c +++ b/init/main.c -@@ -836,10 +836,7 @@ static noinline int init_post(void) +@@ -835,10 +835,7 @@ static noinline int init_post(void) printk(KERN_WARNING "Failed to execute %s. Attempting " "defaults...\n", execute_command); } |