| Message ID | 1312444283-25581-1-git-send-email-ido@wizery.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, Aug 4, 2011 at 3:51 PM, Ido Yariv <ido@wizery.com> wrote: > +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; Hi Ido, A quick question for my own understanding. What's the mechanism by which wl12xx is bound with above. I see above wl12xx_set_platform_data but I didn't see something like .name = "wl1271" or dev_name that comes in through platform_device_register. If I look at other board files, I see: 321 #ifdef CONFIG_WL12XX_PLATFORM_DATA 322 { 323 .name = "wl1271", 324 .mmc = 2, 325 .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_POWER_OFF_CARD, 326 .gpio_wp = -EINVAL, 327 .gpio_cd = -EINVAL, 328 .nonremovable = true, 329 }, 330 #endif and 729 #ifdef CONFIG_WL12XX_PLATFORM_DATA 730 /* WL12xx WLAN Init */ 731 if (wl12xx_set_platform_data(&omap3evm_wlan_data)) 732 pr_err("error setting wl12xx data\n"); 733 platform_device_register(&omap3evm_wlan_regulator); 734 #endif Thanks, jayakumar
Hi Jaya, On Thu, Aug 04, 2011 at 04:40:01PM +0800, Jaya Kumar wrote: > Hi Ido, > > A quick question for my own understanding. What's the mechanism by > which wl12xx is bound with above. I see above wl12xx_set_platform_data > but I didn't see something like .name = "wl1271" or dev_name that > comes in through platform_device_register. The wl12xx module calls wl12xx_get_platform_data, which simply returns the structure set by wl12xx_set_platform_data. This mechanism only supports a single platform data. > If I look at other board files, I see: > > 321 #ifdef CONFIG_WL12XX_PLATFORM_DATA > 322 { > 323 .name = "wl1271", > 324 .mmc = 2, > 325 .caps = MMC_CAP_4_BIT_DATA | > MMC_CAP_POWER_OFF_CARD, > 326 .gpio_wp = -EINVAL, > 327 .gpio_cd = -EINVAL, > 328 .nonremovable = true, > 329 }, > 330 #endif 'name' is just a descriptive name of omap2_hsmmc_info. davinci_mmc_config doesn't have such a member. > 729 #ifdef CONFIG_WL12XX_PLATFORM_DATA > 730 /* WL12xx WLAN Init */ > 731 if (wl12xx_set_platform_data(&omap3evm_wlan_data)) > 732 pr_err("error setting wl12xx data\n"); > 733 platform_device_register(&omap3evm_wlan_regulator); > 734 #endif Please note that the platform_device_register above is used for registering a regulator device, which is driven by the fixed regulator driver and not by wl12xx. This regulator is controlled by omap's mmc host driver. Hope this clarifies things, Ido.
On Thu, Aug 04, 2011 at 13:21:23, Ido Yariv wrote: > 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. > It is a 4-wire, 1.8V, embedded SDIO WLAN device with an external IRQ > line and is power-controlled by a GPIO-based fixed regulator. > > Add support for the WLAN capabilities of this expansion board. > > Signed-off-by: Ido Yariv <ido@wizery.com> Applied, thanks. Regards, Sekhar
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index c0deaca..32d837d 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 3d2c0d7..9d1a55e 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[] = { @@ -1117,6 +1122,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 +1280,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);
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. It is a 4-wire, 1.8V, embedded SDIO WLAN device with an external IRQ line and is power-controlled by a GPIO-based fixed regulator. Add support for the WLAN capabilities of this expansion board. Signed-off-by: Ido Yariv <ido@wizery.com> --- arch/arm/mach-davinci/Kconfig | 10 +++ arch/arm/mach-davinci/board-da850-evm.c | 114 +++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+), 0 deletions(-)