Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 010ab820 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt
Browse files

mtd: sh_flctl SHBUSSEL and SEL_16BIT support 



This patch extends the sh_flctl driver with support
for 16-bit bus configuration using SEL_16BIT and
support for multiplexed pins using SHBUSSEL.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Acked-by: default avatarYoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent b79c7adf

drivers/mtd/nand/sh_flctl.c

+26 −1
Original line number Diff line number Diff line
@@ -105,6 +105,8 @@ static void set_addr(struct mtd_info *mtd, int column, int page_addr) 
		addr = page_addr;	/* ERASE1 */

	} else if (page_addr != -1) {

		/* SEQIN, READ0, etc.. */

		if (flctl->chip.options & NAND_BUSWIDTH_16)

			column >>= 1;

		if (flctl->page_size) {

			addr = column & 0x0FFF;

			addr |= (page_addr & 0xff) << 16;
@@ -280,7 +282,7 @@ static void write_fiforeg(struct sh_flctl *flctl, int rlen, int offset) 
static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_val)

{

	struct sh_flctl *flctl = mtd_to_flctl(mtd);

	uint32_t flcmncr_val = readl(FLCMNCR(flctl));

	uint32_t flcmncr_val = readl(FLCMNCR(flctl)) & ~SEL_16BIT;

	uint32_t flcmdcr_val, addr_len_bytes = 0;



	/* Set SNAND bit if page size is 2048byte */
@@ -302,6 +304,8 @@ static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_va 
	case NAND_CMD_READOOB:

		addr_len_bytes = flctl->rw_ADRCNT;

		flcmdcr_val |= CDSRC_E;

		if (flctl->chip.options & NAND_BUSWIDTH_16)

			flcmncr_val |= SEL_16BIT;

		break;

	case NAND_CMD_SEQIN:

		/* This case is that cmd is READ0 or READ1 or READ00 */
@@ -310,6 +314,8 @@ static void set_cmd_regs(struct mtd_info *mtd, uint32_t cmd, uint32_t flcmcdr_va 
	case NAND_CMD_PAGEPROG:

		addr_len_bytes = flctl->rw_ADRCNT;

		flcmdcr_val |= DOCMD2_E | CDSRC_E | SELRW;

		if (flctl->chip.options & NAND_BUSWIDTH_16)

			flcmncr_val |= SEL_16BIT;

		break;

	case NAND_CMD_READID:

		flcmncr_val &= ~SNAND_E;
@@ -528,6 +534,8 @@ static void flctl_cmdfunc(struct mtd_info *mtd, unsigned int command, 
		set_addr(mtd, 0, page_addr);



		flctl->read_bytes = mtd->writesize + mtd->oobsize;

		if (flctl->chip.options & NAND_BUSWIDTH_16)

			column >>= 1;

		flctl->index += column;

		goto read_normal_exit;
@@ -691,6 +699,18 @@ static uint8_t flctl_read_byte(struct mtd_info *mtd) 
	return data;

}



static uint16_t flctl_read_word(struct mtd_info *mtd)

{

       struct sh_flctl *flctl = mtd_to_flctl(mtd);

       int index = flctl->index;

       uint16_t data;

       uint16_t *buf = (uint16_t *)&flctl->done_buff[index];



       data = *buf;

       flctl->index += 2;

       return data;

}



static void flctl_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)

{

	int i;
@@ -829,6 +849,11 @@ static int __devinit flctl_probe(struct platform_device *pdev) 
	nand->select_chip = flctl_select_chip;

	nand->cmdfunc = flctl_cmdfunc;



	if (pdata->flcmncr_val & SEL_16BIT) {

		nand->options |= NAND_BUSWIDTH_16;

		nand->read_word = flctl_read_word;

	}



	ret = nand_scan_ident(flctl_mtd, 1);

	if (ret)

		goto err;

include/linux/mtd/sh_flctl.h

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ 
#define _4ECCCNTEN	(0x1 << 24)

#define _4ECCEN		(0x1 << 23)

#define _4ECCCORRECT	(0x1 << 22)

#define SHBUSSEL	(0x1 << 20)

#define SEL_16BIT	(0x1 << 19)

#define SNAND_E		(0x1 << 18)	/* SNAND (0=512 1=2048)*/

#define QTSEL_E		(0x1 << 17)

#define ENDIAN		(0x1 << 16)	/* 1 = little endian */