aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorValentin Longchamp <valentin.longchamp@epfl.ch>2010-02-09 12:13:34 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2010-02-10 05:11:55 -0500
commitf8594c283e409024d817e75027074570ce27dcc5 (patch)
treea4cc6da37a72361638ba6157e37f16bcd0bcaef8
parentfed9b63ca5aa999e618140cc1cc6bd73f212ec9b (diff)
mx31moboard: change initial reset status for robot microcontollers
We want the microcontrollers to be held in reset during kernel boot. We also set the turretcam as the default camera since it is present on all marxbots. Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/mach-mx3/mx31moboard-marxbot.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard-marxbot.c b/arch/arm/mach-mx3/mx31moboard-marxbot.c
index 1f44b9ccbb0f..7f6f58cddcb1 100644
--- a/arch/arm/mach-mx3/mx31moboard-marxbot.c
+++ b/arch/arm/mach-mx3/mx31moboard-marxbot.c
@@ -127,12 +127,12 @@ static struct imxmmc_platform_data sdhc2_pdata = {
127static void dspics_resets_init(void) 127static void dspics_resets_init(void)
128{ 128{
129 if (!gpio_request(TRSLAT_RST_B, "translator-rst")) { 129 if (!gpio_request(TRSLAT_RST_B, "translator-rst")) {
130 gpio_direction_output(TRSLAT_RST_B, 1); 130 gpio_direction_output(TRSLAT_RST_B, 0);
131 gpio_export(TRSLAT_RST_B, false); 131 gpio_export(TRSLAT_RST_B, false);
132 } 132 }
133 133
134 if (!gpio_request(DSPICS_RST_B, "dspics-rst")) { 134 if (!gpio_request(DSPICS_RST_B, "dspics-rst")) {
135 gpio_direction_output(DSPICS_RST_B, 1); 135 gpio_direction_output(DSPICS_RST_B, 0);
136 gpio_export(DSPICS_RST_B, false); 136 gpio_export(DSPICS_RST_B, false);
137 } 137 }
138} 138}
@@ -200,7 +200,7 @@ static int __init marxbot_cam_init(void)
200 int ret = gpio_request(CAM_CHOICE, "cam-choice"); 200 int ret = gpio_request(CAM_CHOICE, "cam-choice");
201 if (ret) 201 if (ret)
202 return ret; 202 return ret;
203 gpio_direction_output(CAM_CHOICE, 1); 203 gpio_direction_output(CAM_CHOICE, 0);
204 204
205 ret = gpio_request(BASECAM_RST_B, "basecam-reset"); 205 ret = gpio_request(BASECAM_RST_B, "basecam-reset");
206 if (ret) 206 if (ret)