12 files changed, 156 insertions, 4 deletions

diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index c0deacae778d..32d837d8eab9 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -192,6 +192,16 @@ config DA850_UI_RMII
 
 endchoice
 
+config DA850_WL12XX
+        bool "AM18x wl1271 daughter board"
+        depends on MACH_DAVINCI_DA850_EVM
+        help
+          The wl1271 daughter card for AM18x EVMs is a combo wireless
+          connectivity add-on card, based on the LS Research TiWi module with
+          Texas Instruments' wl1271 solution.
+          Say Y if you want to use a wl1271 expansion card connected to the
+          AM18x EVM.
+
 config GPIO_PCA953X
         default MACH_DAVINCI_DA850_EVM
 
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 6e41cb5baeb4..ec21663f8ddc 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -31,6 +31,8 @@
 #include <linux/input/tps6507x-ts.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
+#include <linux/delay.h>
+#include <linux/wl12xx.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -49,6 +51,9 @@
 #define DA850_MMCSD_CD_PIN              GPIO_TO_PIN(4, 0)
 #define DA850_MMCSD_WP_PIN              GPIO_TO_PIN(4, 1)
 
+#define DA850_WLAN_EN                   GPIO_TO_PIN(6, 9)
+#define DA850_WLAN_IRQ                  GPIO_TO_PIN(6, 10)
+
 #define DA850_MII_MDIO_CLKEN_PIN        GPIO_TO_PIN(2, 6)
 
 static struct mtd_partition da850evm_spiflash_part[] = {
@@ -1143,6 +1148,110 @@ static __init int da850_evm_init_cpufreq(void)
 static __init int da850_evm_init_cpufreq(void) { return 0; }
 #endif
 
+#ifdef CONFIG_DA850_WL12XX
+
+static void wl12xx_set_power(int index, bool power_on)
+{
+        static bool power_state;
+
+        pr_debug("Powering %s wl12xx", power_on ? "on" : "off");
+
+        if (power_on == power_state)
+                return;
+        power_state = power_on;
+
+        if (power_on) {
+                /* Power up sequence required for wl127x devices */
+                gpio_set_value(DA850_WLAN_EN, 1);
+                usleep_range(15000, 15000);
+                gpio_set_value(DA850_WLAN_EN, 0);
+                usleep_range(1000, 1000);
+                gpio_set_value(DA850_WLAN_EN, 1);
+                msleep(70);
+        } else {
+                gpio_set_value(DA850_WLAN_EN, 0);
+        }
+}
+
+static struct davinci_mmc_config da850_wl12xx_mmc_config = {
+        .set_power      = wl12xx_set_power,
+        .wires          = 4,
+        .max_freq       = 25000000,
+        .caps           = MMC_CAP_4_BIT_DATA | MMC_CAP_NONREMOVABLE |
+                          MMC_CAP_POWER_OFF_CARD,
+        .version        = MMC_CTLR_VERSION_2,
+};
+
+static const short da850_wl12xx_pins[] __initconst = {
+        DA850_MMCSD1_DAT_0, DA850_MMCSD1_DAT_1, DA850_MMCSD1_DAT_2,
+        DA850_MMCSD1_DAT_3, DA850_MMCSD1_CLK, DA850_MMCSD1_CMD,
+        DA850_GPIO6_9, DA850_GPIO6_10,
+        -1
+};
+
+static struct wl12xx_platform_data da850_wl12xx_wlan_data __initdata = {
+        .irq                    = -1,
+        .board_ref_clock        = WL12XX_REFCLOCK_38,
+        .platform_quirks        = WL12XX_PLATFORM_QUIRK_EDGE_IRQ,
+};
+
+static __init int da850_wl12xx_init(void)
+{
+        int ret;
+
+        ret = davinci_cfg_reg_list(da850_wl12xx_pins);
+        if (ret) {
+                pr_err("wl12xx/mmc mux setup failed: %d\n", ret);
+                goto exit;
+        }
+
+        ret = da850_register_mmcsd1(&da850_wl12xx_mmc_config);
+        if (ret) {
+                pr_err("wl12xx/mmc registration failed: %d\n", ret);
+                goto exit;
+        }
+
+        ret = gpio_request_one(DA850_WLAN_EN, GPIOF_OUT_INIT_LOW, "wl12xx_en");
+        if (ret) {
+                pr_err("Could not request wl12xx enable gpio: %d\n", ret);
+                goto exit;
+        }
+
+        ret = gpio_request_one(DA850_WLAN_IRQ, GPIOF_IN, "wl12xx_irq");
+        if (ret) {
+                pr_err("Could not request wl12xx irq gpio: %d\n", ret);
+                goto free_wlan_en;
+        }
+
+        da850_wl12xx_wlan_data.irq = gpio_to_irq(DA850_WLAN_IRQ);
+
+        ret = wl12xx_set_platform_data(&da850_wl12xx_wlan_data);
+        if (ret) {
+                pr_err("Could not set wl12xx data: %d\n", ret);
+                goto free_wlan_irq;
+        }
+
+        return 0;
+
+free_wlan_irq:
+        gpio_free(DA850_WLAN_IRQ);
+
+free_wlan_en:
+        gpio_free(DA850_WLAN_EN);
+
+exit:
+        return ret;
+}
+
+#else /* CONFIG_DA850_WL12XX */
+
+static __init int da850_wl12xx_init(void)
+{
+        return 0;
+}
+
+#endif /* CONFIG_DA850_WL12XX */
+
 #define DA850EVM_SATA_REFCLKPN_RATE     (100 * 1000 * 1000)
 
 static __init void da850_evm_init(void)
@@ -1197,6 +1306,11 @@ static __init void da850_evm_init(void)
                 if (ret)
                         pr_warning("da850_evm_init: mmcsd0 registration failed:"
                                         " %d\n", ret);
+
+                ret = da850_wl12xx_init();
+                if (ret)
+                        pr_warning("da850_evm_init: wl12xx initialization"
+                                   " failed: %d\n", ret);
         }
 
         davinci_serial_init(&da850_evm_uart_config);
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 4aae01576aab..b047f8702278 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -536,6 +536,13 @@ static const struct mux_config da850_pins[] = {
         MUX_CFG(DA850, MMCSD0_DAT_3,    10,     20,     15,     2,      false)
         MUX_CFG(DA850, MMCSD0_CLK,      10,     0,      15,     2,      false)
         MUX_CFG(DA850, MMCSD0_CMD,      10,     4,      15,     2,      false)
+        /* MMC/SD1 function */
+        MUX_CFG(DA850, MMCSD1_DAT_0,    18,     8,      15,     2,      false)
+        MUX_CFG(DA850, MMCSD1_DAT_1,    19,     16,     15,     2,      false)
+        MUX_CFG(DA850, MMCSD1_DAT_2,    19,     12,     15,     2,      false)
+        MUX_CFG(DA850, MMCSD1_DAT_3,    19,     8,      15,     2,      false)
+        MUX_CFG(DA850, MMCSD1_CLK,      18,     12,     15,     2,      false)
+        MUX_CFG(DA850, MMCSD1_CMD,      18,     16,     15,     2,      false)
         /* EMIF2.5/EMIFA function */
         MUX_CFG(DA850, EMA_D_7,         9,      0,      15,     1,      false)
         MUX_CFG(DA850, EMA_D_6,         9,      4,      15,     1,      false)
@@ -594,6 +601,8 @@ static const struct mux_config da850_pins[] = {
         MUX_CFG(DA850, GPIO3_13,        7,      8,      15,     8,      false)
         MUX_CFG(DA850, GPIO4_0,         10,     28,     15,     8,      false)
         MUX_CFG(DA850, GPIO4_1,         10,     24,     15,     8,      false)
+        MUX_CFG(DA850, GPIO6_9,         13,     24,     15,     8,      false)
+        MUX_CFG(DA850, GPIO6_10,        13,     20,     15,     8,      false)
         MUX_CFG(DA850, GPIO6_13,        13,     8,      15,     8,      false)
         MUX_CFG(DA850, RTC_ALARM,       0,      28,     15,     2,      false)
 #endif
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 2f7e719636f1..68def7188868 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -136,6 +136,7 @@ static struct edma_soc_info da830_edma_cc0_info = {
         .n_cc                   = 1,
         .queue_tc_mapping       = da8xx_queue_tc_mapping,
         .queue_priority_mapping = da8xx_queue_priority_mapping,
+        .default_queue          = EVENTQ_1,
 };
 
 static struct edma_soc_info *da830_edma_info[EDMA_MAX_CC] = {
@@ -151,6 +152,7 @@ static struct edma_soc_info da850_edma_cc_info[] = {
                 .n_cc                   = 1,
                 .queue_tc_mapping       = da8xx_queue_tc_mapping,
                 .queue_priority_mapping = da8xx_queue_priority_mapping,
+                .default_queue          = EVENTQ_1,
         },
         {
                 .n_channel              = 32,
@@ -160,6 +162,7 @@ static struct edma_soc_info da850_edma_cc_info[] = {
                 .n_cc                   = 1,
                 .queue_tc_mapping       = da850_queue_tc_mapping,
                 .queue_priority_mapping = da850_queue_priority_mapping,
+                .default_queue          = EVENTQ_0,
         },
 };
 
diff --git a/arch/arm/mach-davinci/devices-tnetv107x.c b/arch/arm/mach-davinci/devices-tnetv107x.c
index 6162cae7f868..29b17f7d3a5f 100644
--- a/arch/arm/mach-davinci/devices-tnetv107x.c
+++ b/arch/arm/mach-davinci/devices-tnetv107x.c
@@ -80,6 +80,7 @@ static struct edma_soc_info edma_cc0_info = {
         .n_cc                   = 1,
         .queue_tc_mapping       = edma_tc_mapping,
         .queue_priority_mapping = edma_priority_mapping,
+        .default_queue          = EVENTQ_1,
 };
 
 static struct edma_soc_info *tnetv107x_edma_info[EDMA_MAX_CC] = {
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index c143f43addcc..fe520d4167a2 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -591,6 +591,7 @@ static struct edma_soc_info edma_cc0_info = {
         .n_cc                   = 1,
         .queue_tc_mapping       = queue_tc_mapping,
         .queue_priority_mapping = queue_priority_mapping,
+        .default_queue          = EVENTQ_1,
 };
 
 static struct edma_soc_info *dm355_edma_info[EDMA_MAX_CC] = {
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 9a274665edc5..3470983aa343 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -514,6 +514,7 @@ static struct edma_soc_info edma_cc0_info = {
         .n_cc                   = 1,
         .queue_tc_mapping       = queue_tc_mapping,
         .queue_priority_mapping = queue_priority_mapping,
+        .default_queue          = EVENTQ_1,
 };
 
 static struct edma_soc_info *dm644x_edma_info[EDMA_MAX_CC] = {
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 03e5f4931b42..0b68ed534f8e 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -555,6 +555,7 @@ static struct edma_soc_info edma_cc0_info = {
         .n_cc                   = 1,
         .queue_tc_mapping       = dm646x_queue_tc_mapping,
         .queue_priority_mapping = dm646x_queue_priority_mapping,
+        .default_queue          = EVENTQ_1,
 };
 
 static struct edma_soc_info *dm646x_edma_info[EDMA_MAX_CC] = {
diff --git a/arch/arm/mach-davinci/dma.c b/arch/arm/mach-davinci/dma.c
index 6b9669869c46..da90103a313d 100644
--- a/arch/arm/mach-davinci/dma.c
+++ b/arch/arm/mach-davinci/dma.c
@@ -1435,12 +1435,11 @@ static int __init edma_probe(struct platform_device *pdev)
                         goto fail1;
                 }
 
-                edma_cc[j] = kmalloc(sizeof(struct edma), GFP_KERNEL);
+                edma_cc[j] = kzalloc(sizeof(struct edma), GFP_KERNEL);
                 if (!edma_cc[j]) {
                         status = -ENOMEM;
                         goto fail1;
                 }
-                memset(edma_cc[j], 0, sizeof(struct edma));
 
                 edma_cc[j]->num_channels = min_t(unsigned, info[j]->n_channel,
                                                         EDMA_MAX_DMACH);
@@ -1450,8 +1449,6 @@ static int __init edma_probe(struct platform_device *pdev)
                                                         EDMA_MAX_CC);
 
                 edma_cc[j]->default_queue = info[j]->default_queue;
-                if (!edma_cc[j]->default_queue)
-                        edma_cc[j]->default_queue = EVENTQ_1;
 
                 dev_dbg(&pdev->dev, "DMA REG BASE ADDR=%p\n",
                         edmacc_regs_base[j]);
diff --git a/arch/arm/mach-davinci/include/mach/gpio.h b/arch/arm/mach-davinci/include/mach/gpio.h
index fbaae4772b91..960e9de47e1e 100644
--- a/arch/arm/mach-davinci/include/mach/gpio.h
+++ b/arch/arm/mach-davinci/include/mach/gpio.h
@@ -15,6 +15,8 @@
 
 #include <asm-generic/gpio.h>
 
+#define __ARM_GPIOLIB_COMPLEX
+
 /* The inline versions use the static inlines in the driver header */
 #include "gpio-davinci.h"
 
diff --git a/arch/arm/mach-davinci/include/mach/mmc.h b/arch/arm/mach-davinci/include/mach/mmc.h
index d4f1e9675069..5ba6b22ce338 100644
--- a/arch/arm/mach-davinci/include/mach/mmc.h
+++ b/arch/arm/mach-davinci/include/mach/mmc.h
@@ -12,6 +12,9 @@ struct davinci_mmc_config {
         /* get_cd()/get_wp() may sleep */
         int     (*get_cd)(int module);
         int     (*get_ro)(int module);
+
+        void    (*set_power)(int module, bool on);
+
         /* wires == 0 is equivalent to wires == 4 (4-bit parallel) */
         u8      wires;
 
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index 5d4e0fed828a..a7e92fca32e6 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -857,6 +857,14 @@ enum davinci_da850_index {
         DA850_MMCSD0_CLK,
         DA850_MMCSD0_CMD,
 
+        /* MMC/SD1 function */
+        DA850_MMCSD1_DAT_0,
+        DA850_MMCSD1_DAT_1,
+        DA850_MMCSD1_DAT_2,
+        DA850_MMCSD1_DAT_3,
+        DA850_MMCSD1_CLK,
+        DA850_MMCSD1_CMD,
+
         /* EMIF2.5/EMIFA function */
         DA850_EMA_D_7,
         DA850_EMA_D_6,
@@ -916,6 +924,8 @@ enum davinci_da850_index {
         DA850_GPIO3_13,
         DA850_GPIO4_0,
         DA850_GPIO4_1,
+        DA850_GPIO6_9,
+        DA850_GPIO6_10,
         DA850_GPIO6_13,
         DA850_RTC_ALARM,
 };