Commit 33c4d919 authored by Valentin Longchamp's avatar Valentin Longchamp Committed by Sascha Hauer
Browse files

mx31moboard: SPI corrections



Adds requirement for ADC on mc13783 and moves the spidev declaration
to marxbot file.
Signed-off-by: default avatarValentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 9e554540
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/spi/spi.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -126,6 +127,15 @@ static void dspics_resets_init(void) ...@@ -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 TURRETCAM_POWER IOMUX_TO_GPIO(MX31_PIN_GPIO3_1)
#define BASECAM_POWER IOMUX_TO_GPIO(MX31_PIN_CSI_D5) #define BASECAM_POWER IOMUX_TO_GPIO(MX31_PIN_CSI_D5)
#define TURRETCAM_RST_B IOMUX_TO_GPIO(MX31_PIN_GPIO3_0) #define TURRETCAM_RST_B IOMUX_TO_GPIO(MX31_PIN_GPIO3_0)
...@@ -217,6 +227,9 @@ void __init mx31moboard_marxbot_init(void) ...@@ -217,6 +227,9 @@ void __init mx31moboard_marxbot_init(void)
mxc_register_device(&mxcsdhc_device1, &sdhc2_pdata); mxc_register_device(&mxcsdhc_device1, &sdhc2_pdata);
spi_register_board_info(marxbot_spi_board_info,
ARRAY_SIZE(marxbot_spi_board_info));
marxbot_cam_init(); marxbot_cam_init();
platform_add_devices(marxbot_cameras, ARRAY_SIZE(marxbot_cameras)); platform_add_devices(marxbot_cameras, ARRAY_SIZE(marxbot_cameras));
......
...@@ -213,6 +213,7 @@ static struct mc13783_platform_data moboard_pmic = { ...@@ -213,6 +213,7 @@ static struct mc13783_platform_data moboard_pmic = {
.regulators = moboard_regulators, .regulators = moboard_regulators,
.num_regulators = ARRAY_SIZE(moboard_regulators), .num_regulators = ARRAY_SIZE(moboard_regulators),
.flags = MC13783_USE_REGULATOR | MC13783_USE_RTC, .flags = MC13783_USE_REGULATOR | MC13783_USE_RTC,
MC13783_USE_ADC,
}; };
static struct spi_board_info moboard_spi_board_info[] __initdata = { 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,12 +226,6 @@ static struct spi_board_info moboard_spi_board_info[] __initdata = {
.platform_data = &moboard_pmic, .platform_data = &moboard_pmic,
.mode = SPI_CS_HIGH, .mode = SPI_CS_HIGH,
}, },
{
.modalias = "spidev",
.max_speed_hz = 300000,
.bus_num = 1,
.chip_select = 1, /* according spi1_cs[] ! */
},
}; };
static int moboard_spi2_cs[] = { static int moboard_spi2_cs[] = {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment