diff options
author | Florian Fainelli <florian@openwrt.org> | 2009-03-17 11:28:54 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2009-03-17 11:28:54 +0000 |
commit | 32c29f1aafd66721153ef54a32d311d0c0a749b8 (patch) | |
tree | 978c545e5707615f3837b714e65603e8296dc15c /target/linux/brcm63xx/files/include/asm-mips | |
parent | fb5b85c7c88fb710fdf9e5f0253127fc7e0443d3 (diff) | |
download | master-31e0f0ae-32c29f1aafd66721153ef54a32d311d0c0a749b8.tar.gz master-31e0f0ae-32c29f1aafd66721153ef54a32d311d0c0a749b8.tar.bz2 master-31e0f0ae-32c29f1aafd66721153ef54a32d311d0c0a749b8.zip |
fix SPI register switch and prepare for UDC, thanks to Henk Vergonet (#4783)
SVN-Revision: 14914
Diffstat (limited to 'target/linux/brcm63xx/files/include/asm-mips')
3 files changed, 33 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h index 87e1aaf8cf..74e553f7da 100644 --- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h +++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h @@ -4,6 +4,8 @@ #include <linux/types.h> #include <linux/init.h> +#include <bcm63xx_regs.h> + /* * Macro to fetch bcm63xx cpu id and revision, should be optimized at * compile time if only one CPU support is enabled (idea stolen from @@ -106,12 +108,18 @@ enum bcm63xx_regs_set { */ #define BCM_6338_PERF_BASE (0xfffe0000) -#define BCM_6338_TIMER_BASE (0xfffe0000) -#define BCM_6338_WDT_BASE (0xfffe001c) +#define BCM_6338_BB_BASE (0xfffe0100) /* bus bridge registers */ +#define BCM_6338_TIMER_BASE (0xfffe0200) +#define BCM_6338_WDT_BASE (0xfffe021c) #define BCM_6338_UART0_BASE (0xfffe0300) #define BCM_6338_GPIO_BASE (0xfffe0400) #define BCM_6338_SPI_BASE (0xfffe0c00) +#define BCM_6338_DSL_BASE (0xfffe1000) #define BCM_6338_SAR_BASE (0xfffe2000) +#define BCM_6338_ENETDMA_BASE (0xfffe2400) +#define BCM_6338_USBDMA_BASE (0xfffe2400) +#define BCM_6338_ENET0_BASE (0xfffe2800) +#define BCM_6338_UDC0_BASE (0xfffe3000) /* USB_CTL_BASE */ #define BCM_6338_MEMC_BASE (0xfffe3100) /* @@ -119,12 +127,14 @@ enum bcm63xx_regs_set { */ #define BCM_6348_DSL_LMEM_BASE (0xfff00000) #define BCM_6348_PERF_BASE (0xfffe0000) +#define BCM_6348_BB_BASE (0xfffe0100) /* bus bridge registers */ #define BCM_6348_TIMER_BASE (0xfffe0200) #define BCM_6348_WDT_BASE (0xfffe021c) #define BCM_6348_UART0_BASE (0xfffe0300) #define BCM_6348_GPIO_BASE (0xfffe0400) #define BCM_6348_SPI_BASE (0xfffe0c00) #define BCM_6348_UDC0_BASE (0xfffe1000) +#define BCM_6348_USBDMA_BASE (0xfffe1400) #define BCM_6348_OHCI0_BASE (0xfffe1b00) #define BCM_6348_OHCI_PRIV_BASE (0xfffe1c00) #define BCM_6348_USBH_PRIV_BASE (0xdeadbeef) @@ -132,6 +142,8 @@ enum bcm63xx_regs_set { #define BCM_6348_PCMCIA_BASE (0xfffe2054) #define BCM_6348_SDRAM_REGS_BASE (0xfffe2300) #define BCM_6348_DSL_BASE (0xfffe3000) +#define BCM_6348_SAR_BASE (0xfffe4000) +#define BCM_6348_UBUS_BASE (0xfffe5000) #define BCM_6348_ENET0_BASE (0xfffe6000) #define BCM_6348_ENET1_BASE (0xfffe6800) #define BCM_6348_ENETDMA_BASE (0xfffe7000) @@ -351,6 +363,8 @@ switch (reg) { return SPI_BCM_6348_SPI_CMD; case SPI_INT_MASK_ST: return SPI_BCM_6348_SPI_MASK_INT_ST; + case SPI_INT_MASK: + return SPI_BCM_6348_SPI_INT_MASK; case SPI_INT_STATUS: return SPI_BCM_6348_SPI_INT_STATUS; case SPI_ST: @@ -367,7 +381,7 @@ switch (reg) { return SPI_BCM_6348_SPI_MSG_CTL; case SPI_MSG_DATA: return SPI_BCM_6348_SPI_MSG_DATA; - case SPI_BCM_6348_SPI_RX_DATA: + case SPI_RX_DATA: return SPI_BCM_6348_SPI_RX_DATA; } #endif @@ -411,6 +425,7 @@ enum bcm63xx_irq { IRQ_UART0, IRQ_SPI, IRQ_DSL, + IRQ_UDC0, IRQ_ENET0, IRQ_ENET1, IRQ_ENET_PHY, @@ -434,7 +449,7 @@ enum bcm63xx_irq { #define BCM_6338_DG_IRQ (IRQ_INTERNAL_BASE + 4) #define BCM_6338_DSL_IRQ (IRQ_INTERNAL_BASE + 5) #define BCM_6338_ATM_IRQ (IRQ_INTERNAL_BASE + 6) -#define BCM_6338_USBS_IRQ (IRQ_INTERNAL_BASE + 7) +#define BCM_6338_UDC0_IRQ (IRQ_INTERNAL_BASE + 7) #define BCM_6338_ENET0_IRQ (IRQ_INTERNAL_BASE + 8) #define BCM_6338_ENET_PHY_IRQ (IRQ_INTERNAL_BASE + 9) #define BCM_6338_SDRAM_IRQ (IRQ_INTERNAL_BASE + 10) @@ -453,10 +468,17 @@ enum bcm63xx_irq { #define BCM_6348_SPI_IRQ (IRQ_INTERNAL_BASE + 1) #define BCM_6348_UART0_IRQ (IRQ_INTERNAL_BASE + 2) #define BCM_6348_DSL_IRQ (IRQ_INTERNAL_BASE + 4) +#define BCM_6348_UDC0_IRQ (IRQ_INTERNAL_BASE + 6) #define BCM_6348_ENET1_IRQ (IRQ_INTERNAL_BASE + 7) #define BCM_6348_ENET0_IRQ (IRQ_INTERNAL_BASE + 8) #define BCM_6348_ENET_PHY_IRQ (IRQ_INTERNAL_BASE + 9) #define BCM_6348_OHCI0_IRQ (IRQ_INTERNAL_BASE + 12) +#define BCM_6348_USB_CNTL_RX_DMA (IRQ_INTERNAL_BASE + 14) +#define BCM_6348_USB_CNTL_TX_DMA (IRQ_INTERNAL_BASE + 15) +#define BCM_6348_USB_BULK_RX_DMA (IRQ_INTERNAL_BASE + 16) +#define BCM_6348_USB_BULK_TX_DMA (IRQ_INTERNAL_BASE + 17) +#define BCM_6348_USB_ISO_RX_DMA (IRQ_INTERNAL_BASE + 18) +#define BCM_6348_USB_ISO_TX_DMA (IRQ_INTERNAL_BASE + 19) #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) diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_dev_usb_udc.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_dev_usb_udc.h new file mode 100644 index 0000000000..54d37f0bc7 --- /dev/null +++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_dev_usb_udc.h @@ -0,0 +1,6 @@ +#ifndef BCM63XX_DEV_USB_UDC_H_ +#define BCM63XX_DEV_USB_UDC_H_ + +int bcm63xx_udc_register(void); + +#endif /* BCM63XX_DEV_USB_UDC_H_ */ diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/board_bcm963xx.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/board_bcm963xx.h index 17e4e7ec91..2f357fa87e 100644 --- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/board_bcm963xx.h +++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/board_bcm963xx.h @@ -41,6 +41,7 @@ struct board_info { unsigned int has_pccard:1; unsigned int has_ohci0:1; unsigned int has_ehci0:1; + unsigned int has_udc0:1; /* ethernet config */ struct bcm63xx_enet_platform_data enet0; |