From 1db50174bcfb3c68e5fd2140defd9fa8eb3e0e67 Mon Sep 17 00:00:00 2001
From: Alberto Panizzo <maramaopercheseimorto@gmail.com>
Date: Thu, 15 Oct 2009 19:31:07 +0200
Subject: [PATCH] --- yaml --- r: 172455 b: refs/heads/master c:
 e9a6c5d0c8c3f7f4d4ed5c5b1514327d58b76df3 h: refs/heads/master i:   172453:
 af225e2be7ca5802f99ea9a81c5bb5590e420208   172451:
 00c278ef764cd76a27dc1f530b45da9443384571   172447:
 6056a15fd7d88330bf720a7f944947b9245fe8a8 v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/mach-mx3/armadillo5x0.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e8f06e2ab5d1..690db46683f1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07299ca323022be10ccd56055704de3717b8fe69
+refs/heads/master: e9a6c5d0c8c3f7f4d4ed5c5b1514327d58b76df3
diff --git a/trunk/arch/arm/mach-mx3/armadillo5x0.c b/trunk/arch/arm/mach-mx3/armadillo5x0.c
index bd4a0f90fb3c..fa973e40329e 100644
--- a/trunk/arch/arm/mach-mx3/armadillo5x0.c
+++ b/trunk/arch/arm/mach-mx3/armadillo5x0.c
@@ -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[] = {
 	{
@@ -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,
 };