X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/a1bd9bdd429c9139a9e4bfd76adb2e491391dc7e..b91699ff88302f0178565b09fbb78ec7ca982a5f:/target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch?ds=sidebyside diff --git a/target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch b/target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch index ab46f3440..bff4838a7 100644 --- a/target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch +++ b/target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch @@ -1,7 +1,7 @@ -Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c +Index: linux-2.6.32.13/arch/mips/bcm63xx/boards/board_bcm963xx.c =================================================================== ---- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 19:16:53.000000000 +0100 -+++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-02-28 19:16:55.000000000 +0100 +--- linux-2.6.32.13.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-05-27 21:43:41.000000000 -0400 ++++ linux-2.6.32.13/arch/mips/bcm63xx/boards/board_bcm963xx.c 2010-05-27 21:44:19.000000000 -0400 @@ -28,6 +28,7 @@ #include #include @@ -10,7 +10,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c #include #define PFX "board_bcm963xx: " -@@ -406,6 +407,7 @@ +@@ -390,6 +391,7 @@ .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, @@ -18,7 +18,7 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c }; static struct board_info __initdata board_rta1025w_16 = { -@@ -949,6 +951,9 @@ +@@ -934,6 +936,9 @@ if (board.has_dsp) bcm63xx_dsp_register(&board.dsp); @@ -28,10 +28,10 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c /* Generate MAC address for WLAN and * register our SPROM */ #ifdef CONFIG_SSB_PCIHOST -Index: linux-2.6.32.9/arch/mips/bcm63xx/dev-usb-udc.c +Index: linux-2.6.32.13/arch/mips/bcm63xx/dev-usb-udc.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.32.9/arch/mips/bcm63xx/dev-usb-udc.c 2010-02-28 19:16:55.000000000 +0100 ++++ linux-2.6.32.13/arch/mips/bcm63xx/dev-usb-udc.c 2010-05-27 21:44:19.000000000 -0400 @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2009 Henk Vergonet @@ -91,10 +91,10 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/dev-usb-udc.c + udc_resources[1].start = bcm63xx_get_irq_number(IRQ_UDC0); + return platform_device_register(&bcm63xx_udc_device); +} -Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +Index: linux-2.6.32.13/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h =================================================================== ---- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h 2010-02-28 19:16:53.000000000 +0100 -+++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h 2010-02-28 19:16:55.000000000 +0100 +--- linux-2.6.32.13.orig/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h 2010-05-27 21:34:56.000000000 -0400 ++++ linux-2.6.32.13/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h 2010-05-27 21:44:19.000000000 -0400 @@ -125,7 +125,7 @@ #define BCM_6338_UART0_BASE (0xfffe0300) #define BCM_6338_GPIO_BASE (0xfffe0400) @@ -157,10 +157,10 @@ Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h #define BCM_6348_ENET0_RXDMA_IRQ (IRQ_INTERNAL_BASE + 20) #define BCM_6348_ENET0_TXDMA_IRQ (IRQ_INTERNAL_BASE + 21) #define BCM_6348_ENET1_RXDMA_IRQ (IRQ_INTERNAL_BASE + 22) -Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h +Index: linux-2.6.32.13/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h 2010-02-28 19:16:55.000000000 +0100 ++++ linux-2.6.32.13/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h 2010-05-27 21:44:19.000000000 -0400 @@ -0,0 +1,6 @@ +#ifndef BCM63XX_DEV_USB_UDC_H_ +#define BCM63XX_DEV_USB_UDC_H_ @@ -168,10 +168,10 @@ Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h +int bcm63xx_udc_register(void); + +#endif /* BCM63XX_DEV_USB_UDC_H_ */ -Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +Index: linux-2.6.32.13/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h =================================================================== ---- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-02-28 19:16:53.000000000 +0100 -+++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-02-28 19:17:21.000000000 +0100 +--- linux-2.6.32.13.orig/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-05-27 21:42:10.000000000 -0400 ++++ linux-2.6.32.13/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 2010-05-27 21:44:19.000000000 -0400 @@ -45,6 +45,7 @@ unsigned int has_ohci0:1; unsigned int has_ehci0:1; @@ -180,10 +180,10 @@ Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h /* ethernet config */ struct bcm63xx_enet_platform_data enet0; -Index: linux-2.6.32.9/arch/mips/bcm63xx/Makefile +Index: linux-2.6.32.13/arch/mips/bcm63xx/Makefile =================================================================== ---- linux-2.6.32.9.orig/arch/mips/bcm63xx/Makefile 2010-02-28 19:17:32.000000000 +0100 -+++ linux-2.6.32.9/arch/mips/bcm63xx/Makefile 2010-02-28 19:17:39.000000000 +0100 +--- linux-2.6.32.13.orig/arch/mips/bcm63xx/Makefile 2010-05-27 21:34:56.000000000 -0400 ++++ linux-2.6.32.13/arch/mips/bcm63xx/Makefile 2010-05-27 21:44:19.000000000 -0400 @@ -1,6 +1,6 @@ obj-y += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \ dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o dev-wdt.o \ @@ -192,10 +192,10 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/Makefile obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-y += boards/ -Index: linux-2.6.32.9/arch/mips/bcm63xx/clk.c +Index: linux-2.6.32.13/arch/mips/bcm63xx/clk.c =================================================================== ---- linux-2.6.32.9.orig/arch/mips/bcm63xx/clk.c 2010-02-28 19:19:22.000000000 +0100 -+++ linux-2.6.32.9/arch/mips/bcm63xx/clk.c 2010-02-28 19:25:39.000000000 +0100 +--- linux-2.6.32.13.orig/arch/mips/bcm63xx/clk.c 2010-05-27 21:34:56.000000000 -0400 ++++ linux-2.6.32.13/arch/mips/bcm63xx/clk.c 2010-05-27 21:44:19.000000000 -0400 @@ -141,6 +141,30 @@ }; @@ -236,10 +236,10 @@ Index: linux-2.6.32.9/arch/mips/bcm63xx/clk.c if (!strcmp(id, "spi")) return &clk_spi; if (!strcmp(id, "periph")) -Index: linux-2.6.32.9/arch/mips/bcm63xx/Kconfig +Index: linux-2.6.32.13/arch/mips/bcm63xx/Kconfig =================================================================== ---- linux-2.6.32.9.orig/arch/mips/bcm63xx/Kconfig 2010-02-28 19:29:37.000000000 +0100 -+++ linux-2.6.32.9/arch/mips/bcm63xx/Kconfig 2010-02-28 19:29:51.000000000 +0100 +--- linux-2.6.32.13.orig/arch/mips/bcm63xx/Kconfig 2010-05-27 21:34:56.000000000 -0400 ++++ linux-2.6.32.13/arch/mips/bcm63xx/Kconfig 2010-05-27 21:44:19.000000000 -0400 @@ -7,6 +7,7 @@ select USB_ARCH_HAS_OHCI select USB_OHCI_BIG_ENDIAN_DESC