Merge branch 'misc/mtd/sharpsl-nand' of git://git.kernel.org/pub/scm/linux/kernel...

diff --combined arch/arm/mach-pxa/spitz.c
index 3be76ee2bdbfd759b83eee07151ba7cf7917cc42,6ffa6134e10765670a166d8f3ec6a5e9c4c46748..7672b09c31b9f38074704b42d517777c5c905049
--- 1/arch/arm/mach-pxa/spitz.c
--- 2/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@@ -30,6 -30,7 +30,7 @@@
  #include <linux/spi/spi.h>
  #include <linux/spi/ads7846.h>
  #include <linux/spi/corgi_lcd.h>
+ #include <linux/mtd/sharpsl.h>
  
  #include <asm/setup.h>
  #include <asm/memory.h>
@@@ -67,7 -68,6 +68,7 @@@
  static unsigned long spitz_pin_config[] __initdata = {
        /* Chip Selects */
        GPIO78_nCS_2,   /* SCOOP #2 */
 +      GPIO79_nCS_3,   /* NAND */
        GPIO80_nCS_4,   /* SCOOP #1 */
  
        /* LCD - 16bpp Active TFT */
@@@ -98,10 -98,10 +99,10 @@@
        GPIO51_nPIOW,
        GPIO85_nPCE_1,
        GPIO54_nPCE_2,
 -      GPIO79_PSKTSEL,
        GPIO55_nPREG,
        GPIO56_nPWAIT,
        GPIO57_nIOIS16,
 +      GPIO104_PSKTSEL,
  
        /* MMC */
        GPIO32_MMC_CLK,
@@@ -386,16 -386,6 +387,16 @@@ static void __init spitz_init_spi(void
        if (err)
                goto err_free_2;
  
 +      err = gpio_direction_output(SPITZ_GPIO_ADS7846_CS, 1);
 +      if (err)
 +              goto err_free_3;
 +      err = gpio_direction_output(SPITZ_GPIO_LCDCON_CS, 1);
 +      if (err)
 +              goto err_free_3;
 +      err = gpio_direction_output(SPITZ_GPIO_MAX1111_CS, 1);
 +      if (err)
 +              goto err_free_3;
 +
        if (machine_is_akita()) {
                spitz_lcdcon_info.gpio_backlight_cont = AKITA_GPIO_BACKLIGHT_CONT;
                spitz_lcdcon_info.gpio_backlight_on = AKITA_GPIO_BACKLIGHT_ON;
@@@ -405,8 -395,6 +406,8 @@@
        spi_register_board_info(ARRAY_AND_SIZE(spitz_spi_devices));
        return;
  
 +err_free_3:
 +      gpio_free(SPITZ_GPIO_MAX1111_CS);
  err_free_2:
        gpio_free(SPITZ_GPIO_LCDCON_CS);
  err_free_1:
@@@ -608,11 -596,60 +609,60 @@@ static struct pxafb_mach_info spitz_pxa
        .lcd_conn       = LCD_COLOR_TFT_16BPP | LCD_ALTERNATE_MAPPING,
  };
  
+ static struct mtd_partition sharpsl_nand_partitions[] = {
+       {
+               .name = "System Area",
+               .offset = 0,
+               .size = 7 * 1024 * 1024,
+       },
+       {
+               .name = "Root Filesystem",
+               .offset = 7 * 1024 * 1024,
+       },
+       {
+               .name = "Home Filesystem",
+               .offset = MTDPART_OFS_APPEND,
+               .size = MTDPART_SIZ_FULL,
+       },
+ };
+ 
+ static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
+ 
+ static struct nand_bbt_descr sharpsl_bbt = {
+       .options = 0,
+       .offs = 4,
+       .len = 2,
+       .pattern = scan_ff_pattern
+ };
+ 
+ static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
+       .badblock_pattern       = &sharpsl_bbt,
+       .partitions             = sharpsl_nand_partitions,
+       .nr_partitions          = ARRAY_SIZE(sharpsl_nand_partitions),
+ };
+ 
+ static struct resource sharpsl_nand_resources[] = {
+       {
+               .start  = 0x0C000000,
+               .end    = 0x0C000FFF,
+               .flags  = IORESOURCE_MEM,
+       },
+ };
+ 
+ static struct platform_device sharpsl_nand_device = {
+       .name           = "sharpsl-nand",
+       .id             = -1,
+       .resource       = sharpsl_nand_resources,
+       .num_resources  = ARRAY_SIZE(sharpsl_nand_resources),
+       .dev.platform_data      = &sharpsl_nand_platform_data,
+ };
+ 
  
  static struct platform_device *devices[] __initdata = {
        &spitzscoop_device,
        &spitzkbd_device,
        &spitzled_device,
+       &sharpsl_nand_device,
  };
  
  static void spitz_poweroff(void)
@@@ -635,6 -672,14 +685,14 @@@ static void __init common_init(void
        pm_power_off = spitz_poweroff;
        arm_pm_restart = spitz_restart;
  
+       if (machine_is_spitz()) {
+               sharpsl_nand_partitions[1].size = 5 * 1024 * 1024;
+       } else if (machine_is_akita()) {
+               sharpsl_nand_partitions[1].size = 58 * 1024 * 1024;
+       } else if (machine_is_borzoi()) {
+               sharpsl_nand_partitions[1].size = 32 * 1024 * 1024;
+       }
+ 
        PMCR = 0x00;
  
        /* Stop 3.6MHz and drive HIGH to PCMCIA and CS */
@@@ -679,14 -724,34 +737,33 @@@ static struct i2c_board_info akita_i2c_
        },
  };
  
+ static struct nand_bbt_descr sharpsl_akita_bbt = {
+       .options = 0,
+       .offs = 4,
+       .len = 1,
+       .pattern = scan_ff_pattern
+ };
+ 
+ static struct nand_ecclayout akita_oobinfo = {
+       .eccbytes = 24,
+       .eccpos = {
+                  0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11,
+                  0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
+                  0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},
+       .oobfree = {{0x08, 0x09}}
+ };
+ 
  static void __init akita_init(void)
  {
        spitz_ficp_platform_data.transceiver_mode = akita_irda_transceiver_mode;
  
+       sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
+       sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
+ 
        /* We just pretend the second element of the array doesn't exist */
        spitz_pcmcia_config.num_devs = 1;
        platform_scoop_config = &spitz_pcmcia_config;
  
 -      pxa_set_i2c_info(NULL);
        i2c_register_board_info(0, ARRAY_AND_SIZE(akita_i2c_board_info));
  
        common_init();