atheros[ar2315-spiflash]: print detected flash size

[openwrt/svn-archive/archive.git] / target / linux / atheros / patches-3.10 / 120-spiflash.patch

diff --git a/target/linux/atheros/patches-3.10/120-spiflash.patch b/target/linux/atheros/patches-3.10/120-spiflash.patch
index 7f8acd095eec74e89b1817049fef57805171d4b9..262af6094c95f0feff6ffba364f7def53e884e20 100644 (file)
--- a/target/linux/atheros/patches-3.10/120-spiflash.patch
+++ b/target/linux/atheros/patches-3.10/120-spiflash.patch
@@ -23,7 +23,7 @@
  
 --- /dev/null
 +++ b/drivers/mtd/devices/ar2315.c
-@@ -0,0 +1,519 @@
+@@ -0,0 +1,527 @@
 +
 +/*
 + * MTD driver for the SPI Flash Memory support on Atheros AR2315
@@ -91,11 +91,16 @@
 +
 +const struct flashconfig flashconfig_tbl[] = {
 +      [FLASH_NONE] = { 0, 0, 0},
-+      [FLASH_1MB]  = { STM_1MB_BYTE_COUNT, STM_1MB_SECTOR_COUNT, STM_1MB_SECTOR_SIZE},
-+      [FLASH_2MB]  = { STM_2MB_BYTE_COUNT, STM_2MB_SECTOR_COUNT, STM_2MB_SECTOR_SIZE},
-+      [FLASH_4MB]  = { STM_4MB_BYTE_COUNT, STM_4MB_SECTOR_COUNT, STM_4MB_SECTOR_SIZE},
-+      [FLASH_8MB]  = { STM_8MB_BYTE_COUNT, STM_8MB_SECTOR_COUNT, STM_8MB_SECTOR_SIZE},
-+      [FLASH_16MB] = { STM_16MB_BYTE_COUNT, STM_16MB_SECTOR_COUNT, STM_16MB_SECTOR_SIZE}
++      [FLASH_1MB]  = { STM_1MB_BYTE_COUNT, STM_1MB_SECTOR_COUNT,
++                       STM_1MB_SECTOR_SIZE},
++      [FLASH_2MB]  = { STM_2MB_BYTE_COUNT, STM_2MB_SECTOR_COUNT,
++                       STM_2MB_SECTOR_SIZE},
++      [FLASH_4MB]  = { STM_4MB_BYTE_COUNT, STM_4MB_SECTOR_COUNT,
++                       STM_4MB_SECTOR_SIZE},
++      [FLASH_8MB]  = { STM_8MB_BYTE_COUNT, STM_8MB_SECTOR_COUNT,
++                       STM_8MB_SECTOR_SIZE},
++      [FLASH_16MB] = { STM_16MB_BYTE_COUNT, STM_16MB_SECTOR_COUNT,
++                       STM_16MB_SECTOR_SIZE}
 +};
 +
 +/* Mapping of generic opcodes to STM serial flash opcodes */
@@ -152,7 +157,7 @@
 +      FL_WRITING
 +};
 +
-+/***************************************************************************************************/
++/*****************************************************************************/
 +
 +static u32
 +spiflash_read_reg(struct spiflash_priv *priv, int reg)
@@ -468,7 +473,8 @@
 +              goto error;
 +      }
 +
-+      priv->readaddr = ioremap_nocache(SPI_FLASH_READ, flashconfig_tbl[index].byte_cnt);
++      priv->readaddr = ioremap_nocache(SPI_FLASH_READ,
++                                       flashconfig_tbl[index].byte_cnt);
 +      if (!priv->readaddr) {
 +              dev_warn(&pdev->dev, SPIFLASH "Failed to map flash device\n");
 +              goto error;
@@ -488,6 +494,8 @@
 +      mtd->_write = spiflash_write;
 +      mtd->owner = THIS_MODULE;
 +
++      dev_info(&pdev->dev, "%lld Kbytes flash detected\n", mtd->size >> 10);
++
 +#if defined CONFIG_MTD_REDBOOT_PARTS || CONFIG_MTD_MYLOADER_PARTS
 +      /* parse redboot partitions */
 +