AA: ar71xx: use gpio_request_one instead of ath79_set_usb_power_gpio

Backport of r34087.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34333

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-hornet-ub.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-hornet-ub.c
index f8870e711ce0ac1d385626a9567069523f05e9b2..d2cfb0972a4acdff0e43ffb4c7c7e56e38f0cf1c 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-hornet-ub.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-hornet-ub.c
@@ -101,8 +101,9 @@ static void __init hornet_ub_gpio_setup(void)
        t |= AR933X_BOOTSTRAP_MDIO_GPIO_EN;
        ath79_reset_wr(AR933X_RESET_REG_BOOTSTRAP, t);
 
-       ath79_set_usb_power_gpio(HORNET_UB_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
-                               "USB power");
+       gpio_request_one(HORNET_UB_GPIO_USB_POWER,
+                        GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB power");
 }
 
 static void __init hornet_ub_setup(void)

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c
index 6b28207115efa08c7f0f37391ee7b7e7f8011ae6..e13d02e68bb2fcef53e2cfa6c3a53fc3a59bf0f5 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr11u.c
@@ -109,8 +109,9 @@ static void __init tl_mr11u_setup(void)
        ath79_register_gpio_keys_polled(-1, TL_MR11U_KEYS_POLL_INTERVAL,
                                        ARRAY_SIZE(tl_mr11u_gpio_keys),
                                        tl_mr11u_gpio_keys);
-       ath79_set_usb_power_gpio(TL_MR11U_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
-                               "USB power");
+       gpio_request_one(TL_MR11U_GPIO_USB_POWER,
+                        GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB power");
 }
 
 MIPS_MACHINE(ATH79_MACH_TL_MR11U, "TL-MR11U", "TP-LINK TL-MR11U",
@@ -122,8 +123,9 @@ static void __init tl_mr3040_setup(void)
 
        ath79_register_gpio_keys_polled(-1, TL_MR11U_KEYS_POLL_INTERVAL,
                                        1, tl_mr11u_gpio_keys);
-       ath79_set_usb_power_gpio(TL_MR3040_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
-                               "USB power");
+       gpio_request_one(TL_MR3040_GPIO_USB_POWER,
+                        GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB power");
 }
 
 MIPS_MACHINE(ATH79_MACH_TL_MR3040, "TL-MR3040", "TP-LINK TL-MR3040",

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3020.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3020.c
index 8f37d7a877cc3d1d3f2e3d4a2d9d72575e0a5564..e0edbf8d7e7c48862d319213cb0ea0d856855294 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3020.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3020.c
@@ -109,8 +109,9 @@ static void __init tl_mr3020_setup(void)
                                        ARRAY_SIZE(tl_mr3020_gpio_keys),
                                        tl_mr3020_gpio_keys);
 
-       ath79_set_usb_power_gpio(TL_MR3020_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
-                               "USB power");
+       gpio_request_one(TL_MR3020_GPIO_USB_POWER,
+                        GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB power");
        ath79_register_usb();
 
        ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3x20.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3x20.c
index b35f09f8a4393929249e094dbe217400706ae693..5924ac5048fc816d7b2a5417c701209fbf3e87b7 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3x20.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-mr3x20.c
@@ -102,8 +102,9 @@ static void __init tl_ap99_setup(void)
 static void __init tl_mr3x20_usb_setup(void)
 {
        /* enable power for the USB port */
-       ath79_set_usb_power_gpio(TL_MR3X20_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
-                               "USB power");
+       gpio_request_one(TL_MR3X20_GPIO_USB_POWER,
+                        GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB power");
        ath79_register_usb();
 }
 

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c
index 483aa6e935f533ec732897e39f1c7af437bdd20c..7be29555ddabc04f3e6202269e09c7434ee7a41a 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wdr4300.c
@@ -175,10 +175,12 @@ static void __init wdr4300_setup(void)
        ath79_eth0_pll_data.pll_1000 = 0x06000000;
        ath79_register_eth(0);
 
-       ath79_set_usb_power_gpio(WDR4300_GPIO_USB1_POWER, GPIOF_OUT_INIT_HIGH,
-                               "USB1 power");
-       ath79_set_usb_power_gpio(WDR4300_GPIO_USB2_POWER, GPIOF_OUT_INIT_HIGH,
-                               "USB2 power");
+       gpio_request_one(WDR4300_GPIO_USB1_POWER,
+                        GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB1 power");
+       gpio_request_one(WDR4300_GPIO_USB2_POWER,
+                        GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB2 power");
        ath79_register_usb();
 }
 

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr703n.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr703n.c
index f60f9624551f2027e0faf1f1886b0c2c625fb9b6..dcd6fec1c228bb273b168d4509820a6927749c9a 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr703n.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr703n.c
@@ -69,8 +69,9 @@ static void __init tl_wr703n_setup(void)
                                        ARRAY_SIZE(tl_wr703n_gpio_keys),
                                        tl_wr703n_gpio_keys);
 
-       ath79_set_usb_power_gpio(TL_WR703N_GPIO_USB_POWER, GPIOF_OUT_INIT_HIGH,
-                               "USB power");
+       gpio_request_one(TL_WR703N_GPIO_USB_POWER,
+                        GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB power");
        ath79_register_usb();
 
        ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
index 868514c959731c565c4bcf3e1533afba930eccbb..a7068e15542e1d68054c302e05bdc58de964a1b5 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
@@ -185,7 +185,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");
+       gpio_request_one(2, GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB power");
        ath79_register_usb();
 
        ath79_register_leds_gpio(-1, ARRAY_SIZE(wzrhpag300h_leds_gpio),

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c
index 6c850cee5c2afa8f06de8e8f456ae01c4d332e0a..4087288dc62b0f6bc4282f359af99b9f9462bf81 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g300nh2.c
@@ -158,7 +158,8 @@ static void __init wzrhpg300nh2_setup(void)
        ath79_register_eth(0);
 
        /* gpio13 is usb power.  Turn it on. */
-       ath79_set_usb_power_gpio(13, GPIOF_OUT_INIT_HIGH, "USB power");
+       gpio_request_one(13, GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB power");
        ath79_register_usb();
 
        ath79_register_leds_gpio(-1, ARRAY_SIZE(wzrhpg300nh2_leds_gpio),

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c
index b5292db54a5f408686dec1223730f72442611c60..2c28a55f557c3bdd86f73c0b6dde0df61f8cd944 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-g450h.c
@@ -156,7 +156,8 @@ static void __init wzrhpg450h_init(void)
 
        ath79_register_eth(0);
 
-       ath79_set_usb_power_gpio(16, GPIOF_OUT_INIT_HIGH, "USB power");
+       gpio_request_one(16, GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB power");
        ath79_register_usb();
 
        ap91_pci_init(ee, NULL);