bcm53xx: respect ACTIVE_LOW when powering USB using GPIO
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 46088
This commit is contained in:
		| @@ -1,4 +1,4 @@ | |||||||
| From a9e32f77ff74492d79fe2e24f0418136acd8a680 Mon Sep 17 00:00:00 2001 | From bdc3b01d94b22f8b5f9621a1c37336e78f4f1bce Mon Sep 17 00:00:00 2001 | ||||||
| From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> | From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> | ||||||
| Date: Sun, 21 Jun 2015 12:09:57 +0200 | Date: Sun, 21 Jun 2015 12:09:57 +0200 | ||||||
| Subject: [PATCH] USB: bcma: fix setting VCC GPIO value | Subject: [PATCH] USB: bcma: fix setting VCC GPIO value | ||||||
| @@ -6,26 +6,45 @@ MIME-Version: 1.0 | |||||||
| Content-Type: text/plain; charset=UTF-8 | Content-Type: text/plain; charset=UTF-8 | ||||||
| Content-Transfer-Encoding: 8bit | Content-Transfer-Encoding: 8bit | ||||||
|  |  | ||||||
| It wasn't working (on most of devices?) without setting GPIO direction. | It wasn't working (on most of devices?) without setting GPIO direction | ||||||
|  | and wasn't respecting ACTIVE_LOW flag. | ||||||
|  |  | ||||||
| Signed-off-by: Rafał Miłecki <zajec5@gmail.com> | Signed-off-by: Rafał Miłecki <zajec5@gmail.com> | ||||||
| --- | --- | ||||||
|  drivers/usb/host/bcma-hcd.c | 2 +- |  drivers/usb/host/bcma-hcd.c | 13 +++++++++---- | ||||||
|  1 file changed, 1 insertion(+), 1 deletion(-) |  1 file changed, 9 insertions(+), 4 deletions(-) | ||||||
|  |  | ||||||
| diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c | diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c | ||||||
| index f7a66b9..b31e3cc 100644 | index 8853ef7..d18ffdc 100644 | ||||||
| --- a/drivers/usb/host/bcma-hcd.c | --- a/drivers/usb/host/bcma-hcd.c | ||||||
| +++ b/drivers/usb/host/bcma-hcd.c | +++ b/drivers/usb/host/bcma-hcd.c | ||||||
| @@ -238,7 +238,7 @@ static void bcma_hci_platform_power_gpio(struct bcma_device *dev, bool val) | @@ -230,17 +230,22 @@ static void bcma_hcd_init_chip_arm(struct bcma_device *dev) | ||||||
|  |   | ||||||
|  |  static void bcma_hci_platform_power_gpio(struct bcma_device *dev, bool val) | ||||||
|  |  { | ||||||
|  | +	enum of_gpio_flags of_flags; | ||||||
|  |  	int gpio; | ||||||
|  |   | ||||||
|  | -	gpio = of_get_named_gpio(dev->dev.of_node, "vcc-gpio", 0); | ||||||
|  | +	gpio = of_get_named_gpio_flags(dev->dev.of_node, "vcc-gpio", 0, &of_flags); | ||||||
|  |  	if (!gpio_is_valid(gpio)) | ||||||
|  |  		return; | ||||||
|   |   | ||||||
|  	if (val) { |  	if (val) { | ||||||
|  		gpio_request(gpio, "bcma-hcd-gpio"); | -		gpio_request(gpio, "bcma-hcd-gpio"); | ||||||
| -		gpio_set_value(gpio, 1); | -		gpio_set_value(gpio, 1); | ||||||
| +		gpio_direction_output(gpio, 1); | +		unsigned long flags = 0; | ||||||
|  | +		bool active_low = !!(of_flags & OF_GPIO_ACTIVE_LOW); | ||||||
|  | + | ||||||
|  | +		flags |= active_low ? GPIOF_ACTIVE_LOW : 0; | ||||||
|  | +		flags |= active_low ? GPIOF_INIT_LOW : GPIOF_INIT_HIGH; | ||||||
|  | +		gpio_request_one(gpio, flags, "bcma-hcd-gpio"); | ||||||
|  	} else { |  	} else { | ||||||
|  		gpio_set_value(gpio, 0); | -		gpio_set_value(gpio, 0); | ||||||
|  | +		gpiod_set_value(gpio_to_desc(gpio), 0); | ||||||
|  		gpio_free(gpio); |  		gpio_free(gpio); | ||||||
|  |  	} | ||||||
|  |  } | ||||||
| --  | --  | ||||||
| 1.8.4.5 | 1.8.4.5 | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Rafał Miłecki
					Rafał Miłecki