Merge branch 'nand_reconfig' into android-3.10-bringup

Brings the new flash layout into the main stream. Also
adds sleep mode power savings (USB CS off).

Change-Id: I2b3f73f58c923ca9fa89965685dfcd5a6b087bf6

2 files changed, 43 insertions, 28 deletions

diff --git a/arch/arm/boot/dts/omap3_h1.dts b/arch/arm/boot/dts/omap3_h1.dts
index b8c949698ae..ab2a48631e4 100644
--- a/arch/arm/boot/dts/omap3_h1.dts
+++ b/arch/arm/boot/dts/omap3_h1.dts
@@ -207,7 +207,7 @@
 
     dev_pins: pinmux_pv_pins {
       pinctrl-single,pins = <
-          0x5b2 0x004      /* USB control, ETK_D3, MODE4 | OUTPUT */
+          0x5b2 0x204      /* USB control, ETK_D3, MODE4 | OUTPUT */
           /* 0x1a2 0x104 */      /* ALS interrupt, input, GPIO */
           0x086 0x004  /* DRV2605 vibrator, output, GPIO */
           /* 0x938 0x104 */  /* Battery state, input, GPIO */
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index 4e07525aec7..84dde6d63b0 100644
--- a/arch/arm/mach-omap2/board-omap3h1.c
+++ b/arch/arm/mach-omap2/board-omap3h1.c
@@ -101,48 +101,63 @@ static struct of_device_id omap_dt_match_table[] __initdata = {
 };
 
 static struct mtd_partition omap3h1_nand_partitions[] = {
-	/* All the partition sizes are listed in terms of NAND block size */
+/* All the partition sizes are listed in terms of NAND block size */
 	{
-		.name		= "X-Loader",
-		.offset		= 0,
-		.size		= 4 * NAND_BLOCK_SIZE,
-		.mask_flags	= MTD_WRITEABLE,	/* force read-only */
+		.name       = "X-Loader",
+		.offset	    = 0,
+		.size       = 4 * NAND_BLOCK_SIZE,  /* 512Kb */
+		.mask_flags	= MTD_WRITEABLE,        /* force read-only */
 	},
 	{
-		.name		= "U-Boot",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x80000 */
-		.size		= 15 * NAND_BLOCK_SIZE,
-		.mask_flags	= MTD_WRITEABLE,	/* force read-only */
+		.name       = "U-Boot",
+		.offset	    = MTDPART_OFS_APPEND,   /* Offset = 0x80000 */
+		.size	    = 15 * NAND_BLOCK_SIZE, /* ~2Mb */
+		.mask_flags	= MTD_WRITEABLE,        /* force read-only */
 	},
 	{
-		.name		= "U-Boot Env",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x260000 */
-		.size		= 1 * NAND_BLOCK_SIZE,
+		.name   = "U-Boot Env",
+		.offset = MTDPART_OFS_APPEND,  /* Offset = 0x260000 */
+		.size   = 1 * NAND_BLOCK_SIZE, /* 128Kb */
 	},
 	{
-		.name		= "kernel",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x280000 */
-		.size		= 40 * NAND_BLOCK_SIZE,
+		.name   = "kernel",
+		.offset = MTDPART_OFS_APPEND,	/* Offset = 0x280000 */
+		.size   = 40 * NAND_BLOCK_SIZE, /* ~5Mb */
 	},
 	{
-		.name		= "initramfs",
-		.offset		= MTDPART_OFS_APPEND, 	/* Offset = 0xC80000 */
-		.size		= 80 * NAND_BLOCK_SIZE,
+		.name   = "initramfs",
+		.offset = MTDPART_OFS_APPEND,   /* Offset = 0x780000 */
+		.size   = 80 * NAND_BLOCK_SIZE, /* ~10Mb */
 	},
 	{
-		.name		= "ramdisk",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x1180000 */
-		.size		= 40 * NAND_BLOCK_SIZE,
+		.name   = "devicetree",
+		.offset	= MTDPART_OFS_APPEND,	/* Offset = 0x1180000 */
+		.size   = 4 * NAND_BLOCK_SIZE,  /* 512Kb */
 	},
 	{
-		.name		= "system",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x1680000 */
-		.size		= 2000 * NAND_BLOCK_SIZE,
+		.name   = "ramdisk",  /* For Android's ramdisk */
+		.offset	= MTDPART_OFS_APPEND,	 /* Offset = 0x1200000 */
+		.size   = 100 * NAND_BLOCK_SIZE, /* ~12Mb */
 	},
 	{
-		.name		= "userdata",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x11180000 */
-		.size		= MTDPART_SIZ_FULL,
+		.name   = "system",
+		.offset = MTDPART_OFS_APPEND,	  /* Offset = 0x1E80000 */
+		.size   = 2048 * NAND_BLOCK_SIZE, /* 0x7D0*0x20000 = ~256Mb */
+	},
+	{
+		.name   = "cache",
+		.offset = MTDPART_OFS_APPEND,	  /* Offset = 0x11E80000 */
+		.size   = 400 * NAND_BLOCK_SIZE,  /* 0x190*0x20000 = ~50Mb */
+	},
+	{
+		.name   = "recovery",
+		.offset = MTDPART_OFS_APPEND,     /* Offset = 0x14A80000 */
+		.size   = 200 * NAND_BLOCK_SIZE,  /* C8*20000 = ~26Mb */
+	},
+	{
+		.name   = "userdata",
+		.offset = MTDPART_OFS_APPEND,   /* Offset = 0x16380000 */
+		.size   = MTDPART_SIZ_FULL,     /* the rest */
 	},
 };