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

Commit 59bdd133 authored by Marek Vasut's avatar Marek Vasut Committed by Eric Miao
Browse files

ARM: pxa: Add Balloon3 NAND ready check 



Signed-off-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
parent 1b9169d8

arch/arm/mach-pxa/balloon3.c

+6 −2
Original line number Diff line number Diff line
@@ -612,9 +612,13 @@ static void balloon3_nand_select_chip(struct mtd_info *mtd, int chip) 
		BALLOON3_NAND_CONTROL_REG);

}



static int balloon3_nand_dev_ready(struct mtd_info *mtd)

{

	return __raw_readl(BALLOON3_NAND_STAT_REG) & BALLOON3_NAND_STAT_RNB;

}



static int balloon3_nand_probe(struct platform_device *pdev)

{

	void __iomem *temp_map;

	uint16_t ver;

	int ret;
@@ -684,7 +688,7 @@ struct platform_nand_data balloon3_nand_pdata = { 
	},

	.ctrl = {

		.hwcontrol	= 0,

		.dev_ready	= 0,

		.dev_ready	= balloon3_nand_dev_ready,

		.select_chip	= balloon3_nand_select_chip,

		.cmd_ctrl	= balloon3_nand_cmd_ctl,

		.probe		= balloon3_nand_probe,

arch/arm/mach-pxa/include/mach/balloon3.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ enum balloon3_features { 
#define	BALLOON3_NAND_BASE		(PXA_CS4_PHYS + 0x00e00000)

#define	BALLOON3_NAND_IO_REG		(BALLOON3_FPGA_VIRT + 0x00e00000)

#define	BALLOON3_NAND_CONTROL2_REG	(BALLOON3_FPGA_VIRT + 0x00e00010)

#define	BALLOON3_NAND_STAT_REG		(BALLOON3_FPGA_VIRT + 0x00e00010)

#define	BALLOON3_NAND_STAT_REG		(BALLOON3_FPGA_VIRT + 0x00e00014)

#define	BALLOON3_NAND_CONTROL_REG	(BALLOON3_FPGA_VIRT + 0x00e00014)



/* fpga/cpld interrupt control register */