On Sun, Jul 10, 2011 at 18:44:39, 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.
>
> This patch adds support for the WLAN capabilities of this expansion
> board.
>
> Signed-off-by: Ido Yariv <ido@xxxxxxxxxx>
> ---
> diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
> index a7b41bf..2dae1a1 100644
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -31,6 +31,8 @@
> +#ifdef CONFIG_DA850_WL12XX
> +
> +static int da850_wl12xx_fref = WL12XX_REFCLOCK_38;
> +
> +static int __init setup_da850_wl12xx_fref(char *fref)
> +{
> + if (!strcmp(fref, "19.2"))
> + da850_wl12xx_fref = WL12XX_REFCLOCK_19;
> + else if (!strcmp(fref, "26"))
> + da850_wl12xx_fref = WL12XX_REFCLOCK_26;
> + else if (!strcmp(fref, "38.4"))
> + da850_wl12xx_fref = WL12XX_REFCLOCK_38;
> + else if (!strcmp(fref, "52"))
> + da850_wl12xx_fref = WL12XX_REFCLOCK_52;
> + else if (!strcmp(fref, "XTAL26"))
> + da850_wl12xx_fref = WL12XX_REFCLOCK_26_XTAL;
> + else if (!strcmp(fref, "XTAL38.4"))
> + da850_wl12xx_fref = WL12XX_REFCLOCK_38_XTAL;
> + else
> + pr_info("da850_wl12xx_fref is invalid. Valid options: "
> + "19.2, 26, 38.4, 52, XTAL26 or XTAL38.4\n");
> + return 0;
> +}
> +__setup("da850_wl12xx_fref=", setup_da850_wl12xx_fref);
Adding a new kernel parameter requires update to
Documentation/kernel-parameters.txt as well.
I am Ccing a couple of folks in case they have ideas on
whether there is a better way to pass this information
to the kernel. I assume there is no way to detect
this from hardware.
> +static struct davinci_mmc_config da850_mmc_wl12xx_config = {
> + .get_ro = NULL,
> + .get_cd = NULL,
You can get rid of these NULL initializers.
> + .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 void da850_wl12xx_init(void)
> +{
> + int ret;
> +
> + ret = davinci_cfg_reg_list(da850_evm_mmc_wl12xx_pins);
> + if (ret) {
> + pr_warning("da850_evm_init: wl12xx/mmc mux setup failed:"
> + " %d\n", ret);
> + return;
> + }
> +
> + ret = da850_register_mmcsd1(&da850_mmc_wl12xx_config);
> + if (ret) {
> + pr_warning("da850_evm_init: wl12xx/mmc registration failed:"
> + " %d\n", ret);
> + return;
> + }
> +
> + ret = gpio_request_one(DA850_WLAN_EN, GPIOF_OUT_INIT_LOW, "wl12xx_en");
> + if (ret) {
> + pr_err("Error initializing the wl12xx enable gpio: %d\n", ret);
> + return;
> + }
> +
> + ret = gpio_request_one(DA850_WLAN_IRQ, GPIOF_IN, "wl12xx_irq");
> + if (ret) {
> + pr_err("Error initializing the wl12xx irq gpio: %d\n", ret);
> + gpio_free(DA850_WLAN_EN);
> + return;
> + }
> +
> + da850_wl12xx_wlan_data.irq = gpio_to_irq(DA850_WLAN_IRQ);
> + da850_wl12xx_wlan_data.board_ref_clock = da850_wl12xx_fref;
> +
> + ret = wl12xx_set_platform_data(&da850_wl12xx_wlan_data);
> + if (ret) {
> + pr_err("Error setting wl12xx data: %d\n", ret);
> + gpio_free(DA850_WLAN_IRQ);
> + gpio_free(DA850_WLAN_EN);
Why not just use the traditional goto based bail out
mechanism? You will avoid the multiple gpio_free() calls.
Thanks,
Sekhar
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
