bcm53xx: replace USB patch fixing power control with the most recent version
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 47336v19.07.3_mercusys_ac12_duma
Rafał Miłecki
9 years ago
parent
55a912f43e
commit
c348b3317a
@ -0,0 +1,75 @@
|
||||
From 0cb136f9882e4649ad6160bb7b48955ff728888c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||||
Date: Sun, 1 Nov 2015 08:17:21 +0100
|
||||
Subject: [PATCH V2] USB: bcma: switch to GPIO descriptor for power control
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
So far we were using simple (legacy) GPIO functions & some poor logic to
|
||||
control power. It got many drawbacks: we were ignoring OF flags
|
||||
(GPIO_ACTIVE_LOW), we were not setting direction to output and we were
|
||||
assuming gpio_request success all the time.
|
||||
Fix it by switching to gpiod functions and adding appropriate checks.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
---
|
||||
drivers/usb/host/bcma-hcd.c | 21 ++++++++++-----------
|
||||
1 file changed, 10 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c
|
||||
index 5398e3d..291aaa2 100644
|
||||
--- a/drivers/usb/host/bcma-hcd.c
|
||||
+++ b/drivers/usb/host/bcma-hcd.c
|
||||
@@ -21,6 +21,7 @@
|
||||
*/
|
||||
#include <linux/bcma/bcma.h>
|
||||
#include <linux/delay.h>
|
||||
+#include <linux/gpio/consumer.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/slab.h>
|
||||
@@ -36,6 +37,7 @@ MODULE_LICENSE("GPL");
|
||||
struct bcma_hcd_device {
|
||||
struct platform_device *ehci_dev;
|
||||
struct platform_device *ohci_dev;
|
||||
+ struct gpio_desc *gpio_desc;
|
||||
};
|
||||
|
||||
/* Wait for bitmask in a register to get set or cleared.
|
||||
@@ -228,19 +230,12 @@ static void bcma_hcd_init_chip_arm(struct bcma_device *dev)
|
||||
|
||||
static void bcma_hci_platform_power_gpio(struct bcma_device *dev, bool val)
|
||||
{
|
||||
- int gpio;
|
||||
+ struct bcma_hcd_device *usb_dev = bcma_get_drvdata(dev);
|
||||
|
||||
- gpio = of_get_named_gpio(dev->dev.of_node, "vcc-gpio", 0);
|
||||
- if (!gpio_is_valid(gpio))
|
||||
+ if (IS_ERR_OR_NULL(usb_dev->gpio_desc))
|
||||
return;
|
||||
|
||||
- if (val) {
|
||||
- gpio_request(gpio, "bcma-hcd-gpio");
|
||||
- gpio_set_value(gpio, 1);
|
||||
- } else {
|
||||
- gpio_set_value(gpio, 0);
|
||||
- gpio_free(gpio);
|
||||
- }
|
||||
+ gpiod_set_value(usb_dev->gpio_desc, val);
|
||||
}
|
||||
|
||||
static const struct usb_ehci_pdata ehci_pdata = {
|
||||
@@ -314,7 +309,11 @@ static int bcma_hcd_probe(struct bcma_device *dev)
|
||||
if (!usb_dev)
|
||||
return -ENOMEM;
|
||||
|
||||
- bcma_hci_platform_power_gpio(dev, true);
|
||||
+ if (dev->dev.of_node)
|
||||
+ usb_dev->gpio_desc = devm_get_gpiod_from_child(&dev->dev, "vcc",
|
||||
+ &dev->dev.of_node->fwnode);
|
||||
+ if (!IS_ERR_OR_NULL(usb_dev->gpio_desc))
|
||||
+ gpiod_direction_output(usb_dev->gpio_desc, 1);
|
||||
|
||||
switch (dev->id.id) {
|
||||
case BCMA_CORE_NS_USB20:
|
||||
@ -1,54 +0,0 @@
|
||||
From 7572673e06393b117f87b20b82be0518634d7042 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||||
Date: Sun, 21 Jun 2015 12:09:57 +0200
|
||||
Subject: [PATCH v3 6/6] usb: bcma: fix setting VCC GPIO value
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
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: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
drivers/usb/host/bcma-hcd.c | 14 ++++++++++----
|
||||
1 file changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/drivers/usb/host/bcma-hcd.c
|
||||
+++ b/drivers/usb/host/bcma-hcd.c
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_gpio.h>
|
||||
+#include <linux/gpio/consumer.h>
|
||||
#include <linux/usb/ehci_pdriver.h>
|
||||
#include <linux/usb/ohci_pdriver.h>
|
||||
#include <linux/usb/xhci_pdriver.h>
|
||||
@@ -231,17 +232,22 @@ static void bcma_hcd_init_chip_arm(struc
|
||||
|
||||
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) {
|
||||
- gpio_request(gpio, "bcma-hcd-gpio");
|
||||
- gpio_set_value(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 {
|
||||
- gpio_set_value(gpio, 0);
|
||||
+ gpiod_set_value(gpio_to_desc(gpio), 0);
|
||||
gpio_free(gpio);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,75 @@
|
||||
From 0cb136f9882e4649ad6160bb7b48955ff728888c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||||
Date: Sun, 1 Nov 2015 08:17:21 +0100
|
||||
Subject: [PATCH V2] USB: bcma: switch to GPIO descriptor for power control
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
So far we were using simple (legacy) GPIO functions & some poor logic to
|
||||
control power. It got many drawbacks: we were ignoring OF flags
|
||||
(GPIO_ACTIVE_LOW), we were not setting direction to output and we were
|
||||
assuming gpio_request success all the time.
|
||||
Fix it by switching to gpiod functions and adding appropriate checks.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||
---
|
||||
drivers/usb/host/bcma-hcd.c | 21 ++++++++++-----------
|
||||
1 file changed, 10 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/drivers/usb/host/bcma-hcd.c b/drivers/usb/host/bcma-hcd.c
|
||||
index 5398e3d..291aaa2 100644
|
||||
--- a/drivers/usb/host/bcma-hcd.c
|
||||
+++ b/drivers/usb/host/bcma-hcd.c
|
||||
@@ -21,6 +21,7 @@
|
||||
*/
|
||||
#include <linux/bcma/bcma.h>
|
||||
#include <linux/delay.h>
|
||||
+#include <linux/gpio/consumer.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/slab.h>
|
||||
@@ -36,6 +37,7 @@ MODULE_LICENSE("GPL");
|
||||
struct bcma_hcd_device {
|
||||
struct platform_device *ehci_dev;
|
||||
struct platform_device *ohci_dev;
|
||||
+ struct gpio_desc *gpio_desc;
|
||||
};
|
||||
|
||||
/* Wait for bitmask in a register to get set or cleared.
|
||||
@@ -228,19 +230,12 @@ static void bcma_hcd_init_chip_arm(struct bcma_device *dev)
|
||||
|
||||
static void bcma_hci_platform_power_gpio(struct bcma_device *dev, bool val)
|
||||
{
|
||||
- int gpio;
|
||||
+ struct bcma_hcd_device *usb_dev = bcma_get_drvdata(dev);
|
||||
|
||||
- gpio = of_get_named_gpio(dev->dev.of_node, "vcc-gpio", 0);
|
||||
- if (!gpio_is_valid(gpio))
|
||||
+ if (IS_ERR_OR_NULL(usb_dev->gpio_desc))
|
||||
return;
|
||||
|
||||
- if (val) {
|
||||
- gpio_request(gpio, "bcma-hcd-gpio");
|
||||
- gpio_set_value(gpio, 1);
|
||||
- } else {
|
||||
- gpio_set_value(gpio, 0);
|
||||
- gpio_free(gpio);
|
||||
- }
|
||||
+ gpiod_set_value(usb_dev->gpio_desc, val);
|
||||
}
|
||||
|
||||
static const struct usb_ehci_pdata ehci_pdata = {
|
||||
@@ -314,7 +309,11 @@ static int bcma_hcd_probe(struct bcma_device *dev)
|
||||
if (!usb_dev)
|
||||
return -ENOMEM;
|
||||
|
||||
- bcma_hci_platform_power_gpio(dev, true);
|
||||
+ if (dev->dev.of_node)
|
||||
+ usb_dev->gpio_desc = devm_get_gpiod_from_child(&dev->dev, "vcc",
|
||||
+ &dev->dev.of_node->fwnode);
|
||||
+ if (!IS_ERR_OR_NULL(usb_dev->gpio_desc))
|
||||
+ gpiod_direction_output(usb_dev->gpio_desc, 1);
|
||||
|
||||
switch (dev->id.id) {
|
||||
case BCMA_CORE_NS_USB20:
|
||||
@ -1,54 +0,0 @@
|
||||
From 7572673e06393b117f87b20b82be0518634d7042 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
||||
Date: Sun, 21 Jun 2015 12:09:57 +0200
|
||||
Subject: [PATCH v3 6/6] usb: bcma: fix setting VCC GPIO value
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
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: Hauke Mehrtens <hauke@hauke-m.de>
|
||||
---
|
||||
drivers/usb/host/bcma-hcd.c | 14 ++++++++++----
|
||||
1 file changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
--- a/drivers/usb/host/bcma-hcd.c
|
||||
+++ b/drivers/usb/host/bcma-hcd.c
|
||||
@@ -26,6 +26,7 @@
|
||||
#include <linux/slab.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/of_gpio.h>
|
||||
+#include <linux/gpio/consumer.h>
|
||||
#include <linux/usb/ehci_pdriver.h>
|
||||
#include <linux/usb/ohci_pdriver.h>
|
||||
#include <linux/usb/xhci_pdriver.h>
|
||||
@@ -231,17 +232,22 @@ static void bcma_hcd_init_chip_arm(struc
|
||||
|
||||
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) {
|
||||
- gpio_request(gpio, "bcma-hcd-gpio");
|
||||
- gpio_set_value(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 {
|
||||
- gpio_set_value(gpio, 0);
|
||||
+ gpiod_set_value(gpio_to_desc(gpio), 0);
|
||||
gpio_free(gpio);
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue