| Message ID | 1465161609-19303-6-git-send-email-hauke@hauke-m.de |
|---|---|
| State | Superseded |
| Headers | show |
On Sun, 5 Jun 2016 23:20:08 +0200 Hauke Mehrtens <hauke@hauke-m.de> wrote: > From: John Crispin <john@phrozen.org> > > Signed-off-by: John Crispin <john@phrozen.org> > Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> > --- > drivers/mtd/nand/xway_nand.c | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c > index d44e00d..bc4018e 100644 > --- a/drivers/mtd/nand/xway_nand.c > +++ b/drivers/mtd/nand/xway_nand.c > @@ -146,6 +146,32 @@ static unsigned char xway_read_byte(struct mtd_info *mtd) > return ret; > } > > +static void xway_read_buf(struct mtd_info *mtd, u_char *buf, int len) > +{ > + struct nand_chip *this = mtd->priv; You should now use mtd_to_nand(). Please rebase your work on top of nand/next [1], and I'm pretty sure you'll get a NULL pointer. > + unsigned long nandaddr = (unsigned long) this->IO_ADDR_R; > + unsigned long flags; > + int i; > + > + spin_lock_irqsave(&ebu_lock, flags); > + for (i = 0; i < len; i++) > + buf[i] = ltq_r8((void __iomem *)(nandaddr | NAND_READ_DATA)); > + spin_unlock_irqrestore(&ebu_lock, flags); > +} > + > +static void xway_write_buf(struct mtd_info *mtd, const u_char *buf, int len) > +{ > + struct nand_chip *this = mtd->priv; > + unsigned long nandaddr = (unsigned long) this->IO_ADDR_W; > + unsigned long flags; > + int i; > + > + spin_lock_irqsave(&ebu_lock, flags); > + for (i = 0; i < len; i++) > + ltq_w8(buf[i], (void __iomem *)(nandaddr | NAND_WRITE_DATA)); > + spin_unlock_irqrestore(&ebu_lock, flags); > +} > + > static int xway_nand_probe(struct platform_device *pdev) > { > struct nand_chip *this = platform_get_drvdata(pdev); > @@ -187,6 +213,8 @@ static struct platform_nand_data xway_nand_data = { > .dev_ready = xway_dev_ready, > .select_chip = xway_select_chip, > .read_byte = xway_read_byte, > + .read_buf = xway_read_buf, > + .write_buf = xway_write_buf, > } > }; > [1]https://github.com/linux-nand/linux/tree/nand/next
diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c index d44e00d..bc4018e 100644 --- a/drivers/mtd/nand/xway_nand.c +++ b/drivers/mtd/nand/xway_nand.c @@ -146,6 +146,32 @@ static unsigned char xway_read_byte(struct mtd_info *mtd) return ret; } +static void xway_read_buf(struct mtd_info *mtd, u_char *buf, int len) +{ + struct nand_chip *this = mtd->priv; + unsigned long nandaddr = (unsigned long) this->IO_ADDR_R; + unsigned long flags; + int i; + + spin_lock_irqsave(&ebu_lock, flags); + for (i = 0; i < len; i++) + buf[i] = ltq_r8((void __iomem *)(nandaddr | NAND_READ_DATA)); + spin_unlock_irqrestore(&ebu_lock, flags); +} + +static void xway_write_buf(struct mtd_info *mtd, const u_char *buf, int len) +{ + struct nand_chip *this = mtd->priv; + unsigned long nandaddr = (unsigned long) this->IO_ADDR_W; + unsigned long flags; + int i; + + spin_lock_irqsave(&ebu_lock, flags); + for (i = 0; i < len; i++) + ltq_w8(buf[i], (void __iomem *)(nandaddr | NAND_WRITE_DATA)); + spin_unlock_irqrestore(&ebu_lock, flags); +} + static int xway_nand_probe(struct platform_device *pdev) { struct nand_chip *this = platform_get_drvdata(pdev); @@ -187,6 +213,8 @@ static struct platform_nand_data xway_nand_data = { .dev_ready = xway_dev_ready, .select_chip = xway_select_chip, .read_byte = xway_read_byte, + .read_buf = xway_read_buf, + .write_buf = xway_write_buf, } };