1 files changed, 2 insertions, 30 deletions

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 0ab0c26db4dd..87969c7df652 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -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");
         }
 }
@@ -507,18 +485,12 @@ static void __init omap3_beagle_init(void)
         beagle_display_init();
 }
 
-static void __init omap3_beagle_map_io(void)
-{
-        omap2_set_globals_343x();
-        omap34xx_map_common_io();
-}
-
 MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagle Board")
         /* Maintainer: Syed Mohammed Khasim - http://beagleboard.org */
         .phys_io        = 0x48000000,
         .io_pg_offst    = ((0xfa000000) >> 18) & 0xfffc,
         .boot_params    = 0x80000100,
-        .map_io         = omap3_beagle_map_io,
+        .map_io         = omap3_map_io,
         .reserve        = omap_reserve,
         .init_irq       = omap3_beagle_init_irq,
         .init_machine   = omap3_beagle_init,