diff options
author | Daniel Dickinson <crazycshore@gmail.com> | 2010-05-30 02:04:56 +0000 |
---|---|---|
committer | Daniel Dickinson <crazycshore@gmail.com> | 2010-05-30 02:04:56 +0000 |
commit | f296eeab5356352ff6ad9b523bbe83b489b5cef6 (patch) | |
tree | c010eeae69d2e9ff2e29c574642da41fcaf2e0f1 /target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch | |
parent | 6a267cfa767d8874edaf3cdd049eb40853e2c42f (diff) | |
download | upstream-f296eeab5356352ff6ad9b523bbe83b489b5cef6.tar.gz upstream-f296eeab5356352ff6ad9b523bbe83b489b5cef6.tar.bz2 upstream-f296eeab5356352ff6ad9b523bbe83b489b5cef6.zip |
brcm63xx: Fixed 96348GW (Tecom Gx00) LED definitions to match reality (vs reference design)
SVN-Revision: 21631
Diffstat (limited to 'target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch | 74 |
1 files changed, 45 insertions, 29 deletions
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 20b45355fc..bff4838a7e 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,5 +1,7 @@ ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +Index: linux-2.6.32.13/arch/mips/bcm63xx/boards/board_bcm963xx.c +=================================================================== +--- 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 <bcm63xx_dev_pcmcia.h> #include <bcm63xx_dev_usb_ohci.h> @@ -8,7 +10,7 @@ #include <board_bcm963xx.h> #define PFX "board_bcm963xx: " -@@ -406,6 +407,7 @@ static struct board_info __initdata boar +@@ -390,6 +391,7 @@ .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, @@ -16,7 +18,7 @@ }; static struct board_info __initdata board_rta1025w_16 = { -@@ -950,6 +952,9 @@ int __init board_register_devices(void) +@@ -934,6 +936,9 @@ if (board.has_dsp) bcm63xx_dsp_register(&board.dsp); @@ -26,8 +28,10 @@ /* Generate MAC address for WLAN and * register our SPROM */ #ifdef CONFIG_SSB_PCIHOST ---- /dev/null -+++ b/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.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 <Henk.Vergonet@gmail.com> @@ -87,9 +91,11 @@ + udc_resources[1].start = bcm63xx_get_irq_number(IRQ_UDC0); + return platform_device_register(&bcm63xx_udc_device); +} ---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h -+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h -@@ -125,7 +125,7 @@ enum bcm63xx_regs_set { +Index: linux-2.6.32.13/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h +=================================================================== +--- 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) #define BCM_6338_SPI_BASE (0xfffe0c00) @@ -98,7 +104,7 @@ #define BCM_6338_USBDMA_BASE (0xfffe2400) #define BCM_6338_OHCI0_BASE (0xdeadbeef) #define BCM_6338_OHCI_PRIV_BASE (0xfffe3000) -@@ -155,7 +155,7 @@ enum bcm63xx_regs_set { +@@ -155,7 +155,7 @@ #define BCM_6345_UART0_BASE (0xfffe0300) #define BCM_6345_GPIO_BASE (0xfffe0400) #define BCM_6345_SPI_BASE (0xdeadbeef) @@ -107,7 +113,7 @@ #define BCM_6345_USBDMA_BASE (0xfffe2800) #define BCM_6345_ENET0_BASE (0xfffe1800) #define BCM_6345_ENETDMA_BASE (0xfffe2800) -@@ -210,7 +210,7 @@ enum bcm63xx_regs_set { +@@ -210,7 +210,7 @@ #define BCM_6358_UART0_BASE (0xfffe0100) #define BCM_6358_GPIO_BASE (0xfffe0080) #define BCM_6358_SPI_BASE (0xdeadbeef) @@ -116,7 +122,7 @@ #define BCM_6358_OHCI0_BASE (0xfffe1400) #define BCM_6358_OHCI_PRIV_BASE (0xdeadbeef) #define BCM_6358_USBH_PRIV_BASE (0xfffe1500) -@@ -430,6 +430,7 @@ enum bcm63xx_irq { +@@ -430,6 +430,7 @@ IRQ_TIMER = 0, IRQ_UART0, IRQ_DSL, @@ -124,7 +130,7 @@ IRQ_ENET0, IRQ_ENET1, IRQ_ENET_PHY, -@@ -472,7 +473,7 @@ enum bcm63xx_irq { +@@ -472,7 +473,7 @@ #define BCM_6345_UART0_IRQ (IRQ_INTERNAL_BASE + 2) #define BCM_6345_DSL_IRQ (IRQ_INTERNAL_BASE + 3) #define BCM_6345_ATM_IRQ (IRQ_INTERNAL_BASE + 4) @@ -133,7 +139,7 @@ #define BCM_6345_ENET0_IRQ (IRQ_INTERNAL_BASE + 8) #define BCM_6345_ENET_PHY_IRQ (IRQ_INTERNAL_BASE + 12) #define BCM_6345_ENET0_RXDMA_IRQ (IRQ_INTERNAL_BASE + 13 + 1) -@@ -494,10 +495,17 @@ enum bcm63xx_irq { +@@ -494,10 +495,17 @@ #define BCM_6348_TIMER_IRQ (IRQ_INTERNAL_BASE + 0) #define BCM_6348_UART0_IRQ (IRQ_INTERNAL_BASE + 2) #define BCM_6348_DSL_IRQ (IRQ_INTERNAL_BASE + 4) @@ -151,8 +157,10 @@ #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) ---- /dev/null -+++ b/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.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_ @@ -160,9 +168,11 @@ +int bcm63xx_udc_register(void); + +#endif /* BCM63XX_DEV_USB_UDC_H_ */ ---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h -@@ -45,6 +45,7 @@ struct board_info { +Index: linux-2.6.32.13/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h +=================================================================== +--- 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; unsigned int has_dsp:1; @@ -170,8 +180,10 @@ /* ethernet config */ struct bcm63xx_enet_platform_data enet0; ---- a/arch/mips/bcm63xx/Makefile -+++ b/arch/mips/bcm63xx/Makefile +Index: linux-2.6.32.13/arch/mips/bcm63xx/Makefile +=================================================================== +--- 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 \ @@ -180,9 +192,11 @@ obj-$(CONFIG_EARLY_PRINTK) += early_printk.o obj-y += boards/ ---- a/arch/mips/bcm63xx/clk.c -+++ b/arch/mips/bcm63xx/clk.c -@@ -141,6 +141,30 @@ static struct clk clk_usbh = { +Index: linux-2.6.32.13/arch/mips/bcm63xx/clk.c +=================================================================== +--- 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 @@ }; /* @@ -213,7 +227,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 @@ return &clk_ephy; if (!strcmp(id, "usbh")) return &clk_usbh; @@ -222,9 +236,11 @@ if (!strcmp(id, "spi")) return &clk_spi; if (!strcmp(id, "periph")) ---- a/arch/mips/bcm63xx/Kconfig -+++ b/arch/mips/bcm63xx/Kconfig -@@ -7,6 +7,7 @@ config BCM63XX_CPU_6338 +Index: linux-2.6.32.13/arch/mips/bcm63xx/Kconfig +=================================================================== +--- 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 select USB_OHCI_BIG_ENDIAN_MMIO @@ -232,7 +248,7 @@ config BCM63XX_CPU_6345 bool "support 6345 CPU" -@@ -19,6 +20,7 @@ config BCM63XX_CPU_6348 +@@ -19,6 +20,7 @@ select USB_ARCH_HAS_OHCI select USB_OHCI_BIG_ENDIAN_DESC select USB_OHCI_BIG_ENDIAN_MMIO |