aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/mx31lilly-db.c
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-11-21 12:40:40 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2009-11-23 05:51:00 -0500
commit2cc326833f616ee49f73be94d4bf0ab1bc9a72d9 (patch)
treece5347834be2483b4bed3c778e1e672aa1c65a03 /arch/arm/mach-mx3/mx31lilly-db.c
parent6d3e6601ba0ff6ca804d3c103164624618cab4a9 (diff)
ARM: MX3: lilly1131: move MC13783 device registration
Register the MC13783 device in the module code. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mx31lilly-db.c')
-rw-r--r--arch/arm/mach-mx3/mx31lilly-db.c19
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/mach-mx3/mx31lilly-db.c b/arch/arm/mach-mx3/mx31lilly-db.c
index bb1e44f5d30b..7aebd74a12e8 100644
--- a/arch/arm/mach-mx3/mx31lilly-db.c
+++ b/arch/arm/mach-mx3/mx31lilly-db.c
@@ -29,8 +29,6 @@
29#include <linux/init.h> 29#include <linux/init.h>
30#include <linux/gpio.h> 30#include <linux/gpio.h>
31#include <linux/platform_device.h> 31#include <linux/platform_device.h>
32#include <linux/spi/spi.h>
33#include <linux/mfd/mc13783.h>
34 32
35#include <asm/mach-types.h> 33#include <asm/mach-types.h>
36#include <asm/mach/arch.h> 34#include <asm/mach/arch.h>
@@ -214,22 +212,6 @@ static void __init mx31lilly_init_fb(void)
214 gpio_direction_output(LCD_VCC_EN_GPIO, 1); 212 gpio_direction_output(LCD_VCC_EN_GPIO, 1);
215} 213}
216 214
217/* SPI */
218
219static struct mc13783_platform_data mc13783_pdata __initdata = {
220 .flags = MC13783_USE_RTC | MC13783_USE_TOUCHSCREEN,
221};
222
223static struct spi_board_info lilly_spi_devs[] __initdata = {
224 {
225 .modalias = "mc13783",
226 .max_speed_hz = 1000000,
227 .bus_num = 1,
228 .chip_select = 0,
229 .platform_data = &mc13783_pdata,
230 },
231};
232
233void __init mx31lilly_db_init(void) 215void __init mx31lilly_db_init(void)
234{ 216{
235 mxc_iomux_setup_multiple_pins(lilly_db_board_pins, 217 mxc_iomux_setup_multiple_pins(lilly_db_board_pins,
@@ -240,6 +222,5 @@ void __init mx31lilly_db_init(void)
240 mxc_register_device(&mxc_uart_device2, &uart_pdata); 222 mxc_register_device(&mxc_uart_device2, &uart_pdata);
241 mxc_register_device(&mxcsdhc_device0, &mmc_pdata); 223 mxc_register_device(&mxcsdhc_device0, &mmc_pdata);
242 mx31lilly_init_fb(); 224 mx31lilly_init_fb();
243 spi_register_board_info(lilly_spi_devs, ARRAY_SIZE(lilly_spi_devs));
244} 225}
245 226