7 files changed, 180 insertions, 2 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 bd5394537c88..cb7a1f0b299f 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[] = {
@@ -115,6 +120,32 @@ static struct spi_board_info da850evm_spi_info[] = {
         },
 };
 
+#ifdef CONFIG_MTD
+static void da850_evm_m25p80_notify_add(struct mtd_info *mtd)
+{
+        char *mac_addr = davinci_soc_info.emac_pdata->mac_addr;
+        size_t retlen;
+
+        if (!strcmp(mtd->name, "MAC-Address")) {
+                mtd->read(mtd, 0, ETH_ALEN, &retlen, mac_addr);
+                if (retlen == ETH_ALEN)
+                        pr_info("Read MAC addr from SPI Flash: %pM\n",
+                                mac_addr);
+        }
+}
+
+static struct mtd_notifier da850evm_spi_notifier = {
+        .add    = da850_evm_m25p80_notify_add,
+};
+
+static void da850_evm_setup_mac_addr(void)
+{
+        register_mtd_user(&da850evm_spi_notifier);
+}
+#else
+static void da850_evm_setup_mac_addr(void) { }
+#endif
+
 static struct mtd_partition da850_evm_norflash_partition[] = {
         {
                 .name           = "bootloaders + env",
@@ -1117,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)
@@ -1171,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);
@@ -1244,6 +1384,8 @@ static __init void da850_evm_init(void)
         if (ret)
                 pr_warning("da850_evm_init: sata registration failed: %d\n",
                                 ret);
+
+        da850_evm_setup_mac_addr();
 }
 
 #ifdef CONFIG_SERIAL_8250_CONSOLE
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/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,
 };
diff --git a/arch/arm/mach-davinci/include/mach/psc.h b/arch/arm/mach-davinci/include/mach/psc.h
index 47fd0bc3d3e7..fa59c097223d 100644
--- a/arch/arm/mach-davinci/include/mach/psc.h
+++ b/arch/arm/mach-davinci/include/mach/psc.h
@@ -243,7 +243,7 @@
 #define PSC_STATE_DISABLE       2
 #define PSC_STATE_ENABLE        3
 
-#define MDSTAT_STATE_MASK       0x1f
+#define MDSTAT_STATE_MASK       0x3f
 #define MDCTL_FORCE             BIT(31)
 
 #ifndef __ASSEMBLER__
diff --git a/arch/arm/mach-davinci/sleep.S b/arch/arm/mach-davinci/sleep.S
index fb5e72b532b0..5f1e045a3ad1 100644
--- a/arch/arm/mach-davinci/sleep.S
+++ b/arch/arm/mach-davinci/sleep.S
@@ -217,7 +217,11 @@ ddr2clk_stop_done:
 ENDPROC(davinci_ddr_psc_config)
 
 CACHE_FLUSH:
-        .word   arm926_flush_kern_cache_all
+#ifdef CONFIG_CPU_V6
+        .word   v6_flush_kern_cache_all
+#else
+        .word   arm926_flush_kern_cache_all
+#endif
 
 ENTRY(davinci_cpu_suspend_sz)
         .word   . - davinci_cpu_suspend