aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/board-h3.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2007-12-11 16:50:17 -0500
committerTony Lindgren <tony@atomide.com>2008-02-08 13:38:00 -0500
commit78be63252bc9065dd0a12c106135655b7d4db1ec (patch)
treec31f30ea519dd11c80124aa7da9cc654e80e444f /arch/arm/mach-omap1/board-h3.c
parent85d05fb3fde692fdaa6b1f84c33fee718abebf0f (diff)
ARM: OMAP1: Make omap1 boards to use omap_nand_platform_data
This patch adds omap_nand_platform data based on a patch by Shahrom Sharif-Kashani <sshahrom@micron.com>, and makes omap1 boards to use omap_nand_platform_data instead of nand_platform_data used earlier. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/board-h3.c')
-rw-r--r--arch/arm/mach-omap1/board-h3.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 056519860565..c4a7141bb78c 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -42,6 +42,7 @@
42#include <asm/arch/irqs.h> 42#include <asm/arch/irqs.h>
43#include <asm/arch/mux.h> 43#include <asm/arch/mux.h>
44#include <asm/arch/tc.h> 44#include <asm/arch/tc.h>
45#include <asm/arch/nand.h>
45#include <asm/arch/irda.h> 46#include <asm/arch/irda.h>
46#include <asm/arch/usb.h> 47#include <asm/arch/usb.h>
47#include <asm/arch/keypad.h> 48#include <asm/arch/keypad.h>
@@ -179,7 +180,7 @@ static struct mtd_partition nand_partitions[] = {
179}; 180};
180 181
181/* dip switches control NAND chip access: 8 bit, 16 bit, or neither */ 182/* dip switches control NAND chip access: 8 bit, 16 bit, or neither */
182static struct nand_platform_data nand_data = { 183static struct omap_nand_platform_data nand_data = {
183 .options = NAND_SAMSUNG_LP_OPTIONS, 184 .options = NAND_SAMSUNG_LP_OPTIONS,
184 .parts = nand_partitions, 185 .parts = nand_partitions,
185 .nr_parts = ARRAY_SIZE(nand_partitions), 186 .nr_parts = ARRAY_SIZE(nand_partitions),
@@ -472,7 +473,7 @@ static struct i2c_board_info __initdata h3_i2c_board_info[] = {
472 473
473#define H3_NAND_RB_GPIO_PIN 10 474#define H3_NAND_RB_GPIO_PIN 10
474 475
475static int nand_dev_ready(struct nand_platform_data *data) 476static int nand_dev_ready(struct omap_nand_platform_data *data)
476{ 477{
477 return omap_get_gpio_datain(H3_NAND_RB_GPIO_PIN); 478 return omap_get_gpio_datain(H3_NAND_RB_GPIO_PIN);
478} 479}