Updated memory timings - for now, only leaving one setting as possible.

Change-Id: Ie1ee853ea7af3cedbdc61c291d6be5d01e31fba3

2 files changed, 58 insertions, 9 deletions

diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index 06471aefe7d..baa6f9561f1 100644
--- a/arch/arm/mach-omap2/board-omap3h1.c
+++ b/arch/arm/mach-omap2/board-omap3h1.c
@@ -68,7 +68,7 @@
 #include "common-board-devices.h"
 #include "board-omap3h1.h"
 
-#include "sdram-micron-mt29c4g48.h"
+#include "sdram-micron-mt29c8g96m-48.h"
 
 #define NAND_CS 0
 
@@ -219,8 +219,8 @@ static struct mxt_platform_data mxt_data = {
 static struct platform_device bcm20702_bluetooth_device = {
 	.name = "bcm20702_bluetooth",
 	.id   = -1,
- };
-*/
+};
+ */
 
 static struct platform_device omap3h1_dmic_codec = {
 		.name = "dmic-codec",
@@ -787,7 +787,7 @@ static struct i2c_board_info __initdata omap3h1_i2c3_board_info[] = {
     },
 };
 
-/* #ifdef ONLY_KEEPING_THIS_STUFF_FOR_NOSTALGIC_REASONS  */
+#ifdef ONLY_KEEPING_THIS_STUFF_FOR_NOSTALGIC_REASONS
 
 /* --------------------------------------------------------------------------- */
 /* Create debugfs entry 
@@ -976,7 +976,7 @@ static int __init omap3_wake_init (void) {
 }
 
 
-/* #endif ONLY_KEEPING_THIS_STUFF_FOR_NOSTALGIC_REASONS */
+#endif /* ONLY_KEEPING_THIS_STUFF_FOR_NOSTALGIC_REASONS */
 
 
 /***************************************************************************
@@ -1027,7 +1027,6 @@ static struct omap_uart_port_info omap_uart_ports[] = {
         .dma_rx_timeout   = DEFAULT_RXDMA_TIMEOUT,
         .dma_rx_poll_rate = DEFAULT_RXDMA_POLLRATE,
         .autosuspend_timeout = -1,
-        .wakelock_timeout = -1,
         .wakeup_capable = true,
     },
     {
@@ -1112,6 +1111,7 @@ static struct platform_device *omap3h1_devices[] __initdata = {
 		&omap3h1_dmic_codec,
 };
 
+
 #ifdef CONFIG_OMAP_MUX
 static struct omap_board_mux board_mux[] __initdata = {
 
@@ -1193,7 +1193,7 @@ static void __init omap3_h1_init(void)
                     ARRAY_SIZE(omap3h1_nand_partitions), NAND_CS,
                     NAND_BUSWIDTH_16, NULL);
 
-	omap_sdrc_init(mt29c4g48_sdrc_params, mt29c4g48_sdrc_params);
+	omap_sdrc_init(mt29c8g96_sdrc_params, mt29c8g96_sdrc_params);
 
     omap3_mux_init(board_mux, OMAP_PACKAGE_CBP);
 
@@ -1214,7 +1214,7 @@ static void __init omap3_h1_init(void)
 
 	usb_musb_init(&musb_board_data);
 
-    /* #ifdef ONLY_KEEPING_THIS_STUFF_FOR_NOSTALGIC_REASONS */
+#ifdef ONLY_KEEPING_THIS_STUFF_FOR_NOSTALGIC_REASONS
 
     /* For handling interrupts from the accelerometer */
 
@@ -1226,7 +1226,7 @@ static void __init omap3_h1_init(void)
 
     omap3_acc_irq_init(omap3h1_i2c2_board_info[0].irq, (void *) &omap3h1_devices);
 
-    /* #endif  ONLY_KEEPING_THIS_STUFF_FOR_NOSTALGIC_REASONS*/
+#endif /* ONLY_KEEPING_THIS_STUFF_FOR_NOSTALGIC_REASONS */
 
 }
 
diff --git a/arch/arm/mach-omap2/sdram-micron-mt29c8g96m-48.h b/arch/arm/mach-omap2/sdram-micron-mt29c8g96m-48.h
new file mode 100644
index 00000000000..6fdb97dbaf2
--- /dev/null
+++ b/arch/arm/mach-omap2/sdram-micron-mt29c8g96m-48.h
@@ -0,0 +1,49 @@
+/*
+ * SDRC register values for the Micron MT29C4G48MAYAPAKQ-5
+ *
+ * Copyright (C) 2015 Olio Devices
+ * Copyright (C) 2008 Texas Instruments, Inc.
+ * Copyright (C) 2008-2009 Nokia Corporation
+ *
+ * Mattis Fjallstrom (mattis at oliodevices.com)
+ * Paul Walmsley
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef ARCH_ARM_MACH_OMAP2_SDRAM_MICRON_MT29C8G96
+#define ARCH_ARM_MACH_OMAP2_SDRAM_MICRON_MT29C8G96
+
+#include "sdrc.h"
+
+/* MT29C8G96MAZBBDJV-48 IT */
+/* 4.8ns -> 208.333 MHz */
+/* 5ns -> 200MHz */
+
+static struct omap_sdrc_params mt29c8g96_sdrc_params[] = {
+	[0] = {
+		.rate        = 208333333,
+		.actim_ctrla = 0x7AE1B4C6,
+		.actim_ctrlb = 0x00021217,
+		.rfr_ctrl    = 0x00062701,
+		.mr	         = 0x00000034,
+	},
+	[1] = {
+		.rate	     = 0,
+	},
+};
+
+
+/* 
+	[1] = {
+		.rate        = 200000000,
+		.actim_ctrla = 0x7AE1B4C6,
+		.actim_ctrlb = 0x00021217,
+		.rfr_ctrl    = 0x0005E601,
+		.mr	         = 0x00000034,
+	},
+ */
+
+#endif