On Thu, 2011-02-17 at 14:20 -0800, Tony Lindgren wrote: > * Reizer, Eyal <ey...@ti.com> [110215 07:11]: > > Dear Tony, > > > > I did not receive any comments to the patch I have send in the following > > link: > > > > http://marc.info/?l=linux-omap&m=129612179900695&w=2 > > > > Are there any issues with excepting this patch? > > Pushing to devel-board branch for the upcoming merge window. > Can you please check it's working? I had to merge some other > evm board changes manually.. > > Tony
Dear Tony,
As you requested, I have tested the devel-board branch this morning and
found one merge issue.
I see that there are now two mux arrays, one for omap35x and one for
omap36x.
You have merged the muxes changes to the omap35x_board_mux[] array, but
have missed the other structure called omap36x_board_mux[].
The same change should be merged there as well.
The result is that it would work OK on an evm with an omap35x SOM but
not on aboard with an omap37x SOM.
Please find below a fix for that.
Best Regards,
Eyal Reizer
diff --git a/arch/arm/mach-omap2/board-omap3evm.c
b/arch/arm/mach-omap2/board-om
index d4a1157..b77140f 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -815,6 +815,21 @@ static struct omap_board_mux omap36x_board_mux[]
__initdata
OMAP3_MUX(SYS_BOOT4, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
OMAP3_MUX(SYS_BOOT5, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
OMAP3_MUX(SYS_BOOT6, OMAP_MUX_MODE3 | OMAP_PIN_OFF_NONE),
+#ifdef CONFIG_WL12XX_PLATFORM_DATA
+ /* WLAN IRQ - GPIO 149 */
+ OMAP3_MUX(UART1_RTS, OMAP_MUX_MODE4 | OMAP_PIN_INPUT_PULLUP),
+
+ /* WLAN POWER ENABLE - GPIO 150 */
+ OMAP3_MUX(UART1_CTS, OMAP_MUX_MODE4 | OMAP_PIN_OUTPUT),
+
+ /* MMC2 SDIO pin muxes for WL12xx */
+ OMAP3_MUX(SDMMC2_CLK, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP),
+ OMAP3_MUX(SDMMC2_CMD, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP),
+ OMAP3_MUX(SDMMC2_DAT0, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP),
+ OMAP3_MUX(SDMMC2_DAT1, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP),
+ OMAP3_MUX(SDMMC2_DAT2, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP),
+ OMAP3_MUX(SDMMC2_DAT3, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLUP),
+#endif
<<attachment: winmail.dat>>
