| Message ID | 1310725464-2524-3-git-send-email-marvin24@gmx.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Friday 15 July 2011 13:24:22 Marc Dietrich wrote: > This makes the WIFI rfkill gpio available to userspace. On boot, > WIFI will be unblocked by default. Take a look on rfkill-gpio driver. Regards Vasily > Signed-off-by: Marc Dietrich <marvin24@gmx.de> > --- > arch/arm/mach-tegra/board-paz00-pinmux.c | 1 + > arch/arm/mach-tegra/board-paz00.c | 16 ++++++++++++++++ > arch/arm/mach-tegra/board-paz00.h | 6 ++++++ > 3 files changed, 23 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-tegra/board-paz00-pinmux.c > b/arch/arm/mach-tegra/board-paz00-pinmux.c index bdd2627..c02a48f 100644 > --- a/arch/arm/mach-tegra/board-paz00-pinmux.c > +++ b/arch/arm/mach-tegra/board-paz00-pinmux.c > @@ -145,6 +145,7 @@ static struct tegra_gpio_table gpio_table[] = { > { .gpio = TEGRA_GPIO_SD1_WP, .enable = true }, > { .gpio = TEGRA_GPIO_SD1_POWER, .enable = true }, > { .gpio = TEGRA_ULPI_RST, .enable = true }, > + { .gpio = TEGRA_WIFI_PWRN, .enable = true }, > }; > > void paz00_pinmux_init(void) > diff --git a/arch/arm/mach-tegra/board-paz00.c > b/arch/arm/mach-tegra/board-paz00.c index 931b06e..0bc652b 100644 > --- a/arch/arm/mach-tegra/board-paz00.c > +++ b/arch/arm/mach-tegra/board-paz00.c > @@ -25,6 +25,7 @@ > #include <linux/dma-mapping.h> > #include <linux/pda_power.h> > #include <linux/io.h> > +#include <linux/gpio.h> > #include <linux/i2c.h> > #include <linux/i2c-tegra.h> > #include <linux/platform_data/tegra_usb.h> > @@ -165,6 +166,20 @@ static struct tegra_sdhci_platform_data sdhci_pdata4 = > { .is_8bit = 1, > }; > > +static void __init paz00_wifi_init(void) > +{ > + int ret; > + > + /* unlock hw rfkill */ > + ret = gpio_request_one(TEGRA_WIFI_PWRN, GPIOF_OUT_INIT_HIGH, > + "wifi pwrn"); > + if (ret) { > + pr_warning("WIFI: could not requestrfkill gpio\n"); > + return; > + } > + gpio_export(TEGRA_WIFI_PWRN, 0); > +}; > + > static void __init tegra_paz00_init(void) > { > tegra_clk_init_from_table(paz00_clk_init_table); > @@ -178,6 +193,7 @@ static void __init tegra_paz00_init(void) > > paz00_i2c_init(); > paz00_usb_init(); > + paz00_wifi_init(); > } > > MACHINE_START(PAZ00, "Toshiba AC100 / Dynabook AZ") > diff --git a/arch/arm/mach-tegra/board-paz00.h > b/arch/arm/mach-tegra/board-paz00.h index d4ff39d..5d2849e 100644 > --- a/arch/arm/mach-tegra/board-paz00.h > +++ b/arch/arm/mach-tegra/board-paz00.h > @@ -17,11 +17,17 @@ > #ifndef _MACH_TEGRA_BOARD_PAZ00_H > #define _MACH_TEGRA_BOARD_PAZ00_H > > +/* SDCARD */ > #define TEGRA_GPIO_SD1_CD TEGRA_GPIO_PV5 > #define TEGRA_GPIO_SD1_WP TEGRA_GPIO_PH1 > #define TEGRA_GPIO_SD1_POWER TEGRA_GPIO_PT3 > + > +/* ULPI */ > #define TEGRA_ULPI_RST TEGRA_GPIO_PV0 > > +/* WIFI */ > +#define TEGRA_WIFI_PWRN TEGRA_GPIO_PK5 > + > void paz00_pinmux_init(void); > > #endif
Marc Dietrich wrote at Friday, July 15, 2011 4:24 AM: > This makes the WIFI rfkill gpio available to userspace. On boot, > WIFI will be unblocked by default. ... > +static void __init paz00_wifi_init(void) > +{ > + int ret; > + > + /* unlock hw rfkill */ > + ret = gpio_request_one(TEGRA_WIFI_PWRN, GPIOF_OUT_INIT_HIGH, > + "wifi pwrn"); > + if (ret) { > + pr_warning("WIFI: could not requestrfkill gpio\n"); > + return; > + } > + gpio_export(TEGRA_WIFI_PWRN, 0); > +}; Wouldn't you want to skip the gpio_export() call if the gpio_request() call failed? Of course, this is moot since Vasily mentioned the gpio-rfkill driver. Luckily, that driver is already in Tegra's for-next, so it should be pretty easy to adapt to.
Hello. Stephen Warren wrote: >> This makes the WIFI rfkill gpio available to userspace. On boot, >> WIFI will be unblocked by default. > ... >> +static void __init paz00_wifi_init(void) >> +{ >> + int ret; >> + >> + /* unlock hw rfkill */ >> + ret = gpio_request_one(TEGRA_WIFI_PWRN, GPIOF_OUT_INIT_HIGH, >> + "wifi pwrn"); >> + if (ret) { >> + pr_warning("WIFI: could not requestrfkill gpio\n"); >> + return; >> + } >> + gpio_export(TEGRA_WIFI_PWRN, 0); >> +}; > > Wouldn't you want to skip the gpio_export() call if the gpio_request() > call failed? I think that's what he does -- there's a *return* statement. WBR, Sergei
Sergei Shtylyov wrote at Friday, July 15, 2011 11:25 AM: > Stephen Warren wrote: > > >> This makes the WIFI rfkill gpio available to userspace. On boot, > >> WIFI will be unblocked by default. > > ... > >> +static void __init paz00_wifi_init(void) > >> +{ > >> + int ret; > >> + > >> + /* unlock hw rfkill */ > >> + ret = gpio_request_one(TEGRA_WIFI_PWRN, GPIOF_OUT_INIT_HIGH, > >> + "wifi pwrn"); > >> + if (ret) { > >> + pr_warning("WIFI: could not requestrfkill gpio\n"); > >> + return; > >> + } > >> + gpio_export(TEGRA_WIFI_PWRN, 0); > >> +}; > > > > Wouldn't you want to skip the gpio_export() call if the gpio_request() > > call failed? > > I think that's what he does -- there's a *return* statement. D'oh. There is indeed. For some reason I only noticed the warning call. I guess I suck at reviews:-(
diff --git a/arch/arm/mach-tegra/board-paz00-pinmux.c b/arch/arm/mach-tegra/board-paz00-pinmux.c index bdd2627..c02a48f 100644 --- a/arch/arm/mach-tegra/board-paz00-pinmux.c +++ b/arch/arm/mach-tegra/board-paz00-pinmux.c @@ -145,6 +145,7 @@ static struct tegra_gpio_table gpio_table[] = { { .gpio = TEGRA_GPIO_SD1_WP, .enable = true }, { .gpio = TEGRA_GPIO_SD1_POWER, .enable = true }, { .gpio = TEGRA_ULPI_RST, .enable = true }, + { .gpio = TEGRA_WIFI_PWRN, .enable = true }, }; void paz00_pinmux_init(void) diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c index 931b06e..0bc652b 100644 --- a/arch/arm/mach-tegra/board-paz00.c +++ b/arch/arm/mach-tegra/board-paz00.c @@ -25,6 +25,7 @@ #include <linux/dma-mapping.h> #include <linux/pda_power.h> #include <linux/io.h> +#include <linux/gpio.h> #include <linux/i2c.h> #include <linux/i2c-tegra.h> #include <linux/platform_data/tegra_usb.h> @@ -165,6 +166,20 @@ static struct tegra_sdhci_platform_data sdhci_pdata4 = { .is_8bit = 1, }; +static void __init paz00_wifi_init(void) +{ + int ret; + + /* unlock hw rfkill */ + ret = gpio_request_one(TEGRA_WIFI_PWRN, GPIOF_OUT_INIT_HIGH, + "wifi pwrn"); + if (ret) { + pr_warning("WIFI: could not requestrfkill gpio\n"); + return; + } + gpio_export(TEGRA_WIFI_PWRN, 0); +}; + static void __init tegra_paz00_init(void) { tegra_clk_init_from_table(paz00_clk_init_table); @@ -178,6 +193,7 @@ static void __init tegra_paz00_init(void) paz00_i2c_init(); paz00_usb_init(); + paz00_wifi_init(); } MACHINE_START(PAZ00, "Toshiba AC100 / Dynabook AZ") diff --git a/arch/arm/mach-tegra/board-paz00.h b/arch/arm/mach-tegra/board-paz00.h index d4ff39d..5d2849e 100644 --- a/arch/arm/mach-tegra/board-paz00.h +++ b/arch/arm/mach-tegra/board-paz00.h @@ -17,11 +17,17 @@ #ifndef _MACH_TEGRA_BOARD_PAZ00_H #define _MACH_TEGRA_BOARD_PAZ00_H +/* SDCARD */ #define TEGRA_GPIO_SD1_CD TEGRA_GPIO_PV5 #define TEGRA_GPIO_SD1_WP TEGRA_GPIO_PH1 #define TEGRA_GPIO_SD1_POWER TEGRA_GPIO_PT3 + +/* ULPI */ #define TEGRA_ULPI_RST TEGRA_GPIO_PV0 +/* WIFI */ +#define TEGRA_WIFI_PWRN TEGRA_GPIO_PK5 + void paz00_pinmux_init(void); #endif
This makes the WIFI rfkill gpio available to userspace. On boot, WIFI will be unblocked by default. Signed-off-by: Marc Dietrich <marvin24@gmx.de> --- arch/arm/mach-tegra/board-paz00-pinmux.c | 1 + arch/arm/mach-tegra/board-paz00.c | 16 ++++++++++++++++ arch/arm/mach-tegra/board-paz00.h | 6 ++++++ 3 files changed, 23 insertions(+), 0 deletions(-)