diff options
author | Valentin Longchamp <valentin.longchamp@epfl.ch> | 2009-11-23 13:16:36 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-11-24 02:36:00 -0500 |
commit | 33c4d91928bea4444b067e620496befbeb87029c (patch) | |
tree | bc07a76f7a5ac12c50b53aceef8e1fb1decb927a /arch/arm/mach-mx3/mx31moboard.c | |
parent | 9e554540f8686d546639d1594a8259896c39633d (diff) |
mx31moboard: SPI corrections
Adds requirement for ADC on mc13783 and moves the spidev declaration
to marxbot file.
Signed-off-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/mx31moboard.c')
-rw-r--r-- | arch/arm/mach-mx3/mx31moboard.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard.c b/arch/arm/mach-mx3/mx31moboard.c index b167f131f7c0..2c9ea5f61816 100644 --- a/arch/arm/mach-mx3/mx31moboard.c +++ b/arch/arm/mach-mx3/mx31moboard.c | |||
@@ -213,6 +213,7 @@ static struct mc13783_platform_data moboard_pmic = { | |||
213 | .regulators = moboard_regulators, | 213 | .regulators = moboard_regulators, |
214 | .num_regulators = ARRAY_SIZE(moboard_regulators), | 214 | .num_regulators = ARRAY_SIZE(moboard_regulators), |
215 | .flags = MC13783_USE_REGULATOR | MC13783_USE_RTC, | 215 | .flags = MC13783_USE_REGULATOR | MC13783_USE_RTC, |
216 | MC13783_USE_ADC, | ||
216 | }; | 217 | }; |
217 | 218 | ||
218 | static struct spi_board_info moboard_spi_board_info[] __initdata = { | 219 | static struct spi_board_info moboard_spi_board_info[] __initdata = { |
@@ -225,12 +226,6 @@ static struct spi_board_info moboard_spi_board_info[] __initdata = { | |||
225 | .platform_data = &moboard_pmic, | 226 | .platform_data = &moboard_pmic, |
226 | .mode = SPI_CS_HIGH, | 227 | .mode = SPI_CS_HIGH, |
227 | }, | 228 | }, |
228 | { | ||
229 | .modalias = "spidev", | ||
230 | .max_speed_hz = 300000, | ||
231 | .bus_num = 1, | ||
232 | .chip_select = 1, /* according spi1_cs[] ! */ | ||
233 | }, | ||
234 | }; | 229 | }; |
235 | 230 | ||
236 | static int moboard_spi2_cs[] = { | 231 | static int moboard_spi2_cs[] = { |