diff options
author | Florian Fainelli <florian@openwrt.org> | 2009-06-27 20:32:43 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2009-06-27 20:32:43 +0000 |
commit | c6eb086771de14ecb04289be1ec1bf2295bbf350 (patch) | |
tree | d2ae79231fcbf10cb595d0be23a76d31fd7b322f /target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c | |
parent | ce27f824edabf0234a412927d4bf52336030bbc9 (diff) | |
download | master-187ad058-c6eb086771de14ecb04289be1ec1bf2295bbf350.tar.gz master-187ad058-c6eb086771de14ecb04289be1ec1bf2295bbf350.tar.bz2 master-187ad058-c6eb086771de14ecb04289be1ec1bf2295bbf350.zip |
[brcm63xx] more fixes for bcm6338, no need not to prevent reads from MPI registers now that we have it defined correctly
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16589 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c')
-rw-r--r-- | target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c index c41951b988..e27264dfdf 100644 --- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -45,11 +45,11 @@ static struct board_info board; static struct board_info __initdata board_96338gw = { .name = "96338GW", .expected_cpu_id = 0x6338, - + .has_enet0 = 1, .enet0 = { - .has_phy = 1, - .use_internal_phy = 1, + .force_speed_100 = 1, + .force_duplex_full = 1, }, .has_ohci0 = 1, @@ -58,8 +58,12 @@ static struct board_info __initdata board_96338gw = { static struct board_info __initdata board_96338w = { .name = "96338W", .expected_cpu_id = 0x6338, - + .has_enet0 = 1, + .enet0 = { + .force_speed_100 = 1, + .force_duplex_full = 1, + } }; #endif @@ -326,7 +330,7 @@ void __init board_prom_init(void) /* read base address of boot chip select (0) * 6338/6345 does not have MPI but boots from standard * MIPS Flash address */ - if (BCMCPU_IS_6338() || BCMCPU_IS_6345()) + if (BCMCPU_IS_6345()) val = 0x1fc00000; else { val = bcm_mpi_readl(MPI_CSBASE_REG(0)); @@ -554,7 +558,7 @@ int __init board_register_devices(void) #endif /* read base address of boot chip select (0) */ - if (BCMCPU_IS_6338() || BCMCPU_IS_6345()) + if (BCMCPU_IS_6345()) val = 0x1fc0000; else { val = bcm_mpi_readl(MPI_CSBASE_REG(0)); |