mx31moboard: inc patches to mxc-master
Subsystems (3)
cover mx31moboard: inc patches to mxc-master
Hi Sascha,
Here are the patches in incremental form.
There is a small SPI correction and it adds support for USB host as the driver should come with 2.6.33.
The series was generated with you mxc-master-pu branch. It would be nice that this gets in 2.6.33 as well.
Thanks
Val
PATCH 1/3 mx31: pins used for mx31moboard USB
--- arch/arm/plat-mxc/include/mach/iomux-mx3.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/plat-mxc/include/mach/iomux-mx3.h +10 -0
@@ -644,12 +644,22 @@ enum iomux_pins {#define MX31_PIN_CSPI1_SS2__USBH1_RCV IOMUX_MODE(MX31_PIN_CSPI1_SS2, IOMUX_CONFIG_ALT1)#define MX31_PIN_CSPI1_SCLK__USBH1_OEB IOMUX_MODE(MX31_PIN_CSPI1_SCLK, IOMUX_CONFIG_ALT1)#define MX31_PIN_CSPI1_SPI_RDY__USBH1_FS IOMUX_MODE(MX31_PIN_CSPI1_SPI_RDY, IOMUX_CONFIG_ALT1) +#define MX31_PIN_SFS6__USBH1_SUSPEND IOMUX_MODE(MX31_PIN_SFS6, IOMUX_CONFIG_FUNC) +#define MX31_PIN_NFRE_B__GPIO1_11 IOMUX_MODE(MX31_PIN_NFRE_B, IOMUX_CONFIG_GPIO) +#define MX31_PIN_NFALE__GPIO1_12 IOMUX_MODE(MX31_PIN_NFALE, IOMUX_CONFIG_GPIO)#define MX31_PIN_USBH2_DATA0__USBH2_DATA0 IOMUX_MODE(MX31_PIN_USBH2_DATA0, IOMUX_CONFIG_FUNC)#define MX31_PIN_USBH2_DATA1__USBH2_DATA1 IOMUX_MODE(MX31_PIN_USBH2_DATA1, IOMUX_CONFIG_FUNC) +#define MX31_PIN_STXD3__USBH2_DATA2 IOMUX_MODE(MX31_PIN_STXD3, IOMUX_CONFIG_FUNC) +#define MX31_PIN_SRXD3__USBH2_DATA3 IOMUX_MODE(MX31_PIN_SRXD3, IOMUX_CONFIG_FUNC) +#define MX31_PIN_SCK3__USBH2_DATA4 IOMUX_MODE(MX31_PIN_SCK3, IOMUX_CONFIG_FUNC) +#define MX31_PIN_SFS3__USBH2_DATA5 IOMUX_MODE(MX31_PIN_SFS3, IOMUX_CONFIG_FUNC) +#define MX31_PIN_STXD6__USBH2_DATA6 IOMUX_MODE(MX31_PIN_STXD6, IOMUX_CONFIG_FUNC) +#define MX31_PIN_SRXD6__USBH2_DATA7 IOMUX_MODE(MX31_PIN_SRXD6, IOMUX_CONFIG_FUNC)#define MX31_PIN_USBH2_CLK__USBH2_CLK IOMUX_MODE(MX31_PIN_USBH2_CLK, IOMUX_CONFIG_FUNC)#define MX31_PIN_USBH2_DIR__USBH2_DIR IOMUX_MODE(MX31_PIN_USBH2_DIR, IOMUX_CONFIG_FUNC)#define MX31_PIN_USBH2_NXT__USBH2_NXT IOMUX_MODE(MX31_PIN_USBH2_NXT, IOMUX_CONFIG_FUNC)#define MX31_PIN_USBH2_STP__USBH2_STP IOMUX_MODE(MX31_PIN_USBH2_STP, IOMUX_CONFIG_FUNC) +#define MX31_PIN_SCK6__GPIO1_25 IOMUX_MODE(MX31_PIN_SCK6, IOMUX_CONFIG_GPIO)#define MX31_PIN_USB_OC__GPIO1_30 IOMUX_MODE(MX31_PIN_USB_OC, IOMUX_CONFIG_GPIO)#define MX31_PIN_I2C_DAT__I2C1_SDA IOMUX_MODE(MX31_PIN_I2C_DAT, IOMUX_CONFIG_FUNC)#define MX31_PIN_I2C_CLK__I2C1_SCL IOMUX_MODE(MX31_PIN_I2C_CLK, IOMUX_CONFIG_FUNC)
Signature · 1 line
1.6.3.3
PATCH 2/3 mx31moboard: SPI corrections
Adds requirement for ADC on mc13783 and moves the spidev declaration to marxbot file.
--- arch/arm/mach-mx3/mx31moboard-marxbot.c | 13 +++++++++++++ arch/arm/mach-mx3/mx31moboard.c | 7 +------ 2 files changed, 14 insertions(+), 6 deletions(-)
arch/arm/mach-mx3/mx31moboard-marxbot.c +13 -0
@@ -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 (&mx31_sdhc_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));
arch/arm/mach-mx3/mx31moboard.c +1 -6
@@ -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[] = {
Signature · 1 line
1.6.3.3
PATCH 3/3 mx31moboard: support for usbh1 and usbh2
--- arch/arm/mach-mx3/Kconfig | 1 + arch/arm/mach-mx3/mx31moboard-devboard.c | 86 ++++++++++++++++++++++++++++++ arch/arm/mach-mx3/mx31moboard-marxbot.c | 86 ++++++++++++++++++++++++++++++ arch/arm/mach-mx3/mx31moboard.c | 65 ++++++++++++++++++++++ 4 files changed, 238 insertions(+), 0 deletions(-)
arch/arm/mach-mx3/Kconfig +1 -0
@@ -63,6 +63,7 @@ config MACH_MX31_3DS config MACH_MX31MOBOARD bool "Support mx31moboard platforms (EPFL Mobots group)" select ARCH_MX31 + select MXC_ULPI help Include support for mx31moboard platform. This includes specific configurations for the board and its peripherals.
arch/arm/mach-mx3/mx31moboard-devboard.c +86 -0
113 lines not on this page · raw message
arch/arm/mach-mx3/mx31moboard-marxbot.c +86 -0
113 lines not on this page · raw message
arch/arm/mach-mx3/mx31moboard.c +65 -0
97 lines not on this page · raw message
Signature · 1 line
1.6.3.3
Sascha Hauer
maintainercover mx31moboard: inc patches to mxc-master
In reply to Valentin LongchampQuoted 3 lines · Valentin Longchamp
Hi Sascha,
Here are the patches in incremental form.
Ok, applied.
Quoted 6 lines
There is a small SPI correction and it adds support for USB host as the driver should come with 2.6.33.
The series was generated with you mxc-master-pu branch. It would be nice that this gets in 2.6.33 as well.
No, I'm still working on these.
Sascha
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |