MXC: mx31moboard patches for next merge window
Subsystems (3)
Here are a few patches for the mxc branch related to the mx31moboard. The first two patches are just minimal changes and the third one adds support for a new baseboard used on some of our robots.
The patches were generated for the mxc-master branch.
All the comments are welcome.
Regards
Valentin
PATCH 1/3 mx31moboard: change initial reset status for robot microcontollers
We want the microcontrollers to be held in reset during kernel boot.
We also set the turretcam as the default camera since it is present on all marxbots.
--- arch/arm/mach-mx3/mx31moboard-marxbot.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-mx3/mx31moboard-marxbot.c +3 -3
@@ -127,12 +127,12 @@ static struct imxmmc_platform_data sdhc2_pdata = {static void dspics_resets_init (void ) {if (!gpio_request (TRSLAT_RST_B ,"translator-rst" )) { -gpio_direction_output (TRSLAT_RST_B ,1 ); +gpio_direction_output (TRSLAT_RST_B ,0 );gpio_export (TRSLAT_RST_B , false); }if (!gpio_request (DSPICS_RST_B ,"dspics-rst" )) { -gpio_direction_output (DSPICS_RST_B ,1 ); +gpio_direction_output (DSPICS_RST_B ,0 );gpio_export (DSPICS_RST_B , false); } }
@@ -200,7 +200,7 @@ static int __init marxbot_cam_init(void)int ret =gpio_request (CAM_CHOICE ,"cam-choice" );if (ret)return ret; -gpio_direction_output (CAM_CHOICE ,1 ); +gpio_direction_output (CAM_CHOICE ,0 ); ret =gpio_request (BASECAM_RST_B ,"basecam-reset" );if (ret)
Signature · 1 line
1.6.3.3
PATCH 2/3 mx31moboard: make usbh2 enable gpio claim more atomic
In reply to Valentin LongchampIt is more cosmetic than fixing a real problem, but the code looks more logical like that
--- arch/arm/mach-mx3/mach-mx31moboard.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
arch/arm/mach-mx3/mach-mx31moboard.c +4 -3
@@ -352,9 +352,7 @@ static struct fsl_usb2_platform_data usb_pdata = {static int moboard_usbh2_hw_init (struct platform_device *pdev) { -int ret =gpio_request (USBH2_EN_B ,"usbh2-en" ); -if (ret) -return ret; +int ret;mxc_iomux_set_gpr (MUX_PGP_UH2 , true);
@@ -371,6 +369,9 @@ static int moboard_usbh2_hw_init(struct platform_device *pdev)mxc_iomux_set_pad (MX31_PIN_SRXD3 ,USB_PAD_CFG );mxc_iomux_set_pad (MX31_PIN_STXD3 ,USB_PAD_CFG ); + ret =gpio_request (USBH2_EN_B ,"usbh2-en" ); +if (ret) +return ret;gpio_direction_output (USBH2_EN_B ,0 );return 0 ;
Signature · 1 line
1.6.3.3
PATCH 3/3 mx31moboard: support for the smartbot baseboard
In reply to Valentin LongchampThis baseboard is used on the handbot and eybot robots.
The sel gpios are used as enables and rst signals on smartbot, thus the sel init is moved from mx31moboard file to board files.
--- arch/arm/mach-mx3/Makefile | 2 +- arch/arm/mach-mx3/mach-mx31moboard.c | 36 +---- arch/arm/mach-mx3/mx31moboard-devboard.c | 32 ++++ arch/arm/mach-mx3/mx31moboard-marxbot.c | 33 ++++ arch/arm/mach-mx3/mx31moboard-smartbot.c | 162 ++++++++++++++++++++ arch/arm/plat-mxc/include/mach/board-mx31moboard.h | 2 + 6 files changed, 233 insertions(+), 34 deletions(-) create mode 100644 arch/arm/mach-mx3/mx31moboard-smartbot.c
arch/arm/mach-mx3/Makefile +1 -1
@@ -18,7 +18,7 @@ obj-$(CONFIG_MACH_PCM037_EET) += mach-pcm037_eet.o obj-$(CONFIG_MACH_MX31_3DS) += mach-mx31_3ds.o CFLAGS_mach-mx31_3ds.o = -DIMX_NEEDS_DEPRECATED_SYMBOLS obj-$(CONFIG_MACH_MX31MOBOARD) += mach-mx31moboard.o mx31moboard-devboard.o \ - mx31moboard-marxbot.o + mx31moboard-marxbot.o mx31moboard-smartbot.o obj-$(CONFIG_MACH_QONG) += mach-qong.o obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o obj-$(CONFIG_MACH_ARMADILLO5X0) += mach-armadillo5x0.o
arch/arm/mach-mx3/mach-mx31moboard.c +3 -33
@@ -96,9 +96,6 @@ static unsigned int moboard_pins[] = {/* LEDs */ MX31_PIN_SVEN0__GPIO2_0 ,MX31_PIN_STX0__GPIO2_1 ,MX31_PIN_SRX0__GPIO2_2 ,MX31_PIN_SIMPD0__GPIO2_3 , -/* SEL */ -MX31_PIN_DTR_DCE1__GPIO2_8 ,MX31_PIN_DSR_DCE1__GPIO2_9 , -MX31_PIN_RI_DCE1__GPIO2_10 ,MX31_PIN_DCD_DCE1__GPIO2_11 ,/* SPI1 */ MX31_PIN_CSPI2_MOSI__MOSI ,MX31_PIN_CSPI2_MISO__MISO , MX31_PIN_CSPI2_SCLK__SCLK, MX31_PIN_CSPI2_SPI_RDY__SPI_RDY,
@@ -432,34 +429,6 @@ static struct platform_device mx31moboard_leds_device = { }, }; -#define SEL0 IOMUX_TO_GPIO(MX31_PIN_DTR_DCE1) -#define SEL1 IOMUX_TO_GPIO(MX31_PIN_DSR_DCE1) -#define SEL2 IOMUX_TO_GPIO(MX31_PIN_RI_DCE1) -#define SEL3 IOMUX_TO_GPIO(MX31_PIN_DCD_DCE1) - -static void mx31moboard_init_sel_gpios (void ) -{ -if (!gpio_request (SEL0 ,"sel0" )) { -gpio_direction_input (SEL0 ); -gpio_export (SEL0 , true); - } - -if (!gpio_request (SEL1 ,"sel1" )) { -gpio_direction_input (SEL1 ); -gpio_export (SEL1 , true); - } - -if (!gpio_request (SEL2 ,"sel2" )) { -gpio_direction_input (SEL2 ); -gpio_export (SEL2 , true); - } - -if (!gpio_request (SEL3 ,"sel3" )) { -gpio_direction_input (SEL3 ); -gpio_export (SEL3 , true); - } -} -static struct ipu_platform_data mx3_ipu_data = { .irq_base =MXC_IPU_IRQ_START , };
@@ -519,8 +488,6 @@ static void __init mxc_board_init(void)mxc_register_device (&mxc_uart_device4, &uart4_pdata); -mx31moboard_init_sel_gpios (); -mxc_register_device (&mxc_i2c_device0, &moboard_i2c0_pdata);mxc_register_device (&mxc_i2c_device1, &moboard_i2c1_pdata);
@@ -553,6 +520,9 @@ static void __init mxc_board_init(void)case MX31MARXBOT :mx31moboard_marxbot_init ();break ; +case MX31SMARTBOT : +mx31moboard_smartbot_init (); +break ;default :printk (KERN_ERR "Illegal mx31moboard_baseboard type %d\n" , mx31moboard_baseboard);
arch/arm/mach-mx3/mx31moboard-devboard.c +32 -0
@@ -49,6 +49,9 @@ static unsigned int devboard_pins[] = {MX31_PIN_CSPI1_SS2__USBH1_RCV ,MX31_PIN_CSPI1_SCLK__USBH1_OEB ,MX31_PIN_CSPI1_SPI_RDY__USBH1_FS ,MX31_PIN_SFS6__USBH1_SUSPEND ,MX31_PIN_NFRE_B__GPIO1_11 ,MX31_PIN_NFALE__GPIO1_12 , +/* SEL */ +MX31_PIN_DTR_DCE1__GPIO2_8 ,MX31_PIN_DSR_DCE1__GPIO2_9 , + MX31_PIN_RI_DCE1__GPIO2_10, MX31_PIN_DCD_DCE1__GPIO2_11, }; static struct imxuart_platform_data uart_pdata = {
@@ -108,6 +111,33 @@ static struct imxmmc_platform_data sdhc2_pdata = { .exit = devboard_sdhc2_exit, }; +#define SEL0 IOMUX_TO_GPIO(MX31_PIN_DTR_DCE1) +#define SEL1 IOMUX_TO_GPIO(MX31_PIN_DSR_DCE1) +#define SEL2 IOMUX_TO_GPIO(MX31_PIN_RI_DCE1) +#define SEL3 IOMUX_TO_GPIO(MX31_PIN_DCD_DCE1) + +static void devboard_init_sel_gpios (void ) +{ +if (!gpio_request (SEL0 ,"sel0" )) { +gpio_direction_input (SEL0 ); +gpio_export (SEL0 , true); + } + +if (!gpio_request (SEL1 ,"sel1" )) { +gpio_direction_input (SEL1 ); +gpio_export (SEL1 , true); + } + +if (!gpio_request (SEL2 ,"sel2" )) { +gpio_direction_input (SEL2 ); +gpio_export (SEL2 , true); + } + +if (!gpio_request (SEL3 ,"sel3" )) { +gpio_direction_input (SEL3 ); +gpio_export (SEL3 , true); + } +}#define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \ PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
@@ -196,5 +226,7 @@ void __init mx31moboard_devboard_init(void)mxc_register_device (&mxcsdhc_device1, &sdhc2_pdata); +devboard_init_sel_gpios (); +devboard_usbh1_init (); }
arch/arm/mach-mx3/mx31moboard-marxbot.c +33 -0
@@ -66,6 +66,9 @@ static unsigned int marxbot_pins[] = {MX31_PIN_CSPI1_SS2__USBH1_RCV ,MX31_PIN_CSPI1_SCLK__USBH1_OEB ,MX31_PIN_CSPI1_SPI_RDY__USBH1_FS ,MX31_PIN_SFS6__USBH1_SUSPEND ,MX31_PIN_NFRE_B__GPIO1_11 ,MX31_PIN_NFALE__GPIO1_12 , +/* SEL */ +MX31_PIN_DTR_DCE1__GPIO2_8 ,MX31_PIN_DSR_DCE1__GPIO2_9 , + MX31_PIN_RI_DCE1__GPIO2_10, MX31_PIN_DCD_DCE1__GPIO2_11, };#define SDHC2_CD IOMUX_TO_GPIO(MX31_PIN_ATA_DIOR)
@@ -223,6 +226,34 @@ static int __init marxbot_cam_init(void)return 0 ; } +#define SEL0 IOMUX_TO_GPIO(MX31_PIN_DTR_DCE1) +#define SEL1 IOMUX_TO_GPIO(MX31_PIN_DSR_DCE1) +#define SEL2 IOMUX_TO_GPIO(MX31_PIN_RI_DCE1) +#define SEL3 IOMUX_TO_GPIO(MX31_PIN_DCD_DCE1) + +static void marxbot_init_sel_gpios (void ) +{ +if (!gpio_request (SEL0 ,"sel0" )) { +gpio_direction_input (SEL0 ); +gpio_export (SEL0 , true); + } + +if (!gpio_request (SEL1 ,"sel1" )) { +gpio_direction_input (SEL1 ); +gpio_export (SEL1 , true); + } + +if (!gpio_request (SEL2 ,"sel2" )) { +gpio_direction_input (SEL2 ); +gpio_export (SEL2 , true); + } + +if (!gpio_request (SEL3 ,"sel3" )) { +gpio_direction_input (SEL3 ); +gpio_export (SEL3 , true); + } +} +#define USB_PAD_CFG (PAD_CTL_DRV_MAX | PAD_CTL_SRE_FAST | PAD_CTL_HYS_CMOS | \ PAD_CTL_ODE_CMOS | PAD_CTL_100K_PU)
@@ -307,6 +338,8 @@ void __init mx31moboard_marxbot_init(void)mxc_iomux_setup_multiple_pins (marxbot_pins,ARRAY_SIZE (marxbot_pins),"marxbot" ); +marxbot_init_sel_gpios (); +dspics_resets_init ();mxc_register_device (&mxcsdhc_device1, &sdhc2_pdata);
arch/arm/mach-mx3/mx31moboard-smartbot.c new file +162 -0
162 lines not on this page · raw message
arch/arm/plat-mxc/include/mach/board-mx31moboard.h +2 -0
@@ -25,6 +25,7 @@ enum mx31moboard_boards {MX31NOBOARD =0 ,MX31DEVBOARD =1 ,MX31MARXBOT =2 , + MX31SMARTBOT = 3, };/*
@@ -34,6 +35,7 @@ enum mx31moboard_boards {extern void mx31moboard_devboard_init (void );extern void mx31moboard_marxbot_init (void ); +extern void mx31moboard_smartbot_init (void );#endif
Signature · 1 line
1.6.3.3
Sascha Hauer
maintainerQuoted 8 lines · Valentin Longchamp
Here are a few patches for the mxc branch related to the mx31moboard. The first two patches are just minimal changes and the third one adds support for a new baseboard used on some of our robots.
The patches were generated for the mxc-master branch.
All the comments are welcome.
Ok, added to mxc-master.
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 |