[brcm63xx] more bcm6338 and bcm6345 related fixes

[openwrt.git] / target / linux / brcm63xx / files / include / asm-mips / mach-bcm63xx / bcm63xx_cpu.h

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 2ad2c9d..9bce144 100644 (file)
--- 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
@@ -121,6 +121,7 @@ enum bcm63xx_regs_set {
  * 6338 register sets base address
  */
 
  * 6338 register sets base address
  */
 

+#define BCM_6338_DSL_LMEM_BASE         (0xfff00000)

 #define BCM_6338_PERF_BASE             (0xfffe0000)
 #define BCM_6338_BB_BASE               (0xfffe0100) /* bus bridge registers */
 #define BCM_6338_TIMER_BASE            (0xfffe0200)
 #define BCM_6338_PERF_BASE             (0xfffe0000)
 #define BCM_6338_BB_BASE               (0xfffe0100) /* bus bridge registers */
 #define BCM_6338_TIMER_BASE            (0xfffe0200)


@@ -134,7 +135,9 @@ enum bcm63xx_regs_set {
 #define BCM_6338_USBDMA_BASE           (0xfffe2400)
 #define BCM_6338_ENET0_BASE            (0xfffe2800)
 #define BCM_6338_UDC0_BASE             (0xfffe3000) /* USB_CTL_BASE */
 #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)
+#define BCM_6338_SDRAM_REGS_BASE       (0xfffe3100)
+#define BCM_6338_SDRAM_BASE            (0xfffe3100)
+#define BCM_6338_MEMC_BASE             (0xdeadbeef)

 
 /*
  * 6345 register sets base address
 
 /*
  * 6345 register sets base address


@@ -211,6 +214,8 @@ static inline unsigned long bcm63xx_regset_address(enum bcm63xx_regs_set set)
 #else
 #ifdef CONFIG_BCM63XX_CPU_6338
        switch (set) {
 #else
 #ifdef CONFIG_BCM63XX_CPU_6338
        switch (set) {

+       case RSET_DSL_LMEM:
+               return BCM_6338_DSL_LMEM_BASE;

        case RSET_PERF:
                return BCM_6338_PERF_BASE;
        case RSET_TIMER:
        case RSET_PERF:
                return BCM_6338_PERF_BASE;
        case RSET_TIMER:


@@ -225,6 +230,8 @@ static inline unsigned long bcm63xx_regset_address(enum bcm63xx_regs_set set)
                return BCM_6338_SPI_BASE;
        case RSET_MEMC:
                return BCM_6338_MEMC_BASE;
                return BCM_6338_SPI_BASE;
        case RSET_MEMC:
                return BCM_6338_MEMC_BASE;

+       case RSET_SDRAM:
+               return BCM_6338_SDRAM_BASE;

        }
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6345
        }
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6345