From: anarsoul@gmail.com (Vasily Khoruzhick)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/8] ARM: PXA: Z2: Fix libertas init/tear down sequences
Date: Fri, 11 Mar 2011 12:23:41 +0200 [thread overview]
Message-ID: <1299839023-16601-6-git-send-email-anarsoul@gmail.com> (raw)
In-Reply-To: <1299839023-16601-1-git-send-email-anarsoul@gmail.com>
GPIO15 seems to be not related to WiFi, so don't touch it.
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
arch/arm/mach-pxa/include/mach/z2.h | 3 +--
arch/arm/mach-pxa/z2.c | 31 ++++++++-----------------------
2 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/arch/arm/mach-pxa/include/mach/z2.h b/arch/arm/mach-pxa/include/mach/z2.h
index 8835c16..7b0f71e 100644
--- a/arch/arm/mach-pxa/include/mach/z2.h
+++ b/arch/arm/mach-pxa/include/mach/z2.h
@@ -25,8 +25,7 @@
#define GPIO98_ZIPITZ2_LID_BUTTON 98
/* Libertas GSPI8686 WiFi */
-#define GPIO14_ZIPITZ2_WIFI_RESET 14
-#define GPIO15_ZIPITZ2_WIFI_POWER 15
+#define GPIO14_ZIPITZ2_WIFI_POWER 14
#define GPIO24_ZIPITZ2_WIFI_CS 24
#define GPIO36_ZIPITZ2_WIFI_IRQ 36
diff --git a/arch/arm/mach-pxa/z2.c b/arch/arm/mach-pxa/z2.c
index f1bb98a..d1e40ba 100644
--- a/arch/arm/mach-pxa/z2.c
+++ b/arch/arm/mach-pxa/z2.c
@@ -141,8 +141,7 @@ static unsigned long z2_pin_config[] = {
GPIO1_GPIO, /* Power button */
GPIO37_GPIO, /* Headphone detect */
GPIO98_GPIO, /* Lid switch */
- GPIO14_GPIO, /* WiFi Reset */
- GPIO15_GPIO, /* WiFi Power */
+ GPIO14_GPIO, /* WiFi Power */
GPIO24_GPIO, /* WiFi CS */
GPIO36_GPIO, /* WiFi IRQ */
GPIO88_GPIO, /* LCD CS */
@@ -504,26 +503,16 @@ static int z2_lbs_spi_setup(struct spi_device *spi)
{
int ret = 0;
- ret = gpio_request(GPIO15_ZIPITZ2_WIFI_POWER, "WiFi Power");
+ ret = gpio_request(GPIO14_ZIPITZ2_WIFI_POWER, "WiFi Power");
if (ret)
goto err;
- ret = gpio_direction_output(GPIO15_ZIPITZ2_WIFI_POWER, 1);
+ ret = gpio_direction_output(GPIO14_ZIPITZ2_WIFI_POWER, 1);
if (ret)
goto err2;
- ret = gpio_request(GPIO14_ZIPITZ2_WIFI_RESET, "WiFi Reset");
- if (ret)
- goto err2;
-
- ret = gpio_direction_output(GPIO14_ZIPITZ2_WIFI_RESET, 0);
- if (ret)
- goto err3;
-
- /* Reset the card */
+ /* Wait until card is powered on */
mdelay(180);
- gpio_set_value(GPIO14_ZIPITZ2_WIFI_RESET, 1);
- mdelay(20);
spi->bits_per_word = 16;
spi->mode = SPI_MODE_2,
@@ -532,22 +521,18 @@ static int z2_lbs_spi_setup(struct spi_device *spi)
return 0;
-err3:
- gpio_free(GPIO14_ZIPITZ2_WIFI_RESET);
err2:
- gpio_free(GPIO15_ZIPITZ2_WIFI_POWER);
+ gpio_free(GPIO14_ZIPITZ2_WIFI_POWER);
err:
return ret;
};
static int z2_lbs_spi_teardown(struct spi_device *spi)
{
- gpio_set_value(GPIO14_ZIPITZ2_WIFI_RESET, 0);
- gpio_set_value(GPIO15_ZIPITZ2_WIFI_POWER, 0);
- gpio_free(GPIO14_ZIPITZ2_WIFI_RESET);
- gpio_free(GPIO15_ZIPITZ2_WIFI_POWER);
- return 0;
+ gpio_set_value(GPIO14_ZIPITZ2_WIFI_POWER, 0);
+ gpio_free(GPIO14_ZIPITZ2_WIFI_POWER);
+ return 0;
};
static struct pxa2xx_spi_chip z2_lbs_chip_info = {
--
1.7.4.1
next prev parent reply other threads:[~2011-03-11 10:23 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-11 10:23 [PATCH 1/8] ARM: PXA: Z2: Use only power button as wake source Vasily Khoruzhick
2011-03-11 10:23 ` [PATCH 2/8] ARM: PXA: Z2: Enable OHCI on Zipit Z2 Vasily Khoruzhick
2011-03-11 14:56 ` [PATCH v2 " Vasily Khoruzhick
2011-03-11 21:42 ` Marek Vasut
2011-03-11 21:49 ` Vasily Khoruzhick
2011-03-11 21:50 ` Marek Vasut
2011-03-11 21:55 ` Vasily Khoruzhick
2011-03-11 22:13 ` Marek Vasut
2011-03-11 22:34 ` Vasily Khoruzhick
2011-03-12 0:07 ` Marek Vasut
2011-03-12 11:32 ` Vasily Khoruzhick
2011-03-12 13:28 ` Marek Vasut
2011-03-13 10:18 ` Pavel Machek
2011-03-13 12:29 ` Marek Vasut
2011-03-13 17:10 ` Pavel Machek
2011-03-13 18:34 ` Marek Vasut
2011-03-13 22:15 ` Vasily Khoruzhick
2011-03-11 21:41 ` [PATCH " Marek Vasut
2011-03-11 10:23 ` [PATCH 3/8] ARM: PXA: Z2: Fix battery pdata Vasily Khoruzhick
2011-03-11 21:39 ` Marek Vasut
2011-03-11 10:23 ` [PATCH 4/8] ARM: PXA: Z2: Add mtd partition with logo Vasily Khoruzhick
2011-03-11 21:39 ` Marek Vasut
2011-03-11 22:31 ` Vasily Khoruzhick
2011-03-12 0:05 ` Marek Vasut
2011-03-15 14:39 ` Pavel Machek
2011-03-16 14:11 ` Marek Vasut
2011-03-16 16:51 ` Pavel Machek
2011-03-11 10:23 ` [PATCH 5/8] ARM: PXA: Z2: Add poweroff function Vasily Khoruzhick
2011-03-11 21:39 ` Marek Vasut
2011-03-11 21:53 ` Vasily Khoruzhick
2011-03-11 22:08 ` Marek Vasut
2011-03-11 22:12 ` Vasily Khoruzhick
2011-03-11 22:16 ` Marek Vasut
2011-03-11 22:30 ` Vasily Khoruzhick
2011-03-12 0:05 ` Marek Vasut
2011-03-12 2:29 ` Eric Miao
2011-03-12 8:06 ` Vasily Khoruzhick
2011-03-12 11:06 ` Marek Vasut
2011-03-12 11:30 ` Vasily Khoruzhick
2011-03-12 13:16 ` Marek Vasut
2011-03-12 20:33 ` Vasily Khoruzhick
2011-03-12 20:35 ` Marek Vasut
2011-03-12 20:34 ` Vasily Khoruzhick
2011-03-12 22:29 ` Marek Vasut
2011-03-15 15:49 ` Eric Miao
2011-03-15 15:57 ` Vasily Khoruzhick
2011-03-15 16:42 ` Eric Miao
2011-03-15 20:11 ` [PATCH v2] " Vasily Khoruzhick
2011-07-05 6:58 ` Eric Miao
2011-03-15 14:41 ` [PATCH 5/8] " Pavel Machek
2011-03-11 10:23 ` Vasily Khoruzhick [this message]
2011-03-11 21:37 ` [PATCH 6/8] ARM: PXA: Z2: Fix libertas init/tear down sequences Marek Vasut
2011-03-11 21:41 ` Vasily Khoruzhick
2011-03-11 21:51 ` Marek Vasut
2011-03-11 10:23 ` [PATCH 7/8] ARM: PXA: Z2: Keep kbd backlight disabled by default Vasily Khoruzhick
2011-03-11 21:36 ` Marek Vasut
2011-03-11 10:23 ` [PATCH 8/8] ARM: PXA: Z2: Add default triggers for LEDs Vasily Khoruzhick
2011-03-11 21:36 ` Marek Vasut
2011-03-11 21:43 ` [PATCH 1/8] ARM: PXA: Z2: Use only power button as wake source Marek Vasut
2011-03-13 10:15 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1299839023-16601-6-git-send-email-anarsoul@gmail.com \
--to=anarsoul@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).