diff options
author | Hauke Mehrtens <hauke@openwrt.org> | 2014-03-30 19:06:24 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@openwrt.org> | 2014-03-30 19:06:24 +0000 |
commit | 374deb8374e46d8362b7e6110729b99b12489fc5 (patch) | |
tree | 7ab7644961bd7b76076cb0906b3c28a082cd5195 /target/linux/brcm47xx | |
parent | 09287d51298a067451347a70551afb13b4b8ffa0 (diff) | |
download | upstream-374deb8374e46d8362b7e6110729b99b12489fc5.tar.gz upstream-374deb8374e46d8362b7e6110729b99b12489fc5.tar.bz2 upstream-374deb8374e46d8362b7e6110729b99b12489fc5.zip |
brcm47xx: update workarounds patch to V3
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40344 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx')
2 files changed, 18 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-3.10/128-MIPS-BCM47XX-Add-new-file-for-device-specific-workar.patch b/target/linux/brcm47xx/patches-3.10/128-MIPS-BCM47XX-Add-new-file-for-device-specific-workar.patch index 0e291f8175..5603a536d8 100644 --- a/target/linux/brcm47xx/patches-3.10/128-MIPS-BCM47XX-Add-new-file-for-device-specific-workar.patch +++ b/target/linux/brcm47xx/patches-3.10/128-MIPS-BCM47XX-Add-new-file-for-device-specific-workar.patch @@ -44,7 +44,7 @@ V2: Drop pr_debug for devices we don't need workarounds for. It was too } --- /dev/null +++ b/arch/mips/bcm47xx/workarounds.c -@@ -0,0 +1,25 @@ +@@ -0,0 +1,31 @@ +#include "bcm47xx_private.h" + +#include <linux/gpio.h> @@ -53,8 +53,14 @@ V2: Drop pr_debug for devices we don't need workarounds for. It was too + +static void __init bcm47xx_workarounds_netgear_wnr3500l(void) +{ -+ /* Set GPIO 12 to 1 to pass power to the USB port */ -+ gpio_set_value(12, 1); ++ const int usb_power = 12; ++ int err; ++ ++ err = gpio_request_one(usb_power, GPIOF_OUT_INIT_HIGH, "usb_power"); ++ if (err) ++ pr_err("Failed to request USB power gpio: %d\n", err); ++ else ++ gpio_free(usb_power); +} + +void __init bcm47xx_workarounds(void) diff --git a/target/linux/brcm47xx/patches-3.14/128-MIPS-BCM47XX-Add-new-file-for-device-specific-workar.patch b/target/linux/brcm47xx/patches-3.14/128-MIPS-BCM47XX-Add-new-file-for-device-specific-workar.patch index a1ebd20f39..e5bdb97b6c 100644 --- a/target/linux/brcm47xx/patches-3.14/128-MIPS-BCM47XX-Add-new-file-for-device-specific-workar.patch +++ b/target/linux/brcm47xx/patches-3.14/128-MIPS-BCM47XX-Add-new-file-for-device-specific-workar.patch @@ -44,7 +44,7 @@ V2: Drop pr_debug for devices we don't need workarounds for. It was too return 0; --- /dev/null +++ b/arch/mips/bcm47xx/workarounds.c -@@ -0,0 +1,25 @@ +@@ -0,0 +1,31 @@ +#include "bcm47xx_private.h" + +#include <linux/gpio.h> @@ -53,8 +53,14 @@ V2: Drop pr_debug for devices we don't need workarounds for. It was too + +static void __init bcm47xx_workarounds_netgear_wnr3500l(void) +{ -+ /* Set GPIO 12 to 1 to pass power to the USB port */ -+ gpio_set_value(12, 1); ++ const int usb_power = 12; ++ int err; ++ ++ err = gpio_request_one(usb_power, GPIOF_OUT_INIT_HIGH, "usb_power"); ++ if (err) ++ pr_err("Failed to request USB power gpio: %d\n", err); ++ else ++ gpio_free(usb_power); +} + +void __init bcm47xx_workarounds(void) |