target/linux/lantiq/patches-3.14/0014-MTD-lantiq-xway-the-latched-command-should-be-persis.patch

   1 From b454cefd675fc1bd3d8c690c1bd1d8f4678e9922 Mon Sep 17 00:00:00 2001
   2 From: John Crispin <blogic@openwrt.org>
   3 Date: Sun, 28 Jul 2013 18:06:39 +0200
   4 Subject: [PATCH 14/36] MTD: lantiq: xway: the latched command should be
   5  persistent
   6
   7 Signed-off-by: John Crispin <blogic@openwrt.org>
   8 ---
   9  drivers/mtd/nand/xway_nand.c |   12 ++++++------
  10  1 file changed, 6 insertions(+), 6 deletions(-)
  11
  12 diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c
  13 index 169a91d..7f2bdd1 100644
  14 --- a/drivers/mtd/nand/xway_nand.c
  15 +++ b/drivers/mtd/nand/xway_nand.c
  16 @@ -54,6 +54,8 @@
  17  #define NAND_CON_CSMUX         (1 << 1)
  18  #define NAND_CON_NANDM         1
  19
  20 +static u32 xway_latchcmd;
  21 +
  22  static void xway_reset_chip(struct nand_chip *chip)
  23  {
  24         unsigned long nandaddr = (unsigned long) chip->IO_ADDR_W;
  25 @@ -94,17 +96,15 @@ static void xway_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
  26         unsigned long flags;
  27
  28         if (ctrl & NAND_CTRL_CHANGE) {
  29 -               nandaddr &= ~(NAND_WRITE_CMD | NAND_WRITE_ADDR);
  30                 if (ctrl & NAND_CLE)
  31 -                       nandaddr |= NAND_WRITE_CMD;
  32 -               else
  33 -                       nandaddr |= NAND_WRITE_ADDR;
  34 -               this->IO_ADDR_W = (void __iomem *) nandaddr;
  35 +                       xway_latchcmd = NAND_WRITE_CMD;
  36 +               else if (ctrl & NAND_ALE)
  37 +                       xway_latchcmd = NAND_WRITE_ADDR;
  38         }
  39
  40         if (cmd != NAND_CMD_NONE) {
  41                 spin_lock_irqsave(&ebu_lock, flags);
  42 -               writeb(cmd, this->IO_ADDR_W);
  43 +               writeb(cmd, (void __iomem *) (nandaddr | xway_latchcmd));
  44                 while ((ltq_ebu_r32(EBU_NAND_WAIT) & NAND_WAIT_WR_C) == 0)
  45                         ;
  46                 spin_unlock_irqrestore(&ebu_lock, flags);
  47 --
  48 1.7.10.4
  49