diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-08-11 18:50:07 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-08-11 18:50:07 +0000 |
| commit | 21b6860b2bc0ea5b07782f3076b3d8e9d6881828 (patch) | |
| tree | 95f7a229cd5ebdb9fc8b082071c1f0362d8750db | |
| parent | 568f8e5113241888b5b4f122427c77678ae031b2 (diff) | |
[brcm63xx] more bcm63xx definition fixes, thanks AndyI
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17227 3c298f89-4303-0410-b956-a3cf2f4a3e73
5 files changed, 12 insertions, 10 deletions
diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/clk.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/clk.c index 4d1186eed2..eaf6196c75 100644 --- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/clk.c +++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/clk.c @@ -149,6 +149,7 @@ static void usbs_set(struct clk *clk, int enable) switch(bcm63xx_get_cpu_id()) { case BCM6338_CPU_ID: mask = CKCTL_6338_USBS_EN; break; + case BCM6345_CPU_ID: mask = CKCTL_6345_USBS_EN; break; case BCM6348_CPU_ID: mask = CKCTL_6348_USBS_EN; break; default: return; diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/cpu.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/cpu.c index 937c830b91..00da28286a 100644 --- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/cpu.c +++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/cpu.c @@ -115,6 +115,7 @@ static const int bcm96345_irqs[] = { [IRQ_TIMER] = BCM_6345_TIMER_IRQ, [IRQ_UART0] = BCM_6345_UART0_IRQ, [IRQ_DSL] = BCM_6345_DSL_IRQ, + [IRQ_UDC0] = BCM_6345_UDC0_IRQ, [IRQ_ENET0] = BCM_6345_ENET0_IRQ, [IRQ_ENET_PHY] = BCM_6345_ENET_PHY_IRQ, [IRQ_ENET0_RXDMA] = BCM_6345_ENET0_RXDMA_IRQ, diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-usb-udc.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-usb-udc.c index 4459f2f003..c5f1070c3b 100644 --- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-usb-udc.c +++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-usb-udc.c @@ -47,7 +47,7 @@ static struct platform_device bcm63xx_udc_device = { int __init bcm63xx_udc_register(void) { - if (!BCMCPU_IS_6338() && !BCMCPU_IS_6348()) + if (!BCMCPU_IS_6338() && !BCMCPU_IS_6345() && !BCMCPU_IS_6348()) return 0; udc_resources[0].start = bcm63xx_regset_address(RSET_UDC0); 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 693989c6b8..e27bd5b3d0 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 @@ -129,10 +129,10 @@ enum bcm63xx_regs_set { #define BCM_6338_UART0_BASE (0xfffe0300) #define BCM_6338_GPIO_BASE (0xfffe0400) #define BCM_6338_SPI_BASE (0xfffe0c00) -#define BCM_6338_UDC0_BASE (0xdeadbeef) +#define BCM_6338_UDC0_BASE (0xfffe3000) #define BCM_6338_USBDMA_BASE (0xfffe2400) #define BCM_6338_OHCI0_BASE (0xdeadbeef) -#define BCM_6338_OHCI_PRIV_BASE (0xfffe3000) +#define BCM_6338_OHCI_PRIV_BASE (0xdeadbeef) #define BCM_6338_USBH_PRIV_BASE (0xdeadbeef) #define BCM_6338_MPI_BASE (0xfffe3160) #define BCM_6338_PCMCIA_BASE (0xdeadbeef) @@ -159,14 +159,14 @@ enum bcm63xx_regs_set { #define BCM_6345_UART0_BASE (0xfffe0300) #define BCM_6345_GPIO_BASE (0xfffe0400) #define BCM_6345_SPI_BASE (0xdeadbeef) -#define BCM_6345_UDC0_BASE (0xdeadbeef) -#define BCM_6345_USBDMA_BASE (0xfffe2800) +#define BCM_6345_UDC0_BASE (0xfffe2100) +#define BCM_6345_USBDMA_BASE (0xfffe2b00) #define BCM_6345_ENET0_BASE (0xfffe1800) #define BCM_6345_ENETDMA_BASE (0xfffe2800) #define BCM_6345_PCMCIA_BASE (0xfffe2028) #define BCM_6345_MPI_BASE (0xdeadbeef) -#define BCM_6345_OHCI0_BASE (0xfffe2100) -#define BCM_6345_OHCI_PRIV_BASE (0xfffe2200) +#define BCM_6345_OHCI0_BASE (0xdeadbeef) +#define BCM_6345_OHCI_PRIV_BASE (0xdeadbeef) #define BCM_6345_USBH_PRIV_BASE (0xdeadbeef) #define BCM_6345_SDRAM_REGS_BASE (0xfffe2300) #define BCM_6345_DSL_BASE (0xdeadbeef) @@ -598,7 +598,7 @@ enum bcm63xx_irq { #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) -#define BCM_6345_USB_IRQ (IRQ_INTERNAL_BASE + 5) +#define BCM_6345_UDC0_IRQ (IRQ_INTERNAL_BASE + 5) #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) diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_regs.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_regs.h index f7162f9f89..e2cc60758e 100644 --- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_regs.h +++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_regs.h @@ -35,10 +35,10 @@ #define CKCTL_6345_UART_EN (1 << 3) #define CKCTL_6345_ADSLPHY_EN (1 << 4) #define CKCTL_6345_ENET_EN (1 << 7) -#define CKCTL_6345_USBH_EN (1 << 8) +#define CKCTL_6345_USBS_EN (1 << 8) #define CKCTL_6345_ALL_SAFE_EN (CKCTL_6345_ENET_EN | \ - CKCTL_6345_USBH_EN | \ + CKCTL_6345_USBS_EN | \ CKCTL_6345_ADSLPHY_EN) #define CKCTL_6348_ADSLPHY_EN (1 << 0) |