[PATCH v8 1/6] ARM: OMAP2+: nand: unify init functions

Mohammed, Afzal afzal at ti.com
Fri Oct 5 11:42:41 EDT 2012


+ Jon and Paul

On Fri, Oct 05, 2012 at 21:05:54, Mohammed, Afzal wrote:
> Helper function for updating nand platform data has been
> added the capability to take timing structure arguement.
> Usage of omap_nand_flash_init() has been replaced by modifed
> one, omap_nand_flash_init was doing things similar to
> board_nand_init except that NAND CS# were being acquired
> based on bootloader setting. As CS# is hardwired for a given
> board, acquiring gpmc CS# has been removed, and updated with
> the value on board.
> 
> NAND CS# used in beagle board & omap3evm was found to be CS0.
> Thomas Weber <thomas.weber.linux at googlemail.com> reported
> that value of devkit8000 to be CS0. Overo board was found
> to be using CS0 based on u-boot, while google grep says
> omap3touchbook too has CS0.
> 
> Signed-off-by: Afzal Mohammed <afzal at ti.com>
> Reviewed-by: Jon Hunter <jon-hunter at ti.com>
> Acked-by: Igor Grinberg <grinberg at compulab.co.il>
> ---
>  arch/arm/mach-omap2/board-devkit8000.c     |  8 ++++--
>  arch/arm/mach-omap2/board-flash.c          | 45 +++++++++++++++---------------
>  arch/arm/mach-omap2/board-flash.h          |  6 ++--
>  arch/arm/mach-omap2/board-igep0020.c       |  2 +-
>  arch/arm/mach-omap2/board-ldp.c            |  4 +--
>  arch/arm/mach-omap2/board-omap3beagle.c    |  8 ++++--
>  arch/arm/mach-omap2/board-omap3evm.c       |  8 ++++--
>  arch/arm/mach-omap2/board-omap3touchbook.c |  8 ++++--
>  arch/arm/mach-omap2/board-overo.c          |  7 +++--
>  arch/arm/mach-omap2/board-zoom.c           |  5 ++--
>  arch/arm/mach-omap2/common-board-devices.c | 45 ------------------------------
>  arch/arm/mach-omap2/common-board-devices.h |  1 -
>  12 files changed, 62 insertions(+), 85 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
> index 1fd161e..9933966 100644
> --- a/arch/arm/mach-omap2/board-devkit8000.c
> +++ b/arch/arm/mach-omap2/board-devkit8000.c
> @@ -55,8 +55,11 @@
>  #include "sdram-micron-mt46h32m32lf-6.h"
>  #include "mux.h"
>  #include "hsmmc.h"
> +#include "board-flash.h"
>  #include "common-board-devices.h"
>  
> +#define	NAND_CS			0
> +
>  #define OMAP_DM9000_GPIO_IRQ	25
>  #define OMAP3_DEVKIT_TS_GPIO	27
>  
> @@ -621,8 +624,9 @@ static void __init devkit8000_init(void)
>  
>  	usb_musb_init(NULL);
>  	usbhs_init(&usbhs_bdata);
> -	omap_nand_flash_init(NAND_BUSWIDTH_16, devkit8000_nand_partitions,
> -			     ARRAY_SIZE(devkit8000_nand_partitions));
> +	board_nand_init(devkit8000_nand_partitions,
> +			ARRAY_SIZE(devkit8000_nand_partitions), NAND_CS,
> +			NAND_BUSWIDTH_16, NULL);
>  	omap_twl4030_audio_init("omap3beagle");
>  
>  	/* Ensure SDRC pins are mux'd for self-refresh */
> diff --git a/arch/arm/mach-omap2/board-flash.c b/arch/arm/mach-omap2/board-flash.c
> index 0cabe61..f8b30cb 100644
> --- a/arch/arm/mach-omap2/board-flash.c
> +++ b/arch/arm/mach-omap2/board-flash.c
> @@ -104,41 +104,41 @@ __init board_onenand_init(struct mtd_partition *onenand_parts,
>  		defined(CONFIG_MTD_NAND_OMAP2_MODULE)
>  
>  /* Note that all values in this struct are in nanoseconds */
> -static struct gpmc_timings nand_timings = {
> +struct gpmc_timings nand_default_timings[1] = {
> +	{
> +		.sync_clk = 0,
>  
> -	.sync_clk = 0,
> +		.cs_on = 0,
> +		.cs_rd_off = 36,
> +		.cs_wr_off = 36,
>  
> -	.cs_on = 0,
> -	.cs_rd_off = 36,
> -	.cs_wr_off = 36,
> +		.adv_on = 6,
> +		.adv_rd_off = 24,
> +		.adv_wr_off = 36,
>  
> -	.adv_on = 6,
> -	.adv_rd_off = 24,
> -	.adv_wr_off = 36,
> +		.we_off = 30,
> +		.oe_off = 48,
>  
> -	.we_off = 30,
> -	.oe_off = 48,
> +		.access = 54,
> +		.rd_cycle = 72,
> +		.wr_cycle = 72,
>  
> -	.access = 54,
> -	.rd_cycle = 72,
> -	.wr_cycle = 72,
> -
> -	.wr_access = 30,
> -	.wr_data_mux_bus = 0,
> +		.wr_access = 30,
> +		.wr_data_mux_bus = 0,
> +	},
>  };
>  
> -static struct omap_nand_platform_data board_nand_data = {
> -	.gpmc_t		= &nand_timings,
> -};
> +static struct omap_nand_platform_data board_nand_data;
>  
>  void
> -__init board_nand_init(struct mtd_partition *nand_parts,
> -			u8 nr_parts, u8 cs, int nand_type)
> +__init board_nand_init(struct mtd_partition *nand_parts, u8 nr_parts, u8 cs,
> +				int nand_type, struct gpmc_timings *gpmc_t)
>  {
>  	board_nand_data.cs		= cs;
>  	board_nand_data.parts		= nand_parts;
>  	board_nand_data.nr_parts	= nr_parts;
>  	board_nand_data.devsize		= nand_type;
> +	board_nand_data.gpmc_t		= gpmc_t;
>  
>  	board_nand_data.ecc_opt = OMAP_ECC_HAMMING_CODE_DEFAULT;
>  	gpmc_nand_init(&board_nand_data);
> @@ -238,5 +238,6 @@ void __init board_flash_init(struct flash_partitions partition_info[],
>  		pr_err("NAND: Unable to find configuration in GPMC\n");
>  	else
>  		board_nand_init(partition_info[2].parts,
> -			partition_info[2].nr_parts, nandcs, nand_type);
> +			partition_info[2].nr_parts, nandcs,
> +			nand_type, nand_default_timings);
>  }
> diff --git a/arch/arm/mach-omap2/board-flash.h b/arch/arm/mach-omap2/board-flash.h
> index c44b70d..a3aa5fc 100644
> --- a/arch/arm/mach-omap2/board-flash.h
> +++ b/arch/arm/mach-omap2/board-flash.h
> @@ -40,12 +40,14 @@ static inline void board_flash_init(struct flash_partitions part[],
>  #if defined(CONFIG_MTD_NAND_OMAP2) || \
>  		defined(CONFIG_MTD_NAND_OMAP2_MODULE)
>  extern void board_nand_init(struct mtd_partition *nand_parts,
> -					u8 nr_parts, u8 cs, int nand_type);
> +		u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t);
> +extern struct gpmc_timings nand_default_timings[];
>  #else
>  static inline void board_nand_init(struct mtd_partition *nand_parts,
> -					u8 nr_parts, u8 cs, int nand_type)
> +		u8 nr_parts, u8 cs, int nand_type, struct gpmc_timings *gpmc_t)
>  {
>  }
> +#define	nand_default_timings	NULL
>  #endif
>  
>  #if defined(CONFIG_MTD_ONENAND_OMAP2) || \
> diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
> index 48d5e41..f6b3ed0 100644
> --- a/arch/arm/mach-omap2/board-igep0020.c
> +++ b/arch/arm/mach-omap2/board-igep0020.c
> @@ -175,7 +175,7 @@ static void __init igep_flash_init(void)
>  		pr_info("IGEP: initializing NAND memory device\n");
>  		board_nand_init(igep_flash_partitions,
>  				ARRAY_SIZE(igep_flash_partitions),
> -				0, NAND_BUSWIDTH_16);
> +				0, NAND_BUSWIDTH_16, nand_default_timings);
>  	} else if (mux == IGEP_SYSBOOT_ONENAND) {
>  		pr_info("IGEP: initializing OneNAND memory device\n");
>  		board_onenand_init(igep_flash_partitions,
> diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
> index ee8c3cf..83383f3 100644
> --- a/arch/arm/mach-omap2/board-ldp.c
> +++ b/arch/arm/mach-omap2/board-ldp.c
> @@ -420,8 +420,8 @@ static void __init omap_ldp_init(void)
>  	omap_serial_init();
>  	omap_sdrc_init(NULL, NULL);
>  	usb_musb_init(NULL);
> -	board_nand_init(ldp_nand_partitions,
> -		ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0);
> +	board_nand_init(ldp_nand_partitions, ARRAY_SIZE(ldp_nand_partitions),
> +			ZOOM_NAND_CS, 0, nand_default_timings);
>  
>  	omap_hsmmc_init(mmc);
>  	ldp_display_init();
> diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
> index a08bebc..f240e21 100644
> --- a/arch/arm/mach-omap2/board-omap3beagle.c
> +++ b/arch/arm/mach-omap2/board-omap3beagle.c
> @@ -49,8 +49,11 @@
>  #include "mux.h"
>  #include "hsmmc.h"
>  #include "pm.h"
> +#include "board-flash.h"
>  #include "common-board-devices.h"
>  
> +#define	NAND_CS	0
> +
>  /*
>   * OMAP3 Beagle revision
>   * Run time detection of Beagle revision is done by reading GPIO.
> @@ -512,8 +515,9 @@ static void __init omap3_beagle_init(void)
>  
>  	usb_musb_init(NULL);
>  	usbhs_init(&usbhs_bdata);
> -	omap_nand_flash_init(NAND_BUSWIDTH_16, omap3beagle_nand_partitions,
> -			     ARRAY_SIZE(omap3beagle_nand_partitions));
> +	board_nand_init(omap3beagle_nand_partitions,
> +			ARRAY_SIZE(omap3beagle_nand_partitions), NAND_CS,
> +			NAND_BUSWIDTH_16, NULL);
>  	omap_twl4030_audio_init("omap3beagle");
>  
>  	/* Ensure msecure is mux'd to be able to set the RTC. */
> diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
> index a3959de..b23c81e 100644
> --- a/arch/arm/mach-omap2/board-omap3evm.c
> +++ b/arch/arm/mach-omap2/board-omap3evm.c
> @@ -56,6 +56,9 @@
>  #include "sdram-micron-mt46h32m32lf-6.h"
>  #include "hsmmc.h"
>  #include "common-board-devices.h"
> +#include "board-flash.h"
> +
> +#define	NAND_CS			0
>  
>  #define OMAP3_EVM_TS_GPIO	175
>  #define OMAP3_EVM_EHCI_VBUS	22
> @@ -732,8 +735,9 @@ static void __init omap3_evm_init(void)
>  	}
>  	usb_musb_init(&musb_board_data);
>  	usbhs_init(&usbhs_bdata);
> -	omap_nand_flash_init(NAND_BUSWIDTH_16, omap3evm_nand_partitions,
> -			     ARRAY_SIZE(omap3evm_nand_partitions));
> +	board_nand_init(omap3evm_nand_partitions,
> +			ARRAY_SIZE(omap3evm_nand_partitions), NAND_CS,
> +			NAND_BUSWIDTH_16, NULL);
>  
>  	omap_ads7846_init(1, OMAP3_EVM_TS_GPIO, 310, NULL);
>  	omap3evm_init_smsc911x();
> diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
> index 944ffc4..3f013c8 100644
> --- a/arch/arm/mach-omap2/board-omap3touchbook.c
> +++ b/arch/arm/mach-omap2/board-omap3touchbook.c
> @@ -50,6 +50,7 @@
>  
>  #include "mux.h"
>  #include "hsmmc.h"
> +#include "board-flash.h"
>  #include "common-board-devices.h"
>  
>  #include <asm/setup.h>
> @@ -59,6 +60,8 @@
>  #define TB_BL_PWM_TIMER		9
>  #define TB_KILL_POWER_GPIO	168
>  
> +#define	NAND_CS			0
> +
>  static unsigned long touchbook_revision;
>  
>  static struct mtd_partition omap3touchbook_nand_partitions[] = {
> @@ -365,8 +368,9 @@ static void __init omap3_touchbook_init(void)
>  	omap_ads7846_init(4, OMAP3_TS_GPIO, 310, &ads7846_pdata);
>  	usb_musb_init(NULL);
>  	usbhs_init(&usbhs_bdata);
> -	omap_nand_flash_init(NAND_BUSWIDTH_16, omap3touchbook_nand_partitions,
> -			     ARRAY_SIZE(omap3touchbook_nand_partitions));
> +	board_nand_init(omap3touchbook_nand_partitions,
> +			ARRAY_SIZE(omap3touchbook_nand_partitions), NAND_CS,
> +			NAND_BUSWIDTH_16, NULL);
>  
>  	/* Ensure SDRC pins are mux'd for self-refresh */
>  	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
> diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
> index b700685..e2cf0f7 100644
> --- a/arch/arm/mach-omap2/board-overo.c
> +++ b/arch/arm/mach-omap2/board-overo.c
> @@ -55,8 +55,11 @@
>  #include "mux.h"
>  #include "sdram-micron-mt46h32m32lf-6.h"
>  #include "hsmmc.h"
> +#include "board-flash.h"
>  #include "common-board-devices.h"
>  
> +#define	NAND_CS			0
> +
>  #define OVERO_GPIO_BT_XGATE	15
>  #define OVERO_GPIO_W2W_NRESET	16
>  #define OVERO_GPIO_PENDOWN	114
> @@ -495,8 +498,8 @@ static void __init overo_init(void)
>  	omap_serial_init();
>  	omap_sdrc_init(mt46h32m32lf6_sdrc_params,
>  				  mt46h32m32lf6_sdrc_params);
> -	omap_nand_flash_init(0, overo_nand_partitions,
> -			     ARRAY_SIZE(overo_nand_partitions));
> +	board_nand_init(overo_nand_partitions,
> +			ARRAY_SIZE(overo_nand_partitions), NAND_CS, 0, NULL);
>  	usb_musb_init(NULL);
>  	usbhs_init(&usbhs_bdata);
>  	overo_spi_init();
> diff --git a/arch/arm/mach-omap2/board-zoom.c b/arch/arm/mach-omap2/board-zoom.c
> index 4994438..c39578c 100644
> --- a/arch/arm/mach-omap2/board-zoom.c
> +++ b/arch/arm/mach-omap2/board-zoom.c
> @@ -113,8 +113,9 @@ static void __init omap_zoom_init(void)
>  		usbhs_init(&usbhs_bdata);
>  	}
>  
> -	board_nand_init(zoom_nand_partitions, ARRAY_SIZE(zoom_nand_partitions),
> -						ZOOM_NAND_CS, NAND_BUSWIDTH_16);
> +	board_nand_init(zoom_nand_partitions,
> +			ARRAY_SIZE(zoom_nand_partitions), ZOOM_NAND_CS,
> +			NAND_BUSWIDTH_16, nand_default_timings);
>  	zoom_debugboard_init();
>  	zoom_peripherals_init();
>  
> diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c
> index 48daac2..90e0597 100644
> --- a/arch/arm/mach-omap2/common-board-devices.c
> +++ b/arch/arm/mach-omap2/common-board-devices.c
> @@ -96,48 +96,3 @@ void __init omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
>  {
>  }
>  #endif
> -
> -#if defined(CONFIG_MTD_NAND_OMAP2) || defined(CONFIG_MTD_NAND_OMAP2_MODULE)
> -static struct omap_nand_platform_data nand_data;
> -
> -void __init omap_nand_flash_init(int options, struct mtd_partition *parts,
> -				 int nr_parts)
> -{
> -	u8 cs = 0;
> -	u8 nandcs = GPMC_CS_NUM + 1;
> -
> -	/* find out the chip-select on which NAND exists */
> -	while (cs < GPMC_CS_NUM) {
> -		u32 ret = 0;
> -		ret = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);
> -
> -		if ((ret & 0xC00) == 0x800) {
> -			printk(KERN_INFO "Found NAND on CS%d\n", cs);
> -			if (nandcs > GPMC_CS_NUM)
> -				nandcs = cs;
> -		}
> -		cs++;
> -	}
> -
> -	if (nandcs > GPMC_CS_NUM) {
> -		pr_info("NAND: Unable to find configuration in GPMC\n");
> -		return;
> -	}
> -
> -	if (nandcs < GPMC_CS_NUM) {
> -		nand_data.cs = nandcs;
> -		nand_data.parts = parts;
> -		nand_data.nr_parts = nr_parts;
> -		nand_data.devsize = options;
> -
> -		printk(KERN_INFO "Registering NAND on CS%d\n", nandcs);
> -		if (gpmc_nand_init(&nand_data) < 0)
> -			printk(KERN_ERR "Unable to register NAND device\n");
> -	}
> -}
> -#else
> -void __init omap_nand_flash_init(int options, struct mtd_partition *parts,
> -				 int nr_parts)
> -{
> -}
> -#endif
> diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h
> index a0b4a428..72bb41b 100644
> --- a/arch/arm/mach-omap2/common-board-devices.h
> +++ b/arch/arm/mach-omap2/common-board-devices.h
> @@ -10,6 +10,5 @@ struct ads7846_platform_data;
>  
>  void omap_ads7846_init(int bus_num, int gpio_pendown, int gpio_debounce,
>  		       struct ads7846_platform_data *board_pdata);
> -void omap_nand_flash_init(int opts, struct mtd_partition *parts, int n_parts);
>  
>  #endif /* __OMAP_COMMON_BOARD_DEVICES__ */
> -- 
> 1.7.12
> 
> 



More information about the linux-arm-kernel mailing list