target/linux/atheros/patches-3.10/120-spiflash.patch

   1 --- a/drivers/mtd/devices/Kconfig
   2 +++ b/drivers/mtd/devices/Kconfig
   3 @@ -135,6 +135,10 @@ config MTD_BCM47XXSFLASH
   4           registered by bcma as platform devices. This enables driver for
   5           serial flash memories (only read-only mode is implemented).
   6
   7 +config MTD_AR2315
   8 +       tristate "Atheros AR2315+ SPI Flash support"
   9 +       depends on ATHEROS_AR2315
  10 +
  11  config MTD_SLRAM
  12         tristate "Uncached system RAM"
  13         help
  14 --- a/drivers/mtd/devices/Makefile
  15 +++ b/drivers/mtd/devices/Makefile
  16 @@ -15,6 +15,7 @@ obj-$(CONFIG_MTD_M25P80)      += m25p80.o
  17  obj-$(CONFIG_MTD_NAND_OMAP_BCH)        += elm.o
  18  obj-$(CONFIG_MTD_SPEAR_SMI)    += spear_smi.o
  19  obj-$(CONFIG_MTD_SST25L)       += sst25l.o
  20 +obj-$(CONFIG_MTD_AR2315)       += ar2315.o
  21  obj-$(CONFIG_MTD_BCM47XXSFLASH)        += bcm47xxsflash.o
  22
  23
  24 --- /dev/null
  25 +++ b/drivers/mtd/devices/ar2315.c
  26 @@ -0,0 +1,514 @@
  27 +
  28 +/*
  29 + * MTD driver for the SPI Flash Memory support on Atheros AR2315
  30 + *
  31 + * Copyright (c) 2005-2006 Atheros Communications Inc.
  32 + * Copyright (C) 2006-2007 FON Technology, SL.
  33 + * Copyright (C) 2006-2007 Imre Kaloz <kaloz@openwrt.org>
  34 + * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
  35 + * Copyright (C) 2012 Alexandros C. Couloumbis <alex@ozo.com>
  36 + *
  37 + * This code is free software; you can redistribute it and/or modify
  38 + * it under the terms of the GNU General Public License version 2 as
  39 + * published by the Free Software Foundation.
  40 + *
  41 + */
  42 +
  43 +#include <linux/kernel.h>
  44 +#include <linux/module.h>
  45 +#include <linux/types.h>
  46 +#include <linux/version.h>
  47 +#include <linux/errno.h>
  48 +#include <linux/slab.h>
  49 +#include <linux/mtd/mtd.h>
  50 +#include <linux/mtd/partitions.h>
  51 +#include <linux/platform_device.h>
  52 +#include <linux/sched.h>
  53 +#include <linux/root_dev.h>
  54 +#include <linux/delay.h>
  55 +#include <linux/io.h>
  56 +
  57 +#include <ar2315_spiflash.h>
  58 +#include <ar231x_platform.h>
  59 +#include <ar231x.h>
  60 +
  61 +
  62 +#define SPIFLASH "spiflash: "
  63 +#define busy_wait(_priv, _condition, _wait) do { \
  64 +       while (_condition) { \
  65 +               spin_unlock_bh(&_priv->lock); \
  66 +               if (_wait > 1) \
  67 +                       msleep(_wait); \
  68 +               else if ((_wait == 1) && need_resched()) \
  69 +                       schedule(); \
  70 +               else \
  71 +                       udelay(1); \
  72 +               spin_lock_bh(&_priv->lock); \
  73 +       } \
  74 +} while (0)
  75 +
  76 +enum {
  77 +       FLASH_NONE,
  78 +       FLASH_1MB,
  79 +       FLASH_2MB,
  80 +       FLASH_4MB,
  81 +       FLASH_8MB,
  82 +       FLASH_16MB,
  83 +};
  84 +
  85 +/* Flash configuration table */
  86 +struct flashconfig {
  87 +       u32 byte_cnt;
  88 +       u32 sector_cnt;
  89 +       u32 sector_size;
  90 +};
  91 +
  92 +const struct flashconfig flashconfig_tbl[] = {
  93 +       [FLASH_NONE] = { 0, 0, 0},
  94 +       [FLASH_1MB]  = { STM_1MB_BYTE_COUNT, STM_1MB_SECTOR_COUNT, STM_1MB_SECTOR_SIZE},
  95 +       [FLASH_2MB]  = { STM_2MB_BYTE_COUNT, STM_2MB_SECTOR_COUNT, STM_2MB_SECTOR_SIZE},
  96 +       [FLASH_4MB]  = { STM_4MB_BYTE_COUNT, STM_4MB_SECTOR_COUNT, STM_4MB_SECTOR_SIZE},
  97 +       [FLASH_8MB]  = { STM_8MB_BYTE_COUNT, STM_8MB_SECTOR_COUNT, STM_8MB_SECTOR_SIZE},
  98 +       [FLASH_16MB] = { STM_16MB_BYTE_COUNT, STM_16MB_SECTOR_COUNT, STM_16MB_SECTOR_SIZE}
  99 +};
 100 +
 101 +/* Mapping of generic opcodes to STM serial flash opcodes */
 102 +enum {
 103 +       SPI_WRITE_ENABLE,
 104 +       SPI_WRITE_DISABLE,
 105 +       SPI_RD_STATUS,
 106 +       SPI_WR_STATUS,
 107 +       SPI_RD_DATA,
 108 +       SPI_FAST_RD_DATA,
 109 +       SPI_PAGE_PROGRAM,
 110 +       SPI_SECTOR_ERASE,
 111 +       SPI_BULK_ERASE,
 112 +       SPI_DEEP_PWRDOWN,
 113 +       SPI_RD_SIG,
 114 +};
 115 +
 116 +struct opcodes {
 117 +    __u16 code;
 118 +    __s8 tx_cnt;
 119 +    __s8 rx_cnt;
 120 +};
 121 +const struct opcodes stm_opcodes[] = {
 122 +       [SPI_WRITE_ENABLE] = {STM_OP_WR_ENABLE, 1, 0},
 123 +       [SPI_WRITE_DISABLE] = {STM_OP_WR_DISABLE, 1, 0},
 124 +       [SPI_RD_STATUS] = {STM_OP_RD_STATUS, 1, 1},
 125 +       [SPI_WR_STATUS] = {STM_OP_WR_STATUS, 1, 0},
 126 +       [SPI_RD_DATA] = {STM_OP_RD_DATA, 4, 4},
 127 +       [SPI_FAST_RD_DATA] = {STM_OP_FAST_RD_DATA, 5, 0},
 128 +       [SPI_PAGE_PROGRAM] = {STM_OP_PAGE_PGRM, 8, 0},
 129 +       [SPI_SECTOR_ERASE] = {STM_OP_SECTOR_ERASE, 4, 0},
 130 +       [SPI_BULK_ERASE] = {STM_OP_BULK_ERASE, 1, 0},
 131 +       [SPI_DEEP_PWRDOWN] = {STM_OP_DEEP_PWRDOWN, 1, 0},
 132 +       [SPI_RD_SIG] = {STM_OP_RD_SIG, 4, 1},
 133 +};
 134 +
 135 +/* Driver private data structure */
 136 +struct spiflash_priv {
 137 +       struct mtd_info mtd;
 138 +       void *readaddr; /* memory mapped data for read  */
 139 +       void *mmraddr;  /* memory mapped register space */
 140 +       wait_queue_head_t wq;
 141 +       spinlock_t lock;
 142 +       int state;
 143 +};
 144 +
 145 +#define to_spiflash(_mtd) container_of(_mtd, struct spiflash_priv, mtd)
 146 +
 147 +enum {
 148 +       FL_READY,
 149 +       FL_READING,
 150 +       FL_ERASING,
 151 +       FL_WRITING
 152 +};
 153 +
 154 +/***************************************************************************************************/
 155 +
 156 +static u32
 157 +spiflash_read_reg(struct spiflash_priv *priv, int reg)
 158 +{
 159 +       return ar231x_read_reg((u32) priv->mmraddr + reg);
 160 +}
 161 +
 162 +static void
 163 +spiflash_write_reg(struct spiflash_priv *priv, int reg, u32 data)
 164 +{
 165 +       ar231x_write_reg((u32) priv->mmraddr + reg, data);
 166 +}
 167 +
 168 +static u32
 169 +spiflash_wait_busy(struct spiflash_priv *priv)
 170 +{
 171 +       u32 reg;
 172 +
 173 +       busy_wait(priv, (reg = spiflash_read_reg(priv, SPI_FLASH_CTL)) &
 174 +               SPI_CTL_BUSY, 0);
 175 +       return reg;
 176 +}
 177 +
 178 +static u32
 179 +spiflash_sendcmd (struct spiflash_priv *priv, int opcode, u32 addr)
 180 +{
 181 +       const struct opcodes *op;
 182 +       u32 reg, mask;
 183 +
 184 +       op = &stm_opcodes[opcode];
 185 +       reg = spiflash_wait_busy(priv);
 186 +       spiflash_write_reg(priv, SPI_FLASH_OPCODE,
 187 +               ((u32) op->code) | (addr << 8));
 188 +
 189 +       reg &= ~SPI_CTL_TX_RX_CNT_MASK;
 190 +       reg |= SPI_CTL_START | op->tx_cnt | (op->rx_cnt << 4);
 191 +
 192 +       spiflash_write_reg(priv, SPI_FLASH_CTL, reg);
 193 +       spiflash_wait_busy(priv);
 194 +
 195 +       if (!op->rx_cnt)
 196 +               return 0;
 197 +
 198 +       reg = spiflash_read_reg(priv, SPI_FLASH_DATA);
 199 +
 200 +       switch (op->rx_cnt) {
 201 +       case 1:
 202 +               mask = 0x000000ff;
 203 +               break;
 204 +       case 2:
 205 +               mask = 0x0000ffff;
 206 +               break;
 207 +       case 3:
 208 +               mask = 0x00ffffff;
 209 +               break;
 210 +       default:
 211 +               mask = 0xffffffff;
 212 +               break;
 213 +       }
 214 +       reg &= mask;
 215 +
 216 +       return reg;
 217 +}
 218 +
 219 +
 220 +/*
 221 + * Probe SPI flash device
 222 + * Function returns 0 for failure.
 223 + * and flashconfig_tbl array index for success.
 224 + */
 225 +static int
 226 +spiflash_probe_chip (struct spiflash_priv *priv)
 227 +{
 228 +       u32 sig;
 229 +       int flash_size;
 230 +
 231 +       /* Read the signature on the flash device */
 232 +       spin_lock_bh(&priv->lock);
 233 +       sig = spiflash_sendcmd(priv, SPI_RD_SIG, 0);
 234 +       spin_unlock_bh(&priv->lock);
 235 +
 236 +       switch (sig) {
 237 +       case STM_8MBIT_SIGNATURE:
 238 +               flash_size = FLASH_1MB;
 239 +               break;
 240 +       case STM_16MBIT_SIGNATURE:
 241 +               flash_size = FLASH_2MB;
 242 +               break;
 243 +       case STM_32MBIT_SIGNATURE:
 244 +               flash_size = FLASH_4MB;
 245 +               break;
 246 +       case STM_64MBIT_SIGNATURE:
 247 +               flash_size = FLASH_8MB;
 248 +               break;
 249 +       case STM_128MBIT_SIGNATURE:
 250 +               flash_size = FLASH_16MB;
 251 +               break;
 252 +       default:
 253 +               pr_warn(SPIFLASH "Read of flash device signature failed!\n");
 254 +               return 0;
 255 +       }
 256 +
 257 +       return flash_size;
 258 +}
 259 +
 260 +
 261 +/* wait until the flash chip is ready and grab a lock */
 262 +static int spiflash_wait_ready(struct spiflash_priv *priv, int state)
 263 +{
 264 +       DECLARE_WAITQUEUE(wait, current);
 265 +
 266 +retry:
 267 +       spin_lock_bh(&priv->lock);
 268 +       if (priv->state != FL_READY) {
 269 +               set_current_state(TASK_UNINTERRUPTIBLE);
 270 +               add_wait_queue(&priv->wq, &wait);
 271 +               spin_unlock_bh(&priv->lock);
 272 +               schedule();
 273 +               remove_wait_queue(&priv->wq, &wait);
 274 +
 275 +               if(signal_pending(current))
 276 +                       return 0;
 277 +
 278 +               goto retry;
 279 +       }
 280 +       priv->state = state;
 281 +
 282 +       return 1;
 283 +}
 284 +
 285 +static inline void spiflash_done(struct spiflash_priv *priv)
 286 +{
 287 +       priv->state = FL_READY;
 288 +       spin_unlock_bh(&priv->lock);
 289 +       wake_up(&priv->wq);
 290 +}
 291 +
 292 +static void
 293 +spiflash_wait_complete(struct spiflash_priv *priv, unsigned int timeout)
 294 +{
 295 +       busy_wait(priv, spiflash_sendcmd(priv, SPI_RD_STATUS, 0) &
 296 +               SPI_STATUS_WIP, timeout);
 297 +       spiflash_done(priv);
 298 +}
 299 +
 300 +
 301 +
 302 +static int
 303 +spiflash_erase (struct mtd_info *mtd, struct erase_info *instr)
 304 +{
 305 +       struct spiflash_priv *priv = to_spiflash(mtd);
 306 +       const struct opcodes *op;
 307 +       u32 temp, reg;
 308 +
 309 +       if (instr->addr + instr->len > mtd->size)
 310 +               return -EINVAL;
 311 +
 312 +       if (!spiflash_wait_ready(priv, FL_ERASING))
 313 +               return -EINTR;
 314 +
 315 +       spiflash_sendcmd(priv, SPI_WRITE_ENABLE, 0);
 316 +       reg = spiflash_wait_busy(priv);
 317 +
 318 +       op = &stm_opcodes[SPI_SECTOR_ERASE];
 319 +       temp = ((u32)instr->addr << 8) | (u32)(op->code);
 320 +       spiflash_write_reg(priv, SPI_FLASH_OPCODE, temp);
 321 +
 322 +       reg &= ~SPI_CTL_TX_RX_CNT_MASK;
 323 +       reg |= op->tx_cnt | SPI_CTL_START;
 324 +       spiflash_write_reg(priv, SPI_FLASH_CTL, reg);
 325 +
 326 +       spiflash_wait_complete(priv, 20);
 327 +
 328 +       instr->state = MTD_ERASE_DONE;
 329 +       mtd_erase_callback(instr);
 330 +
 331 +       return 0;
 332 +}
 333 +
 334 +static int
 335 +spiflash_read (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf)
 336 +{
 337 +       struct spiflash_priv *priv = to_spiflash(mtd);
 338 +       u8 *read_addr;
 339 +
 340 +       if (!len)
 341 +               return 0;
 342 +
 343 +       if (from + len > mtd->size)
 344 +               return -EINVAL;
 345 +
 346 +       *retlen = len;
 347 +
 348 +       if (!spiflash_wait_ready(priv, FL_READING))
 349 +               return -EINTR;
 350 +
 351 +       read_addr = (u8 *)(priv->readaddr + from);
 352 +       memcpy_fromio(buf, read_addr, len);
 353 +       spiflash_done(priv);
 354 +
 355 +       return 0;
 356 +}
 357 +
 358 +static int
 359 +spiflash_write (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u8 *buf)
 360 +{
 361 +       struct spiflash_priv *priv = to_spiflash(mtd);
 362 +       u32 opcode, bytes_left;
 363 +
 364 +       *retlen = 0;
 365 +
 366 +       if (!len)
 367 +               return 0;
 368 +
 369 +       if (to + len > mtd->size)
 370 +               return -EINVAL;
 371 +
 372 +       bytes_left = len;
 373 +
 374 +       do {
 375 +               u32 read_len, reg, page_offset, spi_data = 0;
 376 +
 377 +               read_len = min(bytes_left, sizeof(u32));
 378 +
 379 +               /* 32-bit writes cannot span across a page boundary
 380 +                * (256 bytes). This types of writes require two page
 381 +                * program operations to handle it correctly. The STM part
 382 +                * will write the overflow data to the beginning of the
 383 +                * current page as opposed to the subsequent page.
 384 +                */
 385 +               page_offset = (to & (STM_PAGE_SIZE - 1)) + read_len;
 386 +
 387 +               if (page_offset > STM_PAGE_SIZE)
 388 +                       read_len -= (page_offset - STM_PAGE_SIZE);
 389 +
 390 +               if (!spiflash_wait_ready(priv, FL_WRITING))
 391 +                       return -EINTR;
 392 +
 393 +               spiflash_sendcmd(priv, SPI_WRITE_ENABLE, 0);
 394 +               spi_data = 0;
 395 +               switch (read_len) {
 396 +               case 4:
 397 +                       spi_data |= buf[3] << 24;
 398 +                       /* fall through */
 399 +               case 3:
 400 +                       spi_data |= buf[2] << 16;
 401 +                       /* fall through */
 402 +               case 2:
 403 +                       spi_data |= buf[1] << 8;
 404 +                       /* fall through */
 405 +               case 1:
 406 +                       spi_data |= buf[0] & 0xff;
 407 +                       break;
 408 +               default:
 409 +                       break;
 410 +               }
 411 +
 412 +               spiflash_write_reg(priv, SPI_FLASH_DATA, spi_data);
 413 +               opcode = stm_opcodes[SPI_PAGE_PROGRAM].code |
 414 +                       (to & 0x00ffffff) << 8;
 415 +               spiflash_write_reg(priv, SPI_FLASH_OPCODE, opcode);
 416 +
 417 +               reg = spiflash_read_reg(priv, SPI_FLASH_CTL);
 418 +               reg &= ~SPI_CTL_TX_RX_CNT_MASK;
 419 +               reg |= (read_len + 4) | SPI_CTL_START;
 420 +               spiflash_write_reg(priv, SPI_FLASH_CTL, reg);
 421 +
 422 +               spiflash_wait_complete(priv, 1);
 423 +
 424 +               bytes_left -= read_len;
 425 +               to += read_len;
 426 +               buf += read_len;
 427 +
 428 +               *retlen += read_len;
 429 +       } while (bytes_left != 0);
 430 +
 431 +       return 0;
 432 +}
 433 +
 434 +
 435 +#if defined CONFIG_MTD_REDBOOT_PARTS || CONFIG_MTD_MYLOADER_PARTS
 436 +static const char *part_probe_types[] = { "cmdlinepart", "RedBoot", "MyLoader", NULL };
 437 +#endif
 438 +
 439 +
 440 +static int
 441 +spiflash_probe(struct platform_device *pdev)
 442 +{
 443 +       struct spiflash_priv *priv;
 444 +       struct mtd_info *mtd;
 445 +       int index;
 446 +       int result = 0;
 447 +
 448 +       priv = kzalloc(sizeof(struct spiflash_priv), GFP_KERNEL);
 449 +       spin_lock_init(&priv->lock);
 450 +       init_waitqueue_head(&priv->wq);
 451 +       priv->state = FL_READY;
 452 +       mtd = &priv->mtd;
 453 +
 454 +       priv->mmraddr = ioremap_nocache(SPI_FLASH_MMR, SPI_FLASH_MMR_SIZE);
 455 +       if (!priv->mmraddr) {
 456 +               dev_warn(&pdev->dev, SPIFLASH "Failed to map flash device\n");
 457 +               goto error;
 458 +       }
 459 +
 460 +       index = spiflash_probe_chip(priv);
 461 +       if (!index) {
 462 +               dev_warn(&pdev->dev, SPIFLASH "Found no flash device\n");
 463 +               goto error;
 464 +       }
 465 +
 466 +       priv->readaddr = ioremap_nocache(SPI_FLASH_READ, flashconfig_tbl[index].byte_cnt);
 467 +       if (!priv->readaddr) {
 468 +               dev_warn(&pdev->dev, SPIFLASH "Failed to map flash device\n");
 469 +               goto error;
 470 +       }
 471 +
 472 +       platform_set_drvdata(pdev, priv);
 473 +       mtd->name = "spiflash";
 474 +       mtd->type = MTD_NORFLASH;
 475 +       mtd->flags = (MTD_CAP_NORFLASH|MTD_WRITEABLE);
 476 +       mtd->size = flashconfig_tbl[index].byte_cnt;
 477 +       mtd->erasesize = flashconfig_tbl[index].sector_size;
 478 +       mtd->writesize = 1;
 479 +       mtd->numeraseregions = 0;
 480 +       mtd->eraseregions = NULL;
 481 +       mtd->_erase = spiflash_erase;
 482 +       mtd->_read = spiflash_read;
 483 +       mtd->_write = spiflash_write;
 484 +       mtd->owner = THIS_MODULE;
 485 +
 486 +#if defined CONFIG_MTD_REDBOOT_PARTS || CONFIG_MTD_MYLOADER_PARTS
 487 +       /* parse redboot partitions */
 488 +
 489 +       result = mtd_device_parse_register(mtd, part_probe_types,
 490 +                       NULL, NULL, 0);
 491 +#endif
 492 +
 493 +       return result;
 494 +
 495 +error:
 496 +       if (priv->mmraddr)
 497 +               iounmap(priv->mmraddr);
 498 +       kfree(priv);
 499 +       return -ENXIO;
 500 +}
 501 +
 502 +static int
 503 +spiflash_remove (struct platform_device *pdev)
 504 +{
 505 +       struct spiflash_priv *priv = platform_get_drvdata(pdev);
 506 +       struct mtd_info *mtd = &priv->mtd;
 507 +
 508 +       mtd_device_unregister(mtd);
 509 +       iounmap(priv->mmraddr);
 510 +       iounmap(priv->readaddr);
 511 +       kfree(priv);
 512 +
 513 +       return 0;
 514 +}
 515 +
 516 +struct platform_driver spiflash_driver = {
 517 +       .driver.name = "spiflash",
 518 +       .probe = spiflash_probe,
 519 +       .remove = spiflash_remove,
 520 +};
 521 +
 522 +int __init
 523 +spiflash_init (void)
 524 +{
 525 +       return platform_driver_register(&spiflash_driver);
 526 +}
 527 +
 528 +void __exit
 529 +spiflash_exit (void)
 530 +{
 531 +       return platform_driver_unregister(&spiflash_driver);
 532 +}
 533 +
 534 +module_init (spiflash_init);
 535 +module_exit (spiflash_exit);
 536 +
 537 +MODULE_LICENSE("GPL");
 538 +MODULE_AUTHOR("OpenWrt.org, Atheros Communications Inc");
 539 +MODULE_DESCRIPTION("MTD driver for SPI Flash on Atheros SOC");
 540 +
 541 --- /dev/null
 542 +++ b/arch/mips/include/asm/mach-ar231x/ar2315_spiflash.h
 543 @@ -0,0 +1,116 @@
 544 +/*
 545 + * SPI Flash Memory support header file.
 546 + *
 547 + * Copyright (c) 2005, Atheros Communications Inc.
 548 + * Copyright (C) 2006 FON Technology, SL.
 549 + * Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
 550 + * Copyright (C) 2006-2009 Felix Fietkau <nbd@openwrt.org>
 551 + *
 552 + * This code is free software; you can redistribute it and/or modify
 553 + * it under the terms of the GNU General Public License version 2 as
 554 + * published by the Free Software Foundation.
 555 + *
 556 + */
 557 +#ifndef __AR2315_SPIFLASH_H
 558 +#define __AR2315_SPIFLASH_H
 559 +
 560 +#define STM_PAGE_SIZE           256
 561 +
 562 +#define SFI_WRITE_BUFFER_SIZE   4
 563 +#define SFI_FLASH_ADDR_MASK     0x00ffffff
 564 +
 565 +#define STM_8MBIT_SIGNATURE     0x13
 566 +#define STM_M25P80_BYTE_COUNT   1048576
 567 +#define STM_M25P80_SECTOR_COUNT 16
 568 +#define STM_M25P80_SECTOR_SIZE  0x10000
 569 +
 570 +#define STM_16MBIT_SIGNATURE    0x14
 571 +#define STM_M25P16_BYTE_COUNT   2097152
 572 +#define STM_M25P16_SECTOR_COUNT 32
 573 +#define STM_M25P16_SECTOR_SIZE  0x10000
 574 +
 575 +#define STM_32MBIT_SIGNATURE    0x15
 576 +#define STM_M25P32_BYTE_COUNT   4194304
 577 +#define STM_M25P32_SECTOR_COUNT 64
 578 +#define STM_M25P32_SECTOR_SIZE  0x10000
 579 +
 580 +#define STM_64MBIT_SIGNATURE    0x16
 581 +#define STM_M25P64_BYTE_COUNT   8388608
 582 +#define STM_M25P64_SECTOR_COUNT 128
 583 +#define STM_M25P64_SECTOR_SIZE  0x10000
 584 +
 585 +#define STM_128MBIT_SIGNATURE   0x17
 586 +#define STM_M25P128_BYTE_COUNT   16777216
 587 +#define STM_M25P128_SECTOR_COUNT 256
 588 +#define STM_M25P128_SECTOR_SIZE  0x10000
 589 +
 590 +#define STM_1MB_BYTE_COUNT   STM_M25P80_BYTE_COUNT
 591 +#define STM_1MB_SECTOR_COUNT STM_M25P80_SECTOR_COUNT
 592 +#define STM_1MB_SECTOR_SIZE  STM_M25P80_SECTOR_SIZE
 593 +#define STM_2MB_BYTE_COUNT   STM_M25P16_BYTE_COUNT
 594 +#define STM_2MB_SECTOR_COUNT STM_M25P16_SECTOR_COUNT
 595 +#define STM_2MB_SECTOR_SIZE  STM_M25P16_SECTOR_SIZE
 596 +#define STM_4MB_BYTE_COUNT   STM_M25P32_BYTE_COUNT
 597 +#define STM_4MB_SECTOR_COUNT STM_M25P32_SECTOR_COUNT
 598 +#define STM_4MB_SECTOR_SIZE  STM_M25P32_SECTOR_SIZE
 599 +#define STM_8MB_BYTE_COUNT   STM_M25P64_BYTE_COUNT
 600 +#define STM_8MB_SECTOR_COUNT STM_M25P64_SECTOR_COUNT
 601 +#define STM_8MB_SECTOR_SIZE  STM_M25P64_SECTOR_SIZE
 602 +#define STM_16MB_BYTE_COUNT   STM_M25P128_BYTE_COUNT
 603 +#define STM_16MB_SECTOR_COUNT STM_M25P128_SECTOR_COUNT
 604 +#define STM_16MB_SECTOR_SIZE  STM_M25P128_SECTOR_SIZE
 605 +
 606 +/*
 607 + * ST Microelectronics Opcodes for Serial Flash
 608 + */
 609 +
 610 +#define STM_OP_WR_ENABLE       0x06     /* Write Enable */
 611 +#define STM_OP_WR_DISABLE      0x04     /* Write Disable */
 612 +#define STM_OP_RD_STATUS       0x05     /* Read Status */
 613 +#define STM_OP_WR_STATUS       0x01     /* Write Status */
 614 +#define STM_OP_RD_DATA         0x03     /* Read Data */
 615 +#define STM_OP_FAST_RD_DATA    0x0b     /* Fast Read Data */
 616 +#define STM_OP_PAGE_PGRM       0x02     /* Page Program */
 617 +#define STM_OP_SECTOR_ERASE    0xd8     /* Sector Erase */
 618 +#define STM_OP_BULK_ERASE      0xc7     /* Bulk Erase */
 619 +#define STM_OP_DEEP_PWRDOWN    0xb9     /* Deep Power-Down Mode */
 620 +#define STM_OP_RD_SIG          0xab     /* Read Electronic Signature */
 621 +
 622 +#define STM_STATUS_WIP       0x01       /* Write-In-Progress */
 623 +#define STM_STATUS_WEL       0x02       /* Write Enable Latch */
 624 +#define STM_STATUS_BP0       0x04       /* Block Protect 0 */
 625 +#define STM_STATUS_BP1       0x08       /* Block Protect 1 */
 626 +#define STM_STATUS_BP2       0x10       /* Block Protect 2 */
 627 +#define STM_STATUS_SRWD      0x80       /* Status Register Write Disable */
 628 +
 629 +/*
 630 + * SPI Flash Interface Registers
 631 + */
 632 +#define AR531XPLUS_SPI_READ     0x08000000
 633 +#define AR531XPLUS_SPI_MMR      0x11300000
 634 +#define AR531XPLUS_SPI_MMR_SIZE 12
 635 +
 636 +#define AR531XPLUS_SPI_CTL      0x00
 637 +#define AR531XPLUS_SPI_OPCODE   0x04
 638 +#define AR531XPLUS_SPI_DATA     0x08
 639 +
 640 +#define SPI_FLASH_READ          AR531XPLUS_SPI_READ
 641 +#define SPI_FLASH_MMR           AR531XPLUS_SPI_MMR
 642 +#define SPI_FLASH_MMR_SIZE      AR531XPLUS_SPI_MMR_SIZE
 643 +#define SPI_FLASH_CTL           AR531XPLUS_SPI_CTL
 644 +#define SPI_FLASH_OPCODE        AR531XPLUS_SPI_OPCODE
 645 +#define SPI_FLASH_DATA          AR531XPLUS_SPI_DATA
 646 +
 647 +#define SPI_CTL_START           0x00000100
 648 +#define SPI_CTL_BUSY            0x00010000
 649 +#define SPI_CTL_TXCNT_MASK      0x0000000f
 650 +#define SPI_CTL_RXCNT_MASK      0x000000f0
 651 +#define SPI_CTL_TX_RX_CNT_MASK  0x000000ff
 652 +#define SPI_CTL_SIZE_MASK       0x00060000
 653 +
 654 +#define SPI_CTL_CLK_SEL_MASK    0x03000000
 655 +#define SPI_OPCODE_MASK         0x000000ff
 656 +
 657 +#define SPI_STATUS_WIP         STM_STATUS_WIP
 658 +
 659 +#endif