diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-12-03 10:51:32 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-12-03 10:51:32 +0000 |
| commit | 4333cb73f710844e3a677c2deeb1c08183104bf9 (patch) | |
| tree | 84587c275c8a39ffdf1e1781327b891ee8fbc9f8 | |
| parent | 448bf7819b7262bad06c28ea45c700911c0f4539 (diff) | |
| download | upstream-4333cb73f710844e3a677c2deeb1c08183104bf9.tar.gz upstream-4333cb73f710844e3a677c2deeb1c08183104bf9.tar.bz2 upstream-4333cb73f710844e3a677c2deeb1c08183104bf9.zip | |
bcm53xx: move & update accepted USB patch for GPIO control
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 47709
| -rw-r--r-- | target/linux/bcm53xx/patches-4.4/080-USB-bcma-switch-to-GPIO-descriptor-for-power-control.patch (renamed from target/linux/bcm53xx/patches-4.4/186-USB-bcma-switch-to-GPIO-descriptor-for-power-control.patch) | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/target/linux/bcm53xx/patches-4.4/186-USB-bcma-switch-to-GPIO-descriptor-for-power-control.patch b/target/linux/bcm53xx/patches-4.4/080-USB-bcma-switch-to-GPIO-descriptor-for-power-control.patch index f1995d1e6d..deb0e4e459 100644 --- a/target/linux/bcm53xx/patches-4.4/186-USB-bcma-switch-to-GPIO-descriptor-for-power-control.patch +++ b/target/linux/bcm53xx/patches-4.4/080-USB-bcma-switch-to-GPIO-descriptor-for-power-control.patch @@ -1,7 +1,7 @@ -From 0cb136f9882e4649ad6160bb7b48955ff728888c Mon Sep 17 00:00:00 2001 +From 9faae5a37b266afca6914163316856c5ed4ec366 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 +Date: Sun, 1 Nov 2015 10:04:41 +0100 +Subject: [PATCH] USB: bcma: switch to GPIO descriptor for power control MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,6 +13,8 @@ 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> +Acked-by: Hauke Mehrtens <hauke@hauke-m.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/usb/host/bcma-hcd.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) @@ -35,7 +37,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> }; /* Wait for bitmask in a register to get set or cleared. -@@ -228,19 +230,12 @@ static void bcma_hcd_init_chip_arm(struc +@@ -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) { @@ -58,7 +60,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com> } static const struct usb_ehci_pdata ehci_pdata = { -@@ -314,7 +309,11 @@ static int bcma_hcd_probe(struct bcma_de +@@ -314,7 +309,11 @@ static int bcma_hcd_probe(struct bcma_device *dev) if (!usb_dev) return -ENOMEM; |