From: John Crispin <john@openwrt.org>
Date: Tue, 24 Jun 2014 18:13:13 +0000 (+0000)
Subject: atheros[ar2315]: don't detect flash size during board initialization
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8e3b055b2a506589fff3dbf3a2c854418bfded00;p=openwrt%2Fstaging%2Fadrian.git

atheros[ar2315]: don't detect flash size during board initialization

We should not detect actual flash size during board initialization to
find board config at the end of the flash, just use large enough mapping
size (currently 128 mbit). If mapping size is larger than the actual
flash size, than flash will simply be mapped multiple times. This change
simplifies code by removing duplication and saves about 200 bytes of
uncompressed kernel :)

Tested with Ubnt LS2 board equipped with STM 25p32v6p NOR flash (32 mbit).

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

SVN-Revision: 41317
---

diff --git a/target/linux/atheros/patches-3.10/100-board.patch b/target/linux/atheros/patches-3.10/100-board.patch
index 36d861c3e0..eb927f768a 100644
--- a/target/linux/atheros/patches-3.10/100-board.patch
+++ b/target/linux/atheros/patches-3.10/100-board.patch
@@ -2152,7 +2152,7 @@
 +
 --- /dev/null
 +++ b/arch/mips/ar231x/ar2315.c
-@@ -0,0 +1,696 @@
+@@ -0,0 +1,623 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 + * License.  See the file "COPYING" in the main directory of this archive
@@ -2546,86 +2546,13 @@
 +	.name = "ar2315_wdt",
 +};
 +
-+#define SPI_FLASH_CTL      0x00
-+#define SPI_FLASH_OPCODE   0x04
-+#define SPI_FLASH_DATA     0x08
-+
-+static inline u32
-+spiflash_read_reg(int reg)
-+{
-+	return ar231x_read_reg(AR2315_SPI + reg);
-+}
-+
-+static inline void
-+spiflash_write_reg(int reg, u32 data)
-+{
-+	ar231x_write_reg(AR2315_SPI + reg, data);
-+}
-+
-+static u32
-+spiflash_wait_status(void)
-+{
-+	u32 reg;
-+
-+	do {
-+		reg = spiflash_read_reg(SPI_FLASH_CTL);
-+	} while (reg & SPI_CTL_BUSY);
-+
-+	return reg;
-+}
-+
-+static u8
-+spiflash_probe(void)
-+{
-+	u32 reg;
-+
-+	reg = spiflash_wait_status();
-+	reg &= ~SPI_CTL_TX_RX_CNT_MASK;
-+	reg |= (1 << 4) | 4 | SPI_CTL_START;
-+
-+	spiflash_write_reg(SPI_FLASH_OPCODE, 0xab);
-+	spiflash_write_reg(SPI_FLASH_CTL, reg);
-+
-+	reg = spiflash_wait_status();
-+	reg = spiflash_read_reg(SPI_FLASH_DATA);
-+	reg &= 0xff;
-+
-+	return (u8) reg;
-+}
-+
-+
-+#define STM_8MBIT_SIGNATURE     0x13
-+#define STM_16MBIT_SIGNATURE    0x14
-+#define STM_32MBIT_SIGNATURE    0x15
-+#define STM_64MBIT_SIGNATURE    0x16
-+#define STM_128MBIT_SIGNATURE   0x17
-+
-+static u8 __init *
-+ar2315_flash_limit(void)
++/*
++ * NB: We use mapping size that is larger than the actual flash size,
++ * but this shouldn't be a problem here, because the flash will simply
++ * be mapped multiple times.
++ */
++static u8 __init *ar2315_flash_limit(void)
 +{
-+	u32 flash_size = 0;
-+
-+	/* probe the flash chip size */
-+	switch (spiflash_probe()) {
-+	case STM_8MBIT_SIGNATURE:
-+		flash_size = 0x00100000;
-+		break;
-+	case STM_16MBIT_SIGNATURE:
-+		flash_size = 0x00200000;
-+		break;
-+	case STM_32MBIT_SIGNATURE:
-+		flash_size = 0x00400000;
-+		break;
-+	case STM_64MBIT_SIGNATURE:
-+		flash_size = 0x00800000;
-+		break;
-+	case STM_128MBIT_SIGNATURE:
-+		flash_size = 0x01000000;
-+		break;
-+	}
-+
-+	ar2315_spiflash_res[0].end = ar2315_spiflash_res[0].start +
-+		flash_size - 1;
 +	return (u8 *)ar2315_spiflash_res[0].end + 1;
 +}
 +