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

Commit 65e0b598 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/mtd-2.6 

* git://git.infradead.org/mtd-2.6:
  mtd: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined
  mtd: mxc_nand: configure pages per block for v2 controller
  mtd: OneNAND: Fix loop hang when DMA error at Samsung SoCs
  mtd: OneNAND: Fix 2KiB pagesize handling at Samsung SoCs
  mtd: Blackfin NFC: fix invalid free in remove()
  mtd: Blackfin NFC: fix build error after nand_scan_ident() change
  mxc_nand: Do not do byte accesses to the NFC buffer.
parents d7a4b63b 99d38964

drivers/mtd/nand/bf5xx_nand.c

+2 −7
Original line number Diff line number Diff line
@@ -682,7 +682,6 @@ static int __devinit bf5xx_nand_add_partition(struct bf5xx_nand_info *info) 
static int __devexit bf5xx_nand_remove(struct platform_device *pdev)

{

	struct bf5xx_nand_info *info = to_nand_info(pdev);

	struct mtd_info *mtd = NULL;



	platform_set_drvdata(pdev, NULL);
@@ -690,11 +689,7 @@ static int __devexit bf5xx_nand_remove(struct platform_device *pdev) 
	 * and their partitions, then go through freeing the

	 * resources used

	 */

	mtd = &info->mtd;

	if (mtd) {

		nand_release(mtd);

		kfree(mtd);

	}

	nand_release(&info->mtd);



	peripheral_free_list(bfin_nfc_pin_req);

	bf5xx_nand_dma_remove(info);
@@ -710,7 +705,7 @@ static int bf5xx_nand_scan(struct mtd_info *mtd) 
	struct nand_chip *chip = mtd->priv;

	int ret;



	ret = nand_scan_ident(mtd, 1);

	ret = nand_scan_ident(mtd, 1, NULL);

	if (ret)

		return ret;

drivers/mtd/nand/mxc_nand.c

+26 −21
Original line number Diff line number Diff line
@@ -67,7 +67,9 @@ 
#define NFC_V1_V2_CONFIG1_BIG		(1 << 5)

#define NFC_V1_V2_CONFIG1_RST		(1 << 6)

#define NFC_V1_V2_CONFIG1_CE		(1 << 7)

#define NFC_V1_V2_CONFIG1_ONE_CYCLE	(1 << 8)

#define NFC_V2_CONFIG1_ONE_CYCLE	(1 << 8)

#define NFC_V2_CONFIG1_PPB(x)		(((x) & 0x3) << 9)

#define NFC_V2_CONFIG1_FP_INT		(1 << 11)



#define NFC_V1_V2_CONFIG2_INT		(1 << 15)
@@ -402,16 +404,16 @@ static void send_read_id_v1_v2(struct mxc_nand_host *host) 
	/* Wait for operation to complete */

	wait_op_done(host, true);



	memcpy(host->data_buf, host->main_area0, 16);



	if (this->options & NAND_BUSWIDTH_16) {

		void __iomem *main_buf = host->main_area0;

		/* compress the ID info */

		writeb(readb(main_buf + 2), main_buf + 1);

		writeb(readb(main_buf + 4), main_buf + 2);

		writeb(readb(main_buf + 6), main_buf + 3);

		writeb(readb(main_buf + 8), main_buf + 4);

		writeb(readb(main_buf + 10), main_buf + 5);

		host->data_buf[1] = host->data_buf[2];

		host->data_buf[2] = host->data_buf[4];

		host->data_buf[3] = host->data_buf[6];

		host->data_buf[4] = host->data_buf[8];

		host->data_buf[5] = host->data_buf[10];

	}

	memcpy(host->data_buf, host->main_area0, 16);

}



static uint16_t get_dev_status_v3(struct mxc_nand_host *host)
@@ -729,27 +731,30 @@ static void preset_v1_v2(struct mtd_info *mtd) 
{

	struct nand_chip *nand_chip = mtd->priv;

	struct mxc_nand_host *host = nand_chip->priv;

	uint16_t tmp;



	/* enable interrupt, disable spare enable */

	tmp = readw(NFC_V1_V2_CONFIG1);

	tmp &= ~NFC_V1_V2_CONFIG1_INT_MSK;

	tmp &= ~NFC_V1_V2_CONFIG1_SP_EN;

	if (nand_chip->ecc.mode == NAND_ECC_HW) {

		tmp |= NFC_V1_V2_CONFIG1_ECC_EN;

	} else {

		tmp &= ~NFC_V1_V2_CONFIG1_ECC_EN;

	}

	uint16_t config1 = 0;



	if (nand_chip->ecc.mode == NAND_ECC_HW)

		config1 |= NFC_V1_V2_CONFIG1_ECC_EN;



	if (nfc_is_v21())

		config1 |= NFC_V2_CONFIG1_FP_INT;



	if (!cpu_is_mx21())

		config1 |= NFC_V1_V2_CONFIG1_INT_MSK;



	if (nfc_is_v21() && mtd->writesize) {

		uint16_t pages_per_block = mtd->erasesize / mtd->writesize;



		host->eccsize = get_eccsize(mtd);

		if (host->eccsize == 4)

			tmp |= NFC_V2_CONFIG1_ECC_MODE_4;

			config1 |= NFC_V2_CONFIG1_ECC_MODE_4;



		config1 |= NFC_V2_CONFIG1_PPB(ffs(pages_per_block) - 6);

	} else {

		host->eccsize = 1;

	}



	writew(tmp, NFC_V1_V2_CONFIG1);

	writew(config1, NFC_V1_V2_CONFIG1);

	/* preset operation */



	/* Unlock the internal RAM Buffer */

drivers/mtd/nand/pxa3xx_nand.c

+6 −0
Original line number Diff line number Diff line
@@ -1320,6 +1320,7 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) 
		goto fail_free_irq;

	}



#ifdef CONFIG_MTD_PARTITIONS

	if (mtd_has_cmdlinepart()) {

		static const char *probes[] = { "cmdlinepart", NULL };

		struct mtd_partition *parts;
@@ -1332,6 +1333,9 @@ static int pxa3xx_nand_probe(struct platform_device *pdev) 
	}



	return add_mtd_partitions(mtd, pdata->parts, pdata->nr_parts);

#else

	return 0;

#endif



fail_free_irq:

	free_irq(irq, info);
@@ -1364,7 +1368,9 @@ static int pxa3xx_nand_remove(struct platform_device *pdev) 
	platform_set_drvdata(pdev, NULL);



	del_mtd_device(mtd);

#ifdef CONFIG_MTD_PARTITIONS

	del_mtd_partitions(mtd);

#endif

	irq = platform_get_irq(pdev, 0);

	if (irq >= 0)

		free_irq(irq, info);

drivers/mtd/onenand/samsung.c

+7 −9
Original line number Diff line number Diff line
@@ -554,13 +554,12 @@ static int s5pc110_dma_ops(void *dst, void *src, size_t count, int direction) 


	do {

		status = readl(base + S5PC110_DMA_TRANS_STATUS);

	} while (!(status & S5PC110_DMA_TRANS_STATUS_TD));



		if (status & S5PC110_DMA_TRANS_STATUS_TE) {

		writel(S5PC110_DMA_TRANS_CMD_TEC, base + S5PC110_DMA_TRANS_CMD);

		writel(S5PC110_DMA_TRANS_CMD_TDC, base + S5PC110_DMA_TRANS_CMD);

			writel(S5PC110_DMA_TRANS_CMD_TEC,

					base + S5PC110_DMA_TRANS_CMD);

			return -EIO;

		}

	} while (!(status & S5PC110_DMA_TRANS_STATUS_TD));



	writel(S5PC110_DMA_TRANS_CMD_TDC, base + S5PC110_DMA_TRANS_CMD);
@@ -571,13 +570,12 @@ static int s5pc110_read_bufferram(struct mtd_info *mtd, int area, 
		unsigned char *buffer, int offset, size_t count)

{

	struct onenand_chip *this = mtd->priv;

	void __iomem *bufferram;

	void __iomem *p;

	void *buf = (void *) buffer;

	dma_addr_t dma_src, dma_dst;

	int err;



	p = bufferram = this->base + area;

	p = this->base + area;

	if (ONENAND_CURRENT_BUFFERRAM(this)) {

		if (area == ONENAND_DATARAM)

			p += this->writesize;
@@ -621,7 +619,7 @@ static int s5pc110_read_bufferram(struct mtd_info *mtd, int area, 
normal:

	if (count != mtd->writesize) {

		/* Copy the bufferram to memory to prevent unaligned access */

		memcpy(this->page_buf, bufferram, mtd->writesize);

		memcpy(this->page_buf, p, mtd->writesize);

		p = this->page_buf + offset;

	}