wlcore: remove wl12xx_platform_data

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-davinci / board-da850-evm.c

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 853b941b710e1e350743945cf72cd8868fa4460b..1ed545cc2b83452954cc4a2217ac1be324237775 100644 (file)
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -38,7 +38,6 @@
 #include <linux/regulator/fixed.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
-#include <linux/wl12xx.h>
 
 #include <mach/common.h>
 #include <mach/cp_intc.h>
@@ -60,9 +59,6 @@
 #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[] = {
@@ -1343,110 +1339,6 @@ static __init void da850_vpif_init(void)
 static __init void da850_vpif_init(void) {}
 #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,
-};
-
-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,
-       .irq_trigger            = IRQ_TYPE_EDGE_RISING,
-       .ref_clock_freq         = 38400000,
-       .ref_clock_xtal         = false,
-};
-
-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)
@@ -1503,11 +1395,6 @@ static __init void da850_evm_init(void)
                if (ret)
                        pr_warn("%s: MMCSD0 registration failed: %d\n",
                                __func__, ret);
-
-               ret = da850_wl12xx_init();
-               if (ret)
-                       pr_warn("%s: WL12xx initialization failed: %d\n",
-                               __func__, ret);
        }
 
        davinci_serial_init(da8xx_serial_device);