diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:17:39 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:17:39 -0400 |
commit | 034ee299122c6b145d6d3cafb9ef5c329a4ab990 (patch) | |
tree | 0fb4dba7b72d28e1dc4d3bab1317a9a98302a7a5 /arch/arm/mach-omap2/board-rx51.c | |
parent | d6bb0f27709b91e674ce1441e2dd5e68620edf14 (diff) | |
parent | 3e28189038bb831512cf4f8313e1aead97c3e63f (diff) |
Merge branch 'depends/omap2_dss' into next/cleanup
Omap cleanups conflicted with omap2_dss work in a nontrivial
way, this is the most logical fixup.
Conflicts:
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/board-rx51.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51.c')
-rw-r--r-- | arch/arm/mach-omap2/board-rx51.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c index 74c8aadc0a19..4af7c4b2881a 100644 --- a/arch/arm/mach-omap2/board-rx51.c +++ b/arch/arm/mach-omap2/board-rx51.c | |||
@@ -79,29 +79,6 @@ static struct cpuidle_params rx51_cpuidle_params[] = { | |||
79 | {7505 + 15274, 484329, 1}, | 79 | {7505 + 15274, 484329, 1}, |
80 | }; | 80 | }; |
81 | 81 | ||
82 | static struct omap_lcd_config rx51_lcd_config = { | ||
83 | .ctrl_name = "internal", | ||
84 | }; | ||
85 | |||
86 | static struct omap_fbmem_config rx51_fbmem0_config = { | ||
87 | .size = 752 * 1024, | ||
88 | }; | ||
89 | |||
90 | static struct omap_fbmem_config rx51_fbmem1_config = { | ||
91 | .size = 752 * 1024, | ||
92 | }; | ||
93 | |||
94 | static struct omap_fbmem_config rx51_fbmem2_config = { | ||
95 | .size = 752 * 1024, | ||
96 | }; | ||
97 | |||
98 | static struct omap_board_config_kernel rx51_config[] = { | ||
99 | { OMAP_TAG_FBMEM, &rx51_fbmem0_config }, | ||
100 | { OMAP_TAG_FBMEM, &rx51_fbmem1_config }, | ||
101 | { OMAP_TAG_FBMEM, &rx51_fbmem2_config }, | ||
102 | { OMAP_TAG_LCD, &rx51_lcd_config }, | ||
103 | }; | ||
104 | |||
105 | extern void __init rx51_peripherals_init(void); | 82 | extern void __init rx51_peripherals_init(void); |
106 | 83 | ||
107 | #ifdef CONFIG_OMAP_MUX | 84 | #ifdef CONFIG_OMAP_MUX |
@@ -121,8 +98,6 @@ static void __init rx51_init(void) | |||
121 | struct omap_sdrc_params *sdrc_params; | 98 | struct omap_sdrc_params *sdrc_params; |
122 | 99 | ||
123 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); | 100 | omap3_mux_init(board_mux, OMAP_PACKAGE_CBB); |
124 | omap_board_config = rx51_config; | ||
125 | omap_board_config_size = ARRAY_SIZE(rx51_config); | ||
126 | omap3_pm_init_cpuidle(rx51_cpuidle_params); | 101 | omap3_pm_init_cpuidle(rx51_cpuidle_params); |
127 | omap_serial_init(); | 102 | omap_serial_init(); |
128 | 103 | ||