Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 243499
b: refs/heads/master
c: d335cf9
h: refs/heads/master
i:
  243497: 0d47c73
  243495: a581b34
v: v3
  • Loading branch information
Eric Bénard authored and Sascha Hauer committed Mar 25, 2011
1 parent 2b0eece commit f4c7b1c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: da8db3aab55142ad39061e6b0db1e7b065eac61a
refs/heads/master: d335cf97060c44e9beb2a25151b5fba8740e1929
11 changes: 10 additions & 1 deletion trunk/arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
#include <mach/ipu.h>
#include <mach/mx3fb.h>
#include <mach/audmux.h>
#include <mach/esdhc.h>

#include "devices-imx35.h"
#include "devices.h"
Expand Down Expand Up @@ -163,11 +164,14 @@ static iomux_v3_cfg_t eukrea_mbimxsd_pads[] = {
MX35_PAD_SD1_DATA1__ESDHC1_DAT1,
MX35_PAD_SD1_DATA2__ESDHC1_DAT2,
MX35_PAD_SD1_DATA3__ESDHC1_DAT3,
/* SD1 CD */
MX35_PAD_LD18__GPIO3_24,
};

#define GPIO_LED1 IMX_GPIO_NR(3, 29)
#define GPIO_SWITCH1 IMX_GPIO_NR(3, 25)
#define GPIO_LCDPWR IMX_GPIO_NR(1, 4)
#define GPIO_SD1CD IMX_GPIO_NR(3, 24)

static void eukrea_mbimxsd_lcd_power_set(struct plat_lcd_data *pd,
unsigned int power)
Expand Down Expand Up @@ -254,6 +258,11 @@ struct imx_ssi_platform_data eukrea_mbimxsd_ssi_pdata __initconst = {
.flags = IMX_SSI_SYN | IMX_SSI_NET | IMX_SSI_USE_I2S_SLAVE,
};

static struct esdhc_platform_data sd1_pdata = {
.cd_gpio = GPIO_SD1CD,
.wp_gpio = -EINVAL,
};

/*
* system init for baseboard usage. Will be called by cpuimx35 init.
*
Expand Down Expand Up @@ -289,7 +298,7 @@ void __init eukrea_mbimxsd35_baseboard_init(void)
imx35_add_imx_ssi(0, &eukrea_mbimxsd_ssi_pdata);

imx35_add_flexcan1(NULL);
imx35_add_sdhci_esdhc_imx(0, NULL);
imx35_add_sdhci_esdhc_imx(0, &sd1_pdata);

gpio_request(GPIO_LED1, "LED1");
gpio_direction_output(GPIO_LED1, 1);
Expand Down

0 comments on commit f4c7b1c

Please sign in to comment.