Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 160899
b: refs/heads/master
c: 2718c15
h: refs/heads/master
i:
  160897: c46d15a
  160895: 3ce3076
v: v3
  • Loading branch information
Valentin Longchamp authored and Sascha Hauer committed Aug 14, 2009
1 parent 42e7bf9 commit 763d116
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8b1a540c245d68a77dbd909359cfc709b6a3a1bf
refs/heads/master: 2718c15c5fffa9d05e5076451ab4fc81caac313f
20 changes: 20 additions & 0 deletions trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ static unsigned int marxbot_pins[] = {
MX31_PIN_CSI_PIXCLK__CSI_PIXCLK, MX31_PIN_CSI_VSYNC__CSI_VSYNC,
MX31_PIN_GPIO3_0__GPIO3_0, MX31_PIN_GPIO3_1__GPIO3_1,
MX31_PIN_TXD2__GPIO1_28,
/* dsPIC resets */
MX31_PIN_STXD5__GPIO1_21, MX31_PIN_SRXD5__GPIO1_22,
};

#define SDHC2_CD IOMUX_TO_GPIO(MX31_PIN_ATA_DIOR)
Expand Down Expand Up @@ -102,6 +104,22 @@ static struct imxmmc_platform_data sdhc2_pdata = {
.exit = marxbot_sdhc2_exit,
};

#define TRSLAT_RST_B IOMUX_TO_GPIO(MX31_PIN_STXD5)
#define DSPICS_RST_B IOMUX_TO_GPIO(MX31_PIN_SRXD5)

static void dspics_resets_init(void)
{
if (!gpio_request(TRSLAT_RST_B, "translator-rst")) {
gpio_direction_output(TRSLAT_RST_B, 1);
gpio_export(TRSLAT_RST_B, false);
}

if (!gpio_request(DSPICS_RST_B, "dspics-rst")) {
gpio_direction_output(DSPICS_RST_B, 1);
gpio_export(DSPICS_RST_B, false);
}
}

/*
* system init for baseboard usage. Will be called by mx31moboard init.
*/
Expand All @@ -112,5 +130,7 @@ void __init mx31moboard_marxbot_init(void)
mxc_iomux_setup_multiple_pins(marxbot_pins, ARRAY_SIZE(marxbot_pins),
"marxbot");

dspics_resets_init();

mxc_register_device(&mxcsdhc_device1, &sdhc2_pdata);
}

0 comments on commit 763d116

Please sign in to comment.