diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 15:09:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-15 15:09:55 -0700 |
| commit | 13e356c977473baeb29e8abfd992f0cd938a78ce (patch) | |
| tree | 7aefdefbe380d554c7c06fbed3f9663cc02d5b92 /arch/arm/mach-omap2/board-zoom2.c | |
| parent | dcbeb0bec5f2695c3ff53f174efb8e03c209f3f3 (diff) | |
| parent | 15605236740c38b51d67faf060851bfdc5c6b5fc (diff) | |
| download | op-kernel-dev-13e356c977473baeb29e8abfd992f0cd938a78ce.zip op-kernel-dev-13e356c977473baeb29e8abfd992f0cd938a78ce.tar.gz | |
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
OMAP2xxx clock: set up clockdomain pointer in struct clk
OMAP: Fix race condition with autodeps
omap: McBSP: Fix incorrect receiver stop in omap_mcbsp_stop
omap: Initialization of SDRC params on Zoom2
omap: RX-51: Drop I2C-1 speed to 2200
omap: SDMA: Fixing bug in omap_dma_set_global_params()
omap: CONFIG_ISP1301_OMAP redefined in Beagle defconfig
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom2.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom2.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-zoom2.c b/arch/arm/mach-omap2/board-zoom2.c index b7b3220..fd3369d 100644 --- a/arch/arm/mach-omap2/board-zoom2.c +++ b/arch/arm/mach-omap2/board-zoom2.c @@ -25,6 +25,7 @@ #include <mach/keypad.h> #include "mmc-twl4030.h" +#include "sdram-micron-mt46h32m32lf-6.h" /* Zoom2 has Qwerty keyboard*/ static int board_keymap[] = { @@ -213,7 +214,8 @@ static void __init omap_zoom2_init_irq(void) { omap_board_config = zoom2_config; omap_board_config_size = ARRAY_SIZE(zoom2_config); - omap2_init_common_hw(NULL, NULL); + omap2_init_common_hw(mt46h32m32lf6_sdrc_params, + mt46h32m32lf6_sdrc_params); omap_init_irq(); omap_gpio_init(); } |
