* Pais, Allen <allen.pais@xxxxxx> [091015 02:33]: > Please ignore my previous mail. > > Muxes for OMAP 3630. Let's put this on hold and do it with the upcoming mux framework instead. Adding all the missing 3630 mux settings should be easy then. Regards, Tony > > Signed-off-by: Allen Pais <allen.pais@xxxxxx> diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index b5fac32..93abb74 100644 > --- a/arch/arm/mach-omap2/mux.c > +++ b/arch/arm/mach-omap2/mux.c > @@ -551,6 +551,42 @@ MUX_CFG_34XX("AF13_3430_MMC3_DAT3", 0x5e2, MUX_CFG_34XX("AF26_34XX_SYS_NIRQ", 0x1E0, > OMAP3_WAKEUP_EN | OMAP34XX_PIN_INPUT_PULLUP | > OMAP34XX_MUX_MODE0) > + > +/*Muxes for 3630 */ > +MUX_CFG_34XX("H26_3630_DSS_DATA18", 0x100, > + OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN) > +MUX_CFG_34XX("H25_3630_DSS_DATA19", 0x102, > + OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN) > +MUX_CFG_34XX("E28_3630_DSS_DATA20", 0x104, > + OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN) > +MUX_CFG_34XX("J26_3630_DSS_DATA21", 0x106, > + OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN) > +MUX_CFG_34XX("AC27_3630_DSS_DATA22", 0x108, > + OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN) > +MUX_CFG_34XX("AC28_3630_DSS_DATA23", 0x10A, > + OMAP34XX_MUX_MODE3 | OMAP34XX_PIN_INPUT_PULLDOWN) > + > +MUX_CFG_34XX("AF9_3630_ETKD8", 0x5EC, > + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_INPUT_PULLDOWN) > +MUX_CFG_34XX("AG9_3630_ETKD9", 0x5EE, > + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_INPUT_PULLDOWN) > +MUX_CFG_34XX("AG7_3630_ETKD12", 0x5F0, > + OMAP34XX_MUX_MODE1 | OMAP34XX_PIN_INPUT_PULLDOWN) > + > +MUX_CFG_34XX("AA25_3630_UART2_TX", 0x178, > + OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN) > +MUX_CFG_34XX("AD25_3630_UART2_RX", 0x17A, > + OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN) > +MUX_CFG_34XX("AB25_3630_UART2_RTS", 0x176, > + OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN) > +MUX_CFG_34XX("AB26_3630_UART2_CTS", 0x174, > + OMAP34XX_MUX_MODE5 | OMAP34XX_PIN_INPUT_PULLDOWN) > + > +MUX_CFG_34XX("H20_UART3_RX_IRRX", 0x19E, > + OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN) > +MUX_CFG_34XX("H21_UART3_TX_IRTX", 0x1A0, > + OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLDOWN) > + > }; > > #define OMAP34XX_PINS_SZ ARRAY_SIZE(omap34xx_pins) > diff --git a/arch/arm/plat-omap/include/mach/mux.h b/arch/arm/plat-omap/include/mach/mux.h > index 0f49d2d..8d8cbe1 100644 > --- a/arch/arm/plat-omap/include/mach/mux.h > +++ b/arch/arm/plat-omap/include/mach/mux.h > @@ -890,6 +890,32 @@ enum omap34xx_index { > > /* SYS_NIRQ T2 INT1 */ > AF26_34XX_SYS_NIRQ, > + > + /*Muxes for 3630*/ > + K28_3630_CAM_D6, > + L28_3630_CAM_D7, > + K27_3630_CAM_D8, > + L27_3630_CAM_D9, > + > + H26_3630_DSS_DATA18, > + H25_3630_DSS_DATA19, > + E28_3630_DSS_DATA20, > + J26_3630_DSS_DATA21, > + AC27_3630_DSS_DATA22, > + AC28_3630_DSS_DATA23, > + > + AF9_3630_ETKD8, > + AG9_3630_ETKD9, > + AG7_3630_ETK12, > + > + AA25_3630_UART2_TX, > + AD25_3630_UART2_RX, > + AB25_3630_UART2_RTS, > + AB26_3630_UART2_CTS, > + > + H20_UART3_RX_IRRX, > + H21_UART3_TX_IRTX, > + > }; > > struct omap_mux_cfg { -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html