diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-04-16 16:56:45 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-04-16 16:56:45 -0700 |
| commit | 96f88a5b1f282dea289447f3c5fda50b41313fd5 (patch) | |
| tree | 1b2009041d5c6a0218163a0dbe29f06cad9c4b0c /arch/arm/mach-omap2/board-omap3h1.c | |
| parent | 835447eb880846219bfb04b687936cc97d23c5a9 (diff) | |
| download | olio-linux-3.10-96f88a5b1f282dea289447f3c5fda50b41313fd5.tar.xz olio-linux-3.10-96f88a5b1f282dea289447f3c5fda50b41313fd5.zip | |
Fixes for device tree working with Android.
Change-Id: I805137b466a05f85482ff7a7fb3fa2a4b7622ddb
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3h1.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c index 0fd78f1b3a4..421b300a777 100644 --- a/arch/arm/mach-omap2/board-omap3h1.c +++ b/arch/arm/mach-omap2/board-omap3h1.c @@ -117,7 +117,7 @@ static struct mtd_partition omap3h1_nand_partitions[] = { .size = 80 * NAND_BLOCK_SIZE, }, { - .name = "devicetree", + .name = "ramdisk", .offset = MTDPART_OFS_APPEND, /* Offset = 0x1180000 */ .size = 40 * NAND_BLOCK_SIZE, }, @@ -388,6 +388,8 @@ static struct regulator_init_data tps65910_3v3 = { /* This is the OMAP display subsystem. Part of the OMAP processor OCP stuff. * USB also depends on this, so if you want to transfer files it has to be * always on. + * NAND flash and UART3 (which we don't use) requires it + * as well. */ static struct regulator_consumer_supply tps65910_1v8_supply[] = { @@ -409,17 +411,17 @@ static struct regulator_init_data tps65910_1v8 = { .state_mem = { .uV = 0, .mode = REGULATOR_MODE_STANDBY, - .disabled = 1, + .enabled = 1, }, .state_disk = { .uV = 0, .mode = REGULATOR_MODE_STANDBY, - .disabled = 1, + .enabled = 1, }, .state_standby = { .uV = 0, .mode = REGULATOR_MODE_STANDBY, - .disabled = 1, + .enabled = 1, }, }, |