Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 172455
b: refs/heads/master
c: e9a6c5d
h: refs/heads/master
i:
  172453: af225e2
  172451: 00c278e
  172447: 6056a15
v: v3
  • Loading branch information
Alberto Panizzo authored and Sascha Hauer committed Nov 14, 2009
1 parent e0651d3 commit 1db5017
Show file tree
Hide file tree
Showing 2 changed files with 6 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: 07299ca323022be10ccd56055704de3717b8fe69
refs/heads/master: e9a6c5d0c8c3f7f4d4ed5c5b1514327d58b76df3
5 changes: 5 additions & 0 deletions trunk/arch/arm/mach-mx3/armadillo5x0.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,11 @@ static int armadillo5x0_pins[] = {
MX31_PIN_FPSHIFT__FPSHIFT,
MX31_PIN_DRDY0__DRDY0,
IOMUX_MODE(MX31_PIN_LCS1, IOMUX_CONFIG_GPIO), /*ADV7125_PSAVE*/
/* I2C2 */
MX31_PIN_CSPI2_MOSI__SCL,
MX31_PIN_CSPI2_MISO__SDA,
};

/* GPIO BUTTONS */
static struct gpio_keys_button armadillo5x0_buttons[] = {
{
Expand Down Expand Up @@ -332,6 +336,7 @@ static struct imxuart_platform_data uart_pdata = {

static struct platform_device *devices[] __initdata = {
&armadillo5x0_smc911x_device,
&mxc_i2c_device1,
&armadillo5x0_button_device,
};

Expand Down

0 comments on commit 1db5017

Please sign in to comment.