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

Commit 2ee30f05 authored by Afzal Mohammed's avatar Afzal Mohammed Committed by Tony Lindgren
Browse files

ARM: OMAP2+: gpmc-nand: Modify Interrupt handling 



Now GPMC provides its client with interrupts that can be handled
using the standard interrupt API. Modify GPMC NAND setup to work
with it.

Also disable write protect in GPMC code, so that NAND driver can
be ignorant of GPMC configuration.

Signed-off-by: default avatarAfzal Mohammed <afzal@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 6b6c32fc

arch/arm/mach-omap2/gpmc-nand.c

+20 −6
Original line number Original line Diff line number Diff line
@@ -21,15 +21,23 @@ 
#include <plat/board.h>

#include <plat/board.h>

#include <plat/gpmc.h>

#include <plat/gpmc.h>





static struct resource gpmc_nand_resource = {

static struct resource gpmc_nand_resource[] = {

	{

		.flags		= IORESOURCE_MEM,

		.flags		= IORESOURCE_MEM,

	},

	{

		.flags		= IORESOURCE_IRQ,

	},

	{

		.flags		= IORESOURCE_IRQ,

	},

};

};





static struct platform_device gpmc_nand_device = {

static struct platform_device gpmc_nand_device = {

	.name		= "omap2-nand",

	.name		= "omap2-nand",

	.id		= 0,

	.id		= 0,

	.num_resources	= 1,

	.num_resources	= ARRAY_SIZE(gpmc_nand_resource),

	.resource	= &gpmc_nand_resource,

	.resource	= gpmc_nand_resource,

};

};





static int omap2_nand_gpmc_retime(struct omap_nand_platform_data *gpmc_nand_data)

static int omap2_nand_gpmc_retime(struct omap_nand_platform_data *gpmc_nand_data)
@@ -75,6 +83,7 @@ static int omap2_nand_gpmc_retime(struct omap_nand_platform_data *gpmc_nand_data 
		gpmc_cs_configure(gpmc_nand_data->cs, GPMC_CONFIG_DEV_SIZE, 0);

		gpmc_cs_configure(gpmc_nand_data->cs, GPMC_CONFIG_DEV_SIZE, 0);

	gpmc_cs_configure(gpmc_nand_data->cs,

	gpmc_cs_configure(gpmc_nand_data->cs,

			GPMC_CONFIG_DEV_TYPE, GPMC_DEVICETYPE_NAND);

			GPMC_CONFIG_DEV_TYPE, GPMC_DEVICETYPE_NAND);

	gpmc_cs_configure(gpmc_nand_data->cs, GPMC_CONFIG_WP, 0);

	err = gpmc_cs_set_timings(gpmc_nand_data->cs, &t);

	err = gpmc_cs_set_timings(gpmc_nand_data->cs, &t);

	if (err)

	if (err)

		return err;

		return err;
@@ -90,14 +99,19 @@ int __init gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data) 
	gpmc_nand_device.dev.platform_data = gpmc_nand_data;

	gpmc_nand_device.dev.platform_data = gpmc_nand_data;





	err = gpmc_cs_request(gpmc_nand_data->cs, NAND_IO_SIZE,

	err = gpmc_cs_request(gpmc_nand_data->cs, NAND_IO_SIZE,

				(unsigned long *)&gpmc_nand_resource.start);

				(unsigned long *)&gpmc_nand_resource[0].start);

	if (err < 0) {

	if (err < 0) {

		dev_err(dev, "Cannot request GPMC CS\n");

		dev_err(dev, "Cannot request GPMC CS\n");

		return err;

		return err;

	}

	}





	gpmc_nand_resource.end = gpmc_nand_resource.start + NAND_IO_SIZE - 1;

	gpmc_nand_resource[0].end = gpmc_nand_resource[0].start +

							NAND_IO_SIZE - 1;





	gpmc_nand_resource[1].start =

				gpmc_get_client_irq(GPMC_IRQ_FIFOEVENTENABLE);

	gpmc_nand_resource[2].start =

				gpmc_get_client_irq(GPMC_IRQ_COUNT_EVENT);

	 /* Set timings in GPMC */

	 /* Set timings in GPMC */

	err = omap2_nand_gpmc_retime(gpmc_nand_data);

	err = omap2_nand_gpmc_retime(gpmc_nand_data);

	if (err < 0) {

	if (err < 0) {