diff options
| author | mattis fjallstrom <mattis@acm.org> | 2015-05-28 13:14:08 -0700 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2015-05-28 13:14:08 -0700 |
| commit | c1dd97bf791382a32b8db45c84bcc66823ebbd5c (patch) | |
| tree | b3ae9dddad1c3babdd8034e01954c26840e6b1f7 /arch/arm/mach-omap2/board-omap3h1.c | |
| parent | 93e2f72703e322c4e00bb61770a84607000f50e9 (diff) | |
| download | olio-linux-3.10-c1dd97bf791382a32b8db45c84bcc66823ebbd5c.tar.xz olio-linux-3.10-c1dd97bf791382a32b8db45c84bcc66823ebbd5c.zip | |
Updated memory timings
Change-Id: Ie1ee853ea7af3cedbdc61c291d6be5d01e31fba3
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3h1.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3h1.c | 18 |
1 files changed, 9 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 */ } |