mux335x: pin muxing additions for wlan and bluetooth
authorEyal Reizer <eyalr@ti.com>
Mon, 10 Oct 2011 09:42:47 +0000 (11:42 +0200)
committerVaibhav Hiremath <hvaibhav@ti.com>
Mon, 23 Jan 2012 19:14:30 +0000 (00:44 +0530)
* Pin muxing for wlan and blutooth enable pins
* Pin muxing for the wlan interrupt line
* Fix muxing mistake for gpmc_ben1 pin

Signed-off-by: Eyal Reizer <eyalr@ti.com>
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
arch/arm/mach-omap2/mux33xx.c

index 6679024ce247a6d489880684d63efbd11b1fc1f7..ef7fe87c960c8793a3e0e3204fdbbb2d848cefbc 100644 (file)
@@ -120,17 +120,17 @@ static struct omap_mux __initdata am33xx_muxmodes[] = {
                "gpmc_wpn", "mii2_rxerr", NULL, "rmii2_rxerr",
                "mmc2_sdcd", NULL, NULL, NULL),
        _AM33XX_MUXENTRY(GPMC_BEN1, 0,
-               "gpmc_ben1", "mii2_col", "mmc2_dat3", NULL,
+               "gpmc_ben1", "mii2_col", NULL, "mmc2_dat3",
                NULL, NULL, "mcasp0_aclkr", NULL),
        _AM33XX_MUXENTRY(GPMC_CSN0, 0,
                "gpmc_csn0", NULL, NULL, NULL,
                NULL, NULL, NULL, "mmc1_sdwp"),
        _AM33XX_MUXENTRY(GPMC_CSN1, 0,
                "gpmc_csn1", NULL, "mmc1_clk", NULL,
-               NULL, NULL, NULL, NULL),
+               NULL, NULL, NULL, "gpio1_30"),
        _AM33XX_MUXENTRY(GPMC_CSN2, 0,
                "gpmc_csn2", NULL, "mmc1_cmd", NULL,
-               NULL, NULL, NULL, NULL),
+               NULL, NULL, NULL, "gpio1_31"),
        _AM33XX_MUXENTRY(GPMC_CSN3, 0,
                "gpmc_csn3", NULL, NULL, "mmc2_cmd",
                NULL, NULL, NULL, NULL),
@@ -343,7 +343,7 @@ static struct omap_mux __initdata am33xx_muxmodes[] = {
                "mmc2_sdcd", NULL, NULL, NULL),
        _AM33XX_MUXENTRY(MCASP0_AHCLKR, 0,
                "mcasp0_ahclkr", NULL, "mcasp0_axr2", "spi1_cs0",
-               NULL, NULL, NULL, NULL),
+               NULL, NULL, NULL, "gpio3_17"),
        _AM33XX_MUXENTRY(MCASP0_ACLKR, 0,
                "mcasp0_aclkr", NULL, "mcasp0_axr2", "mcasp1_aclkx",
                "mmc0_sdwp", NULL, NULL, NULL),