diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 07:04:37 -0400 |
| commit | 87d721ad7a37b7650dd710c88dd5c6a5bf9fe996 (patch) | |
| tree | 869d633803eb7c429624d3bd16a6117816849763 /arch/arm/mach-omap2/board-rx51.c | |
| parent | ddd559b13f6d2fe3ad68c4b3f5235fd3c2eae4e3 (diff) | |
| parent | b7cfda9fc3d7aa60cffab5367f2a72a4a70060cd (diff) | |
Merge branch 'master' into devel
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index 374ff63c3eb2..1c9e07fe8266 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c | |||
| @@ -61,7 +61,7 @@ static struct omap_board_config_kernel rx51_config[] = { | |||
| 61 | 61 | ||
| 62 | static void __init rx51_init_irq(void) | 62 | static void __init rx51_init_irq(void) |
| 63 | { | 63 | { |
| 64 | omap2_init_common_hw(NULL); | 64 | omap2_init_common_hw(NULL, NULL); |
| 65 | omap_init_irq(); | 65 | omap_init_irq(); |
| 66 | omap_gpio_init(); | 66 | omap_gpio_init(); |
| 67 | } | 67 | } |
| @@ -75,6 +75,10 @@ static void __init rx51_init(void) | |||
| 75 | omap_serial_init(); | 75 | omap_serial_init(); |
| 76 | usb_musb_init(); | 76 | usb_musb_init(); |
| 77 | rx51_peripherals_init(); | 77 | rx51_peripherals_init(); |
| 78 | |||
| 79 | /* Ensure SDRC pins are mux'd for self-refresh */ | ||
| 80 | omap_cfg_reg(H16_34XX_SDRC_CKE0); | ||
| 81 | omap_cfg_reg(H17_34XX_SDRC_CKE1); | ||
| 78 | } | 82 | } |
| 79 | 83 | ||
| 80 | static void __init rx51_map_io(void) | 84 | static void __init rx51_map_io(void) |