summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattis fjallstrom <mattis@acm.org>2015-04-13 17:53:17 -0700
committermattis fjallstrom <mattis@acm.org>2015-04-13 17:53:17 -0700
commit835447eb880846219bfb04b687936cc97d23c5a9 (patch)
tree374a9352681123e50126eeda45259a51176456de
parent51f4dba7f9029e25e6b91b3a8b9c6569c21af0cc (diff)
downloadolio-linux-3.10-835447eb880846219bfb04b687936cc97d23c5a9.tar.xz
olio-linux-3.10-835447eb880846219bfb04b687936cc97d23c5a9.zip
Renaming nand section to device tree (because that's what we keep there).
Change-Id: Ica12bfe05ae16beeb88f1358d96c12e2137994b0
-rw-r--r--arch/arm/mach-omap2/board-omap3h1.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index 8697bcea5af..0fd78f1b3a4 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 = "ramdisk",
+ .name = "devicetree",
.offset = MTDPART_OFS_APPEND, /* Offset = 0x1180000 */
.size = 40 * NAND_BLOCK_SIZE,
},
@@ -1073,11 +1073,6 @@ static void __init omap3_h1_init(void)
platform_add_devices(omap3h1_devices, ARRAY_SIZE(omap3h1_devices));
- /* TODO: The display only coming on on second boot and on may be
- * related to the display init happening before many other things
- * on the board. --mfj
- */
-
omap_display_init(&omap3h1_dss_data);
usb_bind_phy("musb-hdrc.0.auto", 0, "nop_usb_xceiv"); /* "tusb-usb-h1" */