OMAP2/3: Add support for flash on SDP boards
Subsystems (7)
PATCH 1/1 OMAP2/3: Add support for flash on SDP boards
Add support for flash on SDP boards. NAND, NOR and OneNAND are supported.
This patch also implements Tony's comments on:
http://marc.info/?l=linux-omap&m=125787938923028&w=2
This is done by creating 'mach-omap2/gpmc-nand.c' file, to handle GPMC related setups for the device driver.
Only tested on 3430SDP (ES2 and ES3.1), somebody please test on 2430SDP and check the chips select for 2430SDP.
Also note that:
For OneNAND: in the earlier 2430SDP code the kernel partition was set to only 1MB instead of 2MB on 3430SDP. If people want the old partition sizes back on 2430SDP, please provide a patch.
For NAND: 'U-Boot', 'Boot Env' and 'Kernel' partitions sizes increased by few blocks to provide few spare blocks for NAND bab block management in u-boot. If people want old partition sizes, please provide a patch.
--- arch/arm/mach-omap2/Makefile | 5 + arch/arm/mach-omap2/board-2430sdp.c | 2 + arch/arm/mach-omap2/board-3430sdp.c | 2 + arch/arm/mach-omap2/board-sdp-flash.c | 315 +++++++++++++++++++++++++++ arch/arm/mach-omap2/gpmc-nand.c | 128 +++++++++++ arch/arm/plat-omap/include/plat/board-sdp.h | 15 ++ arch/arm/plat-omap/include/plat/gpmc.h | 4 +- arch/arm/plat-omap/include/plat/nand.h | 6 + drivers/mtd/nand/omap2.c | 33 +-- 9 files changed, 488 insertions(+), 22 deletions(-) create mode 100644 arch/arm/mach-omap2/board-sdp-flash.c create mode 100644 arch/arm/mach-omap2/gpmc-nand.c create mode 100644 arch/arm/plat-omap/include/plat/board-sdp.h
arch/arm/mach-omap2/Makefile +5 -0
@@ -56,6 +56,7 @@ obj-$(CONFIG_OMAP_IOMMU) += $(iommu-y) obj-$(CONFIG_MACH_OMAP_GENERIC) += board-generic.o obj-$(CONFIG_MACH_OMAP_H4) += board-h4.o obj-$(CONFIG_MACH_OMAP_2430SDP) += board-2430sdp.o \ + board-sdp-flash.o \ mmc-twl4030.o obj-$(CONFIG_MACH_OMAP_APOLLON) += board-apollon.o obj-$(CONFIG_MACH_OMAP3_BEAGLE) += board-omap3beagle.o \
@@ -69,6 +70,7 @@ obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \ obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \ mmc-twl4030.o obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ + board-sdp-flash.o \ mmc-twl4030.o obj-$(CONFIG_MACH_NOKIA_N8X0) += board-n8x0.o obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \
@@ -105,3 +107,6 @@ obj-y += $(onenand-m) $(onenand-y) smc91x-$(CONFIG_SMC91X) := gpmc-smc91x.o obj-y += $(smc91x-m) $(smc91x-y) + +nand-$(CONFIG_MTD_NAND_OMAP2) := gpmc-nand.o +obj-y += $(nand-m) $(nand-y)
(quoted diff) +0 -0
b/arch/arm/mach-omap2/board-2430sdp.c
index db9374b..5676ab9 100644
arch/arm/mach-omap2/board-2430sdp.c +2 -0
@@ -38,6 +38,7 @@#include <plat/usb.h> #include <plat/gpmc-smc91x.h> +#include <plat/board-sdp.h> #include "mmc-twl4030.h" #define SDP2430_CS0_BASE 0x04000000
@@ -205,6 +206,7 @@ static void __init omap_2430sdp_init(void)twl4030_mmc_init (mmc);usb_musb_init ();board_smc91x_init (); +sdp_flash_init ();/* Turn off secondary LCD backlight */ ret =gpio_request (SECONDARY_LCD_GPIO ,"Secondary LCD backlight" );
(quoted diff) +0 -0
b/arch/arm/mach-omap2/board-3430sdp.c
index 491364e..f2ed1ab 100644
arch/arm/mach-omap2/board-3430sdp.c +2 -0
@@ -41,6 +41,7 @@#include <plat/control.h> #include <plat/gpmc-smc91x.h> +#include <plat/board-sdp.h> #include "sdram-qimonda-hyb18m512160af-6.h" #include "mmc-twl4030.h"
@@ -521,6 +522,7 @@ static void __init omap_3430sdp_init(void)omap_serial_init ();usb_musb_init ();board_smc91x_init (); +sdp_flash_init ();enable_board_wakeup_source ();usb_ehci_init (&ehci_pdata); }
(quoted diff) +0 -0
b/arch/arm/mach-omap2/board-sdp-flash.c
new file mode 100644
index 0000000..e5fc309
arch/arm/mach-omap2/board-sdp-flash.c new file +315 -0
315 lines not on this page · raw message
arch/arm/mach-omap2/gpmc-nand.c new file +128 -0
128 lines not on this page · raw message
(quoted diff) +0 -0
b/arch/arm/plat-omap/include/plat/board-sdp.h
new file mode 100644
index 0000000..a37dc7c
arch/arm/plat-omap/include/plat/board-sdp.h new file +15 -0
@@ -0,0 +1,15 @@ +/* +* board-sdp.h +* +* Information structures for SDP-specific board config data +* +* Copyright (C) 2009 Nokia Corporation +* Copyright (C) 2009 Texas Instruments +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License version 2 as +* published by the Free Software Foundation. +*/ + +extern void sdp_flash_init (void ); +
(quoted diff) +0 -0
b/arch/arm/plat-omap/include/plat/gpmc.h
index 696e0ca..4090749 100644
arch/arm/plat-omap/include/plat/gpmc.h +3 -1
@@ -27,6 +27,8 @@#define GPMC_CONFIG 0x50#define GPMC_STATUS 0x54 +#define GPMC_CS0_BASE 0x60 +#define GPMC_CS_SIZE 0x30#define GPMC_CONFIG1_WRAPBURST_SUPP (1 << 31)#define GPMC_CONFIG1_READMULTIPLE_SUPP (1 << 30)
@@ -45,7 +47,7 @@#define GPMC_CONFIG1_DEVICESIZE_16 GPMC_CONFIG1_DEVICESIZE(1)#define GPMC_CONFIG1_DEVICETYPE (val) ((val & 3) << 10)#define GPMC_CONFIG1_DEVICETYPE_NOR GPMC_CONFIG1_DEVICETYPE(0) -#define GPMC_CONFIG1_DEVICETYPE_NAND GPMC_CONFIG1_DEVICETYPE(1) +#define GPMC_CONFIG1_DEVICETYPE_NAND GPMC_CONFIG1_DEVICETYPE(2)#define GPMC_CONFIG1_MUXADDDATA (1 << 9)#define GPMC_CONFIG1_TIME_PARA_GRAN (1 << 4)#define GPMC_CONFIG1_FCLK_DIV (val) (val & 3)
(quoted diff) +0 -0
b/arch/arm/plat-omap/include/plat/nand.h
index 631a7be..164630b 100644
arch/arm/plat-omap/include/plat/nand.h +6 -0
@@ -21,4 +21,10 @@ struct omap_nand_platform_data {int dma_channel;void __iomem *gpmc_cs_baseaddr;void __iomem *gpmc_baseaddr; +int devsize; }; + +extern void gpmc_nand_init (struct omap_nand_platform_data *d); + +/* size (4 KiB) for IO mapping */ +#define NAND_IO_SIZE SZ_4K
drivers/mtd/nand/omap2.c +1 -4
@@ -30,12 +30,8 @@#define DRIVER_NAME "omap2-nand" -/* size (4 KiB) for IO mapping */ -#define NAND_IO_SIZE SZ_4K -#define NAND_WP_OFF 0#define NAND_WP_BIT 0x00000010 -#define WR_RD_PIN_MONITORING 0x00600000#define GPMC_BUF_FULL 0x00000001#define GPMC_BUF_EMPTY 0x00000000
@@ -139,6 +135,7 @@ struct omap_nand_info {struct mtd_partition *parts;struct nand_chip nand;struct platform_device *pdev; +int (*setup)(void __iomem *base);int gpmc_cs;unsigned long phys_base;
@@ -882,8 +879,6 @@ static int __devinit omap_nand_probe(struct
platform_device *pdev)
struct omap_nand_info *info;
struct omap_nand_platform_data *pdata;
int err;
- unsigned long val;
-
pdata = pdev->dev.platform_data;
if (pdata == NULL) {
@@ -910,24 +905,25 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
info->mtd.name = dev_name(&pdev->dev);
info->mtd.owner = THIS_MODULE;
+ info->nand.options |= pdata->devsize ? NAND_BUSWIDTH_16 : 0;
+ info->nand.options |= NAND_SKIP_BBTSCAN;
+
err = gpmc_cs_request(info->gpmc_cs, NAND_IO_SIZE, &info->phys_base); if (err < 0) {
dev_err(&pdev->dev, "Cannot request GPMC CS\n"); goto out_free_info;
}
- /* Enable RD PIN Monitoring Reg */
- if (pdata->dev_ready) {
- val = gpmc_cs_read_reg(info->gpmc_cs, GPMC_CS_CONFIG1);
- val |= WR_RD_PIN_MONITORING;
- gpmc_cs_write_reg(info->gpmc_cs, GPMC_CS_CONFIG1, val);
+ if (pdata->nand_setup != NULL) {
+ err = pdata->nand_setup((void __iomem *)info->phys_base);
+ if (err < 0) {
+ dev_err(&pdev->dev, "NAND platform setup failed: "
+ "%d\n", err);
+ goto out_free_cs;
+ }
+ info->setup = pdata->nand_setup;
}
- val = gpmc_cs_read_reg(info->gpmc_cs, GPMC_CS_CONFIG7);
- val &= ~(0xf << 8);
- val |= (0xc & 0xf) << 8;
- gpmc_cs_write_reg(info->gpmc_cs, GPMC_CS_CONFIG7, val);
-
/* NAND write protect off */
omap_nand_wp(&info->mtd, NAND_WP_OFF);
@@ -963,11 +959,6 @@ static int __devinit omap_nand_probe(struct platform_device *pdev)
info->nand.chip_delay = 50;
}
- info->nand.options |= NAND_SKIP_BBTSCAN;
- if ((gpmc_cs_read_reg(info->gpmc_cs, GPMC_CS_CONFIG1) & 0x3000)
- == 0x1000)
- info->nand.options |= NAND_BUSWIDTH_16;
-
if (use_prefetch) {
/* copy the virtual address of nand base for fifo access */ info->nand_pref_fifo_add = info->nand.IO_ADDR_R;
Signature · 1 line
1.5.5