aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/mx31moboard-marxbot.c
diff options
context:
space:
mode:
authorValentin Longchamp <valentin.longchamp@epfl.ch>2009-11-23 13:16:36 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2009-11-24 02:36:00 -0500
commit33c4d91928bea4444b067e620496befbeb87029c (patch)
treebc07a76f7a5ac12c50b53aceef8e1fb1decb927a /arch/arm/mach-mx3/mx31moboard-marxbot.c
parent9e554540f8686d546639d1594a8259896c39633d (diff)
mx31moboard: SPI corrections
Adds requirement for ADC on mc13783 and moves the spidev declaration to marxbot file. Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard-marxbot.c')
-rw-r--r--arch/arm/mach-mx3/mx31moboard-marxbot.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard-marxbot.c b/arch/arm/mach-mx3/mx31moboard-marxbot.c
index e4e344eceb7c..7d98cb0164fa 100644
--- a/arch/arm/mach-mx3/mx31moboard-marxbot.c
+++ b/arch/arm/mach-mx3/mx31moboard-marxbot.c
@@ -21,6 +21,7 @@
21#include <linux/init.h> 21#include <linux/init.h>
22#include <linux/interrupt.h> 22#include <linux/interrupt.h>
23#include <linux/i2c.h> 23#include <linux/i2c.h>
24#include <linux/spi/spi.h>
24#include <linux/platform_device.h> 25#include <linux/platform_device.h>
25#include <linux/types.h> 26#include <linux/types.h>
26 27
@@ -126,6 +127,15 @@ static void dspics_resets_init(void)
126 } 127 }
127} 128}
128 129
130static struct spi_board_info marxbot_spi_board_info[] __initdata = {
131 {
132 .modalias = "spidev",
133 .max_speed_hz = 300000,
134 .bus_num = 1,
135 .chip_select = 1, /* according spi1_cs[] ! */
136 },
137};
138
129#define TURRETCAM_POWER IOMUX_TO_GPIO(MX31_PIN_GPIO3_1) 139#define TURRETCAM_POWER IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)
130#define BASECAM_POWER IOMUX_TO_GPIO(MX31_PIN_CSI_D5) 140#define BASECAM_POWER IOMUX_TO_GPIO(MX31_PIN_CSI_D5)
131#define TURRETCAM_RST_B IOMUX_TO_GPIO(MX31_PIN_GPIO3_0) 141#define TURRETCAM_RST_B IOMUX_TO_GPIO(MX31_PIN_GPIO3_0)
@@ -217,6 +227,9 @@ void __init mx31moboard_marxbot_init(void)
217 227
218 mxc_register_device(&mxcsdhc_device1, &sdhc2_pdata); 228 mxc_register_device(&mxcsdhc_device1, &sdhc2_pdata);
219 229
230 spi_register_board_info(marxbot_spi_board_info,
231 ARRAY_SIZE(marxbot_spi_board_info));
232
220 marxbot_cam_init(); 233 marxbot_cam_init();
221 platform_add_devices(marxbot_cameras, ARRAY_SIZE(marxbot_cameras)); 234 platform_add_devices(marxbot_cameras, ARRAY_SIZE(marxbot_cameras));
222 235