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

Commit f450d867 authored by Sukumar Ghorai's avatar Sukumar Ghorai Committed by Tony Lindgren
Browse files

omap3 nand: fix issue in board file to detect nand 



Board file modified for not to provide gpmc phys_base address to nand driver.
The gpmc_nand_init funciton is now used to detect the nand and required to
adopt _prob function as in nand/omap2.c

Signed-off-by: default avatarSukumar Ghorai <s-ghorai@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 2c01946c

arch/arm/mach-omap2/board-cm-t35.c

+1 −19
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ 
#define SB_T35_SMSC911X_GPIO	65



#define NAND_BLOCK_SIZE		SZ_128K

#define GPMC_CS0_BASE		0x60

#define GPMC_CS0_BASE_ADDR	(OMAP34XX_GPMC_VIRT + GPMC_CS0_BASE)



#if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)

#include <linux/smsc911x.h>
@@ -223,28 +221,12 @@ static struct omap_nand_platform_data cm_t35_nand_data = { 
	.nr_parts		= ARRAY_SIZE(cm_t35_nand_partitions),

	.dma_channel		= -1,	/* disable DMA in OMAP NAND driver */

	.cs			= 0,

	.gpmc_cs_baseaddr	= (void __iomem *)GPMC_CS0_BASE_ADDR,

	.gpmc_baseaddr		= (void __iomem *)OMAP34XX_GPMC_VIRT,



};



static struct resource cm_t35_nand_resource = {

	.flags		= IORESOURCE_MEM,

};



static struct platform_device cm_t35_nand_device = {

	.name		= "omap2-nand",

	.id		= -1,

	.num_resources	= 1,

	.resource	= &cm_t35_nand_resource,

	.dev		= {

		.platform_data	= &cm_t35_nand_data,

	},

};



static void __init cm_t35_init_nand(void)

{

	if (platform_device_register(&cm_t35_nand_device) < 0)

	if (gpmc_nand_init(&cm_t35_nand_data) < 0)

		pr_err("CM-T35: Unable to register NAND device\n");

}

#else

arch/arm/mach-omap2/board-devkit8000.c

+1 −24
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ 
#include "mux.h"

#include "hsmmc.h"



#define GPMC_CS0_BASE  0x60

#define GPMC_CS_SIZE   0x30



#define NAND_BLOCK_SIZE		SZ_128K



#define OMAP_DM9000_GPIO_IRQ	25
@@ -105,20 +102,6 @@ static struct omap_nand_platform_data devkit8000_nand_data = { 
	.dma_channel	= -1,		/* disable DMA in OMAP NAND driver */

};



static struct resource devkit8000_nand_resource = {

	.flags		= IORESOURCE_MEM,

};



static struct platform_device devkit8000_nand_device = {

	.name		= "omap2-nand",

	.id		= -1,

	.dev		= {

		.platform_data	= &devkit8000_nand_data,

	},

	.num_resources	= 1,

	.resource	= &devkit8000_nand_resource,

};



static struct omap2_hsmmc_info mmc[] = {

	{

		.mmc		= 1,
@@ -591,8 +574,6 @@ static void __init devkit8000_flash_init(void) 
	u8 cs = 0;

	u8 nandcs = GPMC_CS_NUM + 1;



	u32 gpmc_base_add = OMAP34XX_GPMC_VIRT;



	/* find out the chip-select on which NAND exists */

	while (cs < GPMC_CS_NUM) {

		u32 ret = 0;
@@ -614,13 +595,9 @@ static void __init devkit8000_flash_init(void) 


	if (nandcs < GPMC_CS_NUM) {

		devkit8000_nand_data.cs = nandcs;

		devkit8000_nand_data.gpmc_cs_baseaddr = (void *)

			(gpmc_base_add + GPMC_CS0_BASE + nandcs * GPMC_CS_SIZE);

		devkit8000_nand_data.gpmc_baseaddr = (void *)

			(gpmc_base_add);



		printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);

		if (platform_device_register(&devkit8000_nand_device) < 0)

		if (gpmc_nand_init(&devkit8000_nand_data) < 0)

			printk(KERN_ERR "Unable to register NAND device\n");

	}

}

arch/arm/mach-omap2/board-omap3beagle.c

+1 −23
Original line number Diff line number Diff line
@@ -48,9 +48,6 @@ 
#include "mux.h"

#include "hsmmc.h"



#define GPMC_CS0_BASE  0x60

#define GPMC_CS_SIZE   0x30



#define NAND_BLOCK_SIZE		SZ_128K



static struct mtd_partition omap3beagle_nand_partitions[] = {
@@ -93,20 +90,6 @@ static struct omap_nand_platform_data omap3beagle_nand_data = { 
	.dev_ready	= NULL,

};



static struct resource omap3beagle_nand_resource = {

	.flags		= IORESOURCE_MEM,

};



static struct platform_device omap3beagle_nand_device = {

	.name		= "omap2-nand",

	.id		= -1,

	.dev		= {

		.platform_data	= &omap3beagle_nand_data,

	},

	.num_resources	= 1,

	.resource	= &omap3beagle_nand_resource,

};



/* DSS */



static int beagle_enable_dvi(struct omap_dss_device *dssdev)
@@ -424,8 +407,6 @@ static void __init omap3beagle_flash_init(void) 
	u8 cs = 0;

	u8 nandcs = GPMC_CS_NUM + 1;



	u32 gpmc_base_add = OMAP34XX_GPMC_VIRT;



	/* find out the chip-select on which NAND exists */

	while (cs < GPMC_CS_NUM) {

		u32 ret = 0;
@@ -447,12 +428,9 @@ static void __init omap3beagle_flash_init(void) 


	if (nandcs < GPMC_CS_NUM) {

		omap3beagle_nand_data.cs = nandcs;

		omap3beagle_nand_data.gpmc_cs_baseaddr = (void *)

			(gpmc_base_add + GPMC_CS0_BASE + nandcs * GPMC_CS_SIZE);

		omap3beagle_nand_data.gpmc_baseaddr = (void *) (gpmc_base_add);



		printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);

		if (platform_device_register(&omap3beagle_nand_device) < 0)

		if (gpmc_nand_init(&omap3beagle_nand_data) < 0)

			printk(KERN_ERR "Unable to register NAND device\n");

	}

}

arch/arm/mach-omap2/board-omap3touchbook.c

+1 −24
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ 


#include <asm/setup.h>



#define GPMC_CS0_BASE  0x60

#define GPMC_CS_SIZE   0x30



#define NAND_BLOCK_SIZE		SZ_128K



#define OMAP3_AC_GPIO		136
@@ -106,20 +103,6 @@ static struct omap_nand_platform_data omap3touchbook_nand_data = { 
	.dev_ready	= NULL,

};



static struct resource omap3touchbook_nand_resource = {

	.flags		= IORESOURCE_MEM,

};



static struct platform_device omap3touchbook_nand_device = {

	.name		= "omap2-nand",

	.id		= -1,

	.dev		= {

		.platform_data	= &omap3touchbook_nand_data,

	},

	.num_resources	= 1,

	.resource	= &omap3touchbook_nand_resource,

};



#include "sdram-micron-mt46h32m32lf-6.h"



static struct omap2_hsmmc_info mmc[] = {
@@ -458,8 +441,6 @@ static void __init omap3touchbook_flash_init(void) 
	u8 cs = 0;

	u8 nandcs = GPMC_CS_NUM + 1;



	u32 gpmc_base_add = OMAP34XX_GPMC_VIRT;



	/* find out the chip-select on which NAND exists */

	while (cs < GPMC_CS_NUM) {

		u32 ret = 0;
@@ -481,13 +462,9 @@ static void __init omap3touchbook_flash_init(void) 


	if (nandcs < GPMC_CS_NUM) {

		omap3touchbook_nand_data.cs = nandcs;

		omap3touchbook_nand_data.gpmc_cs_baseaddr = (void *)

			(gpmc_base_add + GPMC_CS0_BASE + nandcs * GPMC_CS_SIZE);

		omap3touchbook_nand_data.gpmc_baseaddr =

						(void *) (gpmc_base_add);



		printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);

		if (platform_device_register(&omap3touchbook_nand_device) < 0)

		if (gpmc_nand_init(&omap3touchbook_nand_data) < 0)

			printk(KERN_ERR "Unable to register NAND device\n");

	}

}

arch/arm/mach-omap2/board-overo.c

+1 −23
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ 
#define OVERO_GPIO_USBH_NRESET	183



#define NAND_BLOCK_SIZE SZ_128K

#define GPMC_CS0_BASE  0x60

#define GPMC_CS_SIZE   0x30



#define OVERO_SMSC911X_CS      5

#define OVERO_SMSC911X_GPIO    176
@@ -269,28 +267,11 @@ static struct omap_nand_platform_data overo_nand_data = { 
	.dma_channel = -1,	/* disable DMA in OMAP NAND driver */

};



static struct resource overo_nand_resource = {

	.flags		= IORESOURCE_MEM,

};



static struct platform_device overo_nand_device = {

	.name		= "omap2-nand",

	.id		= -1,

	.dev		= {

		.platform_data	= &overo_nand_data,

	},

	.num_resources	= 1,

	.resource	= &overo_nand_resource,

};





static void __init overo_flash_init(void)

{

	u8 cs = 0;

	u8 nandcs = GPMC_CS_NUM + 1;



	u32 gpmc_base_add = OMAP34XX_GPMC_VIRT;



	/* find out the chip-select on which NAND exists */

	while (cs < GPMC_CS_NUM) {

		u32 ret = 0;
@@ -312,12 +293,9 @@ static void __init overo_flash_init(void) 


	if (nandcs < GPMC_CS_NUM) {

		overo_nand_data.cs = nandcs;

		overo_nand_data.gpmc_cs_baseaddr = (void *)

			(gpmc_base_add + GPMC_CS0_BASE + nandcs * GPMC_CS_SIZE);

		overo_nand_data.gpmc_baseaddr = (void *) (gpmc_base_add);



		printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);

		if (platform_device_register(&overo_nand_device) < 0)

		if (gpmc_nand_init(&overo_nand_data) < 0)

			printk(KERN_ERR "Unable to register NAND device\n");

	}

}