KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more fixes for bcm6338, no need not to prevent reads from MPI registers now that we have it defined correctly

Browse source 
SVN-Revision: 16589
This commit is contained in:
Florian Fainelli 2009-06-27 20:32:43 +00:00
parent 5899460ebf
commit ca5de76ed3
3 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c
View file

@ -45,11 +45,11 @@ static struct board_info board;
static struct board_info __initdata board_96338gw = { static struct board_info __initdata board_96338gw = {
.name = "96338GW", .name = "96338GW",
.expected_cpu_id = 0x6338, .expected_cpu_id = 0x6338,
.has_enet0 = 1, .has_enet0 = 1,
.enet0 = { .enet0 = {
.has_phy = 1, .force_speed_100 = 1,
.use_internal_phy = 1, .force_duplex_full = 1,
}, },
.has_ohci0 = 1, .has_ohci0 = 1,
@ -58,8 +58,12 @@ static struct board_info __initdata board_96338gw = {
static struct board_info __initdata board_96338w = { static struct board_info __initdata board_96338w = {
.name = "96338W", .name = "96338W",
.expected_cpu_id = 0x6338, .expected_cpu_id = 0x6338,
.has_enet0 = 1, .has_enet0 = 1,
.enet0 = {
.force_speed_100 = 1,
.force_duplex_full = 1,
}
}; };
#endif #endif
@ -326,7 +330,7 @@ void __init board_prom_init(void)
/* read base address of boot chip select (0) /* read base address of boot chip select (0)
* 6338/6345 does not have MPI but boots from standard * 6338/6345 does not have MPI but boots from standard
* MIPS Flash address */ * MIPS Flash address */
if (BCMCPU_IS_6338() || BCMCPU_IS_6345()) if (BCMCPU_IS_6345())
val = 0x1fc00000; val = 0x1fc00000;
else { else {
val = bcm_mpi_readl(MPI_CSBASE_REG(0)); val = bcm_mpi_readl(MPI_CSBASE_REG(0));
@ -554,7 +558,7 @@ int __init board_register_devices(void)
#endif #endif
/* read base address of boot chip select (0) */ /* read base address of boot chip select (0) */
if (BCMCPU_IS_6338() || BCMCPU_IS_6345()) if (BCMCPU_IS_6345())
val = 0x1fc0000; val = 0x1fc0000;
else { else {
val = bcm_mpi_readl(MPI_CSBASE_REG(0)); val = bcm_mpi_readl(MPI_CSBASE_REG(0));

8
target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h
View file

@ -123,7 +123,7 @@ enum bcm63xx_regs_set {
#define BCM_6338_DSL_LMEM_BASE (0xfff00000) #define BCM_6338_DSL_LMEM_BASE (0xfff00000)
#define BCM_6338_PERF_BASE (0xfffe0000) #define BCM_6338_PERF_BASE (0xfffe0000)
#define BCM_6338_BB_BASE (0xdeadbeef) #define BCM_6338_BB_BASE (0xfffe0100)
#define BCM_6338_TIMER_BASE (0xfffe0200) #define BCM_6338_TIMER_BASE (0xfffe0200)
#define BCM_6338_WDT_BASE (0xfffe021c) #define BCM_6338_WDT_BASE (0xfffe021c)
#define BCM_6338_UART0_BASE (0xfffe0300) #define BCM_6338_UART0_BASE (0xfffe0300)
@ -132,9 +132,9 @@ enum bcm63xx_regs_set {
#define BCM_6338_UDC0_BASE (0xdeadbeef) #define BCM_6338_UDC0_BASE (0xdeadbeef)
#define BCM_6338_USBDMA_BASE (0xfffe2400) #define BCM_6338_USBDMA_BASE (0xfffe2400)
#define BCM_6338_OHCI0_BASE (0xdeadbeef) #define BCM_6338_OHCI0_BASE (0xdeadbeef)
#define BCM_6338_OHCI_PRIV_BASE (0xdeadbeef) #define BCM_6338_OHCI_PRIV_BASE (0xfffe3000)
#define BCM_6338_USBH_PRIV_BASE (0xdeadbeef) #define BCM_6338_USBH_PRIV_BASE (0xdeadbeef)
#define BCM_6338_MPI_BASE (0xdeadbeef) #define BCM_6338_MPI_BASE (0xfffe3160)
#define BCM_6338_PCMCIA_BASE (0xdeadbeef) #define BCM_6338_PCMCIA_BASE (0xdeadbeef)
#define BCM_6338_SDRAM_REGS_BASE (0xfffe3100) #define BCM_6338_SDRAM_REGS_BASE (0xfffe3100)
#define BCM_6338_DSL_BASE (0xfffe1000) #define BCM_6338_DSL_BASE (0xfffe1000)
@ -142,7 +142,7 @@ enum bcm63xx_regs_set {
#define BCM_6338_UBUS_BASE (0xdeadbeef) #define BCM_6338_UBUS_BASE (0xdeadbeef)
#define BCM_6338_ENET0_BASE (0xfffe2800) #define BCM_6338_ENET0_BASE (0xfffe2800)
#define BCM_6338_ENET1_BASE (0xdeadbeef) #define BCM_6338_ENET1_BASE (0xdeadbeef)
#define BCM_6338_ENETDMA_BASE (0xfffe3800) #define BCM_6338_ENETDMA_BASE (0xfffe2400)
#define BCM_6338_EHCI0_BASE (0xdeadbeef) #define BCM_6338_EHCI0_BASE (0xdeadbeef)
#define BCM_6338_SDRAM_BASE (0xfffe3100) #define BCM_6338_SDRAM_BASE (0xfffe3100)
#define BCM_6338_MEMC_BASE (0xdeadbeef) #define BCM_6338_MEMC_BASE (0xdeadbeef)

7
target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_regs.h
View file

@ -15,12 +15,17 @@
/* Clock Control register */ /* Clock Control register */
#define PERF_CKCTL_REG 0x4 #define PERF_CKCTL_REG 0x4
#define CKCTL_6338_ADSLPHY_EN (1 << 0)
#define CKCTL_6338_MPI_EN (1 << 1)
#define CKCTL_6338_DRAM_EN (1 << 2)
#define CKCTL_6338_ENET_EN (1 << 4) #define CKCTL_6338_ENET_EN (1 << 4)
#define CKCTL_6338_USBS_EN (1 << 4) #define CKCTL_6338_USBS_EN (1 << 4)
#define CKCTL_6338_SAR_EN (1 << 5) #define CKCTL_6338_SAR_EN (1 << 5)
#define CKCTL_6338_SPI_EN (1 << 9) #define CKCTL_6338_SPI_EN (1 << 9)
#define CKCTL_6338_ALL_SAFE_EN (CKCTL_6338_ENET_EN | \ #define CKCTL_6338_ALL_SAFE_EN (CKCTL_6338_ADSLPHY_EN | \
CKCTL_6338_MPI_EN | \
CKCTL_6338_ENET_EN | \
CKCTL_6338_SAR_EN | \ CKCTL_6338_SAR_EN | \
CKCTL_6338_SPI_EN) CKCTL_6338_SPI_EN)