diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-10-05 11:39:32 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-10-05 11:39:32 +0000 |
| commit | 3014c2fffa5e600006bc6af618085c331c7ccee1 (patch) | |
| tree | 0636426488d8633521d5bea29ab729cea2bfc0e9 /target/linux/rb532/files/arch/mips/rb500/devices.c | |
| parent | 36c22a772038342cb7224a3d6e0ae4acd3434284 (diff) | |
Clean up the prom code / board detection (thanks Gabor), fix some warnings
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9136 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/rb532/files/arch/mips/rb500/devices.c')
| -rw-r--r-- | target/linux/rb532/files/arch/mips/rb500/devices.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/target/linux/rb532/files/arch/mips/rb500/devices.c b/target/linux/rb532/files/arch/mips/rb500/devices.c index 1ca808bea..d2476a89c 100644 --- a/target/linux/rb532/files/arch/mips/rb500/devices.c +++ b/target/linux/rb532/files/arch/mips/rb500/devices.c @@ -23,6 +23,8 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> +#include <asm/bootinfo.h> + #include <asm/rc32434/rc32434.h> #include <asm/rc32434/dma.h> #include <asm/rc32434/dma_v.h> @@ -230,10 +232,14 @@ static void __init parse_mac_addr(char *macstr) static void __init rb500_nand_setup(void) { - if (!strcmp(board_type, "500r5")) + switch (mips_machtype) { + case MACH_MIKROTIK_RB532A: changeLatchU5(LO_FOFF | LO_CEX, LO_ULED | LO_ALE | LO_CLE | LO_WPX); - else + break; + default: changeLatchU5(LO_WPX | LO_FOFF | LO_CEX, LO_ULED | LO_ALE | LO_CLE); + break; + } /* Setup NAND specific settings */ rb500_nand_data.chip.nr_chips = 1; @@ -258,7 +264,7 @@ static int __init plat_setup_devices(void) /* Read the NAND resources from the device controller */ nand_slot0_res[0].start = readl(CFG_DC_DEV2 + CFG_DC_DEVBASE); nand_slot0_res[0].end = nand_slot0_res[0].start + 0x1000; - + /* Initialise the NAND device */ rb500_nand_setup(); |