KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: add a common function to configure USB power GPIOs

Browse source 
SVN-Revision: 32454
This commit is contained in:
Gabor Juhos 2012-06-19 10:13:41 +00:00
parent 27fea0b6d7
commit 1a1121158f
9 changed files with 63 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
target/linux/ar71xx/files/arch/mips/ath79/mach-hornet-ub.c
View file

@ -101,8 +101,8 @@ static void __init hornet_ub_gpio_setup(void)
t |= AR933X_BOOTSTRAP_MDIO_GPIO_EN;
ath79_reset_wr(AR933X_RESET_REG_BOOTSTRAP, t);
gpio_request(HORNET_UB_GPIO_USB_POWER, "USB power");
gpio_direction_output(HORNET_UB_GPIO_USB_POWER, 1);
ath79_set_usb_power_gpio(HORNET_UB_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
"USB power");
}
static void __init hornet_ub_setup(void)

4
target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c
View file

@ -93,8 +93,8 @@ static void __init tl_mr11u_setup(void)
ARRAY_SIZE(tl_mr11u_gpio_keys),
tl_mr11u_gpio_keys);
gpio_request(TL_MR11U_GPIO_USB_POWER, "USB power");
gpio_direction_output(TL_MR11U_GPIO_USB_POWER, 1);
ath79_set_usb_power_gpio(TL_MR11U_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
"USB power");
ath79_register_usb();
ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);

4
target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3020.c
View file

@ -109,8 +109,8 @@ static void __init tl_mr3020_setup(void)
ARRAY_SIZE(tl_mr3020_gpio_keys),
tl_mr3020_gpio_keys);
gpio_request(TL_MR3020_GPIO_USB_POWER, "USB power");
gpio_direction_output(TL_MR3020_GPIO_USB_POWER, 1);
ath79_set_usb_power_gpio(TL_MR3020_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
"USB power");
ath79_register_usb();
ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);

5
target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3x20.c
View file

@ -102,9 +102,8 @@ static void __init tl_ap99_setup(void)
static void __init tl_mr3x20_usb_setup(void)
{
/* enable power for the USB port */
gpio_request(TL_MR3X20_GPIO_USB_POWER, "USB power");
gpio_direction_output(TL_MR3X20_GPIO_USB_POWER, 1);
ath79_set_usb_power_gpio(TL_MR3X20_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
"USB power");
ath79_register_usb();
}

4
target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr703n.c
View file

@ -69,8 +69,8 @@ static void __init tl_wr703n_setup(void)
ARRAY_SIZE(tl_wr703n_gpio_keys),
tl_wr703n_gpio_keys);
gpio_request(TL_WR703N_GPIO_USB_POWER, "USB power");
gpio_direction_output(TL_WR703N_GPIO_USB_POWER, 1);
ath79_set_usb_power_gpio(TL_WR703N_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
"USB power");
ath79_register_usb();
ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);

3
target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
View file

@ -137,9 +137,8 @@ static void __init wzrhpag300h_setup(void)
ath79_register_eth(0);
ath79_register_eth(1);
ath79_set_usb_power_gpio(2, GPIOF_OUT_INIT_HIGH, "USB power");
ath79_register_usb();
gpio_request(2, "usb");
gpio_direction_output(2, 1);
ath79_register_leds_gpio(-1, ARRAY_SIZE(wzrhpag300h_leds_gpio),
wzrhpag300h_leds_gpio);

6
target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c
View file

@ -156,10 +156,10 @@ static void __init wzrhpg300nh2_setup(void)
ath79_eth0_data.phy_mask = BIT(0);
ath79_register_eth(0);
ath79_register_usb();
/* gpio13 is usb power. Turn it on. */
gpio_request(13, "usb");
gpio_direction_output(13, 1);
ath79_set_usb_power_gpio(13, GPIOF_OUT_INIT_HIGH, "USB power");
ath79_register_usb();
ath79_register_leds_gpio(-1, ARRAY_SIZE(wzrhpg300nh2_leds_gpio),
wzrhpg300nh2_leds_gpio);

5
target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c
View file

@ -10,7 +10,7 @@
* by the Free Software Foundation.
*/
#include <asm/mach-ath79/gpio.h>
#include <linux/gpio.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@ -156,9 +156,8 @@ static void __init wzrhpg450h_init(void)
ath79_register_eth(0);
ath79_set_usb_power_gpio(16, GPIOF_OUT_INIT_HIGH, "USB power");
ath79_register_usb();
gpio_request(16, "usb");
gpio_direction_output(16, 1);
ap91_pci_init(ee, NULL);
ap9x_pci_setup_wmac_led_pin(0, 15);

47
target/linux/ar71xx/patches-3.3/511-MIPS-ath79-add-ath79_set_usb_power_gpio.patch Normal file
View file

@ -0,0 +1,47 @@
--- a/arch/mips/ath79/dev-usb.c
+++ b/arch/mips/ath79/dev-usb.c
@@ -15,6 +15,7 @@
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/irq.h>
+#include <linux/gpio.h>
#include <linux/dma-mapping.h>
#include <linux/platform_device.h>
#include <linux/usb/ehci_pdriver.h>
@@ -236,3 +237,26 @@ void __init ath79_register_usb(void)
else
BUG();
}
+
+void __init ath79_set_usb_power_gpio(unsigned int gpio, unsigned long flags,
+ const char *label)
+{
+ int err;
+
+ err = gpio_request_one(gpio, flags, label);
+ if (err) {
+ pr_err("ath79: can't setup GPIO%u (%s), err=%d\n",
+ gpio, label, err);
+ return;
+ }
+
+ err = gpio_export(gpio, false);
+ if (err) {
+ pr_err("ath79: can't export GPIO%u (%s), err=%d\n",
+ gpio, label, err);
+ }
+
+ return;
+}
+
+
--- a/arch/mips/ath79/dev-usb.h
+++ b/arch/mips/ath79/dev-usb.h
@@ -13,5 +13,7 @@
#define _ATH79_DEV_USB_H
void ath79_register_usb(void);
+void ath79_set_usb_power_gpio(unsigned int gpio, unsigned long flags,
+ const char *label);
#endif /* _ATH79_DEV_USB_H */