X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fatheros-2.6%2Ffiles%2Farch%2Fmips%2Fatheros%2Far5312.c;h=57d56eb0e5e69e265efec2136a908f50600d842f;hb=51dad7245443d4a057687669bc34bcf934c2f483;hp=8404b882c2c3b02a8d2a5b622dc719c19f6c9808;hpb=cedcb81f3062e399a9d37518d11af293f04e8522;p=openwrt-10.03%2F.git

diff --git a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312.c b/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312.c
index 8404b882c..57d56eb0e 100644
--- a/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312.c
+++ b/target/linux/atheros-2.6/files/arch/mips/atheros/ar5312.c
@@ -215,6 +215,7 @@ int __init ar5312_init_devices(void)
 	struct ar531x_boarddata *bcfg;
 	char *radio, *c;
 	int dev = 0;
+	uint32_t fctl = 0;
 
 	if (!is_5312)
 		return 0;
@@ -253,6 +254,19 @@ int __init ar5312_init_devices(void)
 
 	ar5312_eth0_data.board_config = board_config;
 	ar5312_eth1_data.board_config = board_config;
+
+	/* fixup flash width */
+	fctl = sysRegRead(AR531X_FLASHCTL) & FLASHCTL_MW;
+	switch (fctl) {
+		case FLASHCTL_MWx16:
+			ar5312_flash_data.width = 2;
+			break;
+		case FLASHCTL_MWx8:
+		default:
+			ar5312_flash_data.width = 1;
+			break;
+	}
+
 	ar5312_devs[dev++] = &ar5312_physmap_flash;
 
 	if (!memcmp(bcfg->enet0Mac, "\xff\xff\xff\xff\xff\xff", 6))