projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: wp543: use KEY_RESET code for the sw4 button
[oweals/openwrt.git]
/
target
/
linux
/
ar71xx
/
files
/
arch
/
mips
/
ath79
/
mach-tl-mr3020.c
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 9732d5cd567a891e15cc9ee1ccbe3c1e6ade1615..0a9dfbc8a0f7374c1512b1a097236c84071d3258 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
@@
-12,6
+12,7
@@
#include <linux/gpio.h>
#include <asm/mach-ath79/ath79.h>
#include <linux/gpio.h>
#include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h>
#include "dev-eth.h"
#include "dev-gpio-buttons.h"
#include "dev-eth.h"
#include "dev-gpio-buttons.h"
@@
-99,6
+100,9
@@
static void __init tl_mr3020_setup(void)
u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+ /* disable PHY_SWAP and PHY_ADDR_SWAP bits */
+ ath79_setup_ar933x_phy4_switch(false, false);
+
ath79_register_m25p80(&tl_mr3020_flash_data);
ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_mr3020_leds_gpio),
tl_mr3020_leds_gpio);
ath79_register_m25p80(&tl_mr3020_flash_data);
ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_mr3020_leds_gpio),
tl_mr3020_leds_gpio);
@@
-106,8
+110,9
@@
static void __init tl_mr3020_setup(void)
ARRAY_SIZE(tl_mr3020_gpio_keys),
tl_mr3020_gpio_keys);
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);
+ 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);
ath79_register_usb();
ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);