From 3ab611943d7e6998d469134fbae07256a41c3935 Mon Sep 17 00:00:00 2001
From: Valentin Longchamp <valentin.longchamp@epfl.ch>
Date: Mon, 23 Nov 2009 19:16:36 +0100
Subject: [PATCH] --- yaml --- r: 172498 b: refs/heads/master c:
 33c4d91928bea4444b067e620496befbeb87029c h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c | 13 +++++++++++++
 trunk/arch/arm/mach-mx3/mx31moboard.c         |  7 +------
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 20c63f08c1f3..ab4e7a0ce2b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e554540f8686d546639d1594a8259896c39633d
+refs/heads/master: 33c4d91928bea4444b067e620496befbeb87029c
diff --git a/trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c b/trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c
index e4e344eceb7c..7d98cb0164fa 100644
--- a/trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c
+++ b/trunk/arch/arm/mach-mx3/mx31moboard-marxbot.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
+#include <linux/spi/spi.h>
 #include <linux/platform_device.h>
 #include <linux/types.h>
 
@@ -126,6 +127,15 @@ static void dspics_resets_init(void)
 	}
 }
 
+static struct spi_board_info marxbot_spi_board_info[] __initdata = {
+	{
+		.modalias = "spidev",
+		.max_speed_hz = 300000,
+		.bus_num = 1,
+		.chip_select = 1, /* according spi1_cs[] ! */
+	},
+};
+
 #define TURRETCAM_POWER	IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)
 #define BASECAM_POWER	IOMUX_TO_GPIO(MX31_PIN_CSI_D5)
 #define TURRETCAM_RST_B	IOMUX_TO_GPIO(MX31_PIN_GPIO3_0)
@@ -217,6 +227,9 @@ void __init mx31moboard_marxbot_init(void)
 
 	mxc_register_device(&mxcsdhc_device1, &sdhc2_pdata);
 
+	spi_register_board_info(marxbot_spi_board_info,
+		ARRAY_SIZE(marxbot_spi_board_info));
+
 	marxbot_cam_init();
 	platform_add_devices(marxbot_cameras, ARRAY_SIZE(marxbot_cameras));
 
diff --git a/trunk/arch/arm/mach-mx3/mx31moboard.c b/trunk/arch/arm/mach-mx3/mx31moboard.c
index b167f131f7c0..2c9ea5f61816 100644
--- a/trunk/arch/arm/mach-mx3/mx31moboard.c
+++ b/trunk/arch/arm/mach-mx3/mx31moboard.c
@@ -213,6 +213,7 @@ static struct mc13783_platform_data moboard_pmic = {
 	.regulators = moboard_regulators,
 	.num_regulators = ARRAY_SIZE(moboard_regulators),
 	.flags = MC13783_USE_REGULATOR | MC13783_USE_RTC,
+		MC13783_USE_ADC,
 };
 
 static struct spi_board_info moboard_spi_board_info[] __initdata = {
@@ -225,12 +226,6 @@ static struct spi_board_info moboard_spi_board_info[] __initdata = {
 		.platform_data = &moboard_pmic,
 		.mode = SPI_CS_HIGH,
 	},
-	{
-		.modalias = "spidev",
-		.max_speed_hz = 300000,
-		.bus_num = 1,
-		.chip_select = 1, /* according spi1_cs[] ! */
-	},
 };
 
 static int moboard_spi2_cs[] = {