hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ar71xx: remove hardwired interface parameters from mach-* files 

SVN-Revision: 29103
owl
Gabor Juhos 2011-11-14 07:38:09 +00:00
parent defc79cb40
commit cf90b24bb9
13 changed files with 20 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/ar71xx/files/arch/mips/ar71xx/mach-all0258n.c
View File

@ -31,7 +31,6 @@
#define ALL0258N_KEYS_DEBOUNCE_INTERVAL (3 * ALL0258N_KEYS_POLL_INTERVAL) #define ALL0258N_KEYS_DEBOUNCE_INTERVAL (3 * ALL0258N_KEYS_POLL_INTERVAL)
/* showed up in the original firmware's bootlog */ /* showed up in the original firmware's bootlog */
#define ALL0258N_LAN_PHYMASK BIT(4)
#define ALL0258N_SEC_PHYMASK BIT(3) #define ALL0258N_SEC_PHYMASK BIT(3)
/* /*
@ -127,12 +126,7 @@ static void __init all0258n_setup(void)
ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0); ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 0); ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.phy_mask = ALL0258N_LAN_PHYMASK;
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.phy_mask = ALL0258N_SEC_PHYMASK; ar71xx_eth1_data.phy_mask = ALL0258N_SEC_PHYMASK;
ar71xx_eth1_data.has_ar7240_switch = 1;
ar71xx_add_device_mdio(0, 0x0); ar71xx_add_device_mdio(0, 0x0);

14
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap121.c
View File

@ -188,20 +188,12 @@ static void __init ap121_common_setup(void)
ar71xx_init_mac(ar71xx_eth0_data.mac_addr, art + AP121_MAC0_OFFSET, 0); ar71xx_init_mac(ar71xx_eth0_data.mac_addr, art + AP121_MAC0_OFFSET, 0);
ar71xx_init_mac(ar71xx_eth1_data.mac_addr, art + AP121_MAC1_OFFSET, 0); ar71xx_init_mac(ar71xx_eth1_data.mac_addr, art + AP121_MAC1_OFFSET, 0);
/* WAN port */ ar71xx_add_device_mdio(0, 0x0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_data.phy_mask = BIT(4);
/* LAN ports */ /* LAN ports */
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.speed = SPEED_1000;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
ar71xx_eth1_data.has_ar7240_switch = 1;
ar71xx_add_device_mdio(0, 0x0);
ar71xx_add_device_eth(1); ar71xx_add_device_eth(1);
/* WAN port */
ar71xx_add_device_eth(0); ar71xx_add_device_eth(0);
ar9xxx_add_device_wmac(art + AP121_CALDATA_OFFSET, ar9xxx_add_device_wmac(art + AP121_CALDATA_OFFSET,

14
target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
View File

@ -133,23 +133,15 @@ static void __init dir_600_a1_setup(void)
ARRAY_SIZE(dir_600_a1_gpio_keys), ARRAY_SIZE(dir_600_a1_gpio_keys),
dir_600_a1_gpio_keys); dir_600_a1_gpio_keys);
ar71xx_eth1_data.has_ar7240_switch = 1;
ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0); ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1); ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
/* WAN port */ ar71xx_add_device_mdio(0, 0x0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_data.phy_mask = BIT(4);
/* LAN ports */ /* LAN ports */
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.speed = SPEED_1000;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
ar71xx_add_device_mdio(0, 0x0);
ar71xx_add_device_eth(1); ar71xx_add_device_eth(1);
/* WAN port */
ar71xx_add_device_eth(0); ar71xx_add_device_eth(0);
ap91_pci_init(ee, mac); ap91_pci_init(ee, mac);

10
target/linux/ar71xx/files/arch/mips/ar71xx/mach-om2p.c
View File

@ -98,16 +98,6 @@ static void __init om2p_setup(void)
ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0); ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0);
ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac2, 0); ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac2, 0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_data.phy_mask = OM2P_WAN_PHYMASK;
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.speed = SPEED_1000;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
ar71xx_eth1_data.has_ar7240_switch = 1;
ar71xx_add_device_eth(0); ar71xx_add_device_eth(0);
ar71xx_add_device_eth(1); ar71xx_add_device_eth(1);

14
target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb750.c
View File

@ -120,20 +120,12 @@ static void __init rb750_setup(void)
ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0); ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
ar71xx_init_mac(ar71xx_eth1_data.mac_addr, ar71xx_mac_base, 1); ar71xx_init_mac(ar71xx_eth1_data.mac_addr, ar71xx_mac_base, 1);
/* WAN port */ ar71xx_add_device_mdio(0, 0x0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_data.phy_mask = BIT(4);
/* LAN ports */ /* LAN ports */
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.speed = SPEED_1000;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
ar71xx_eth1_data.has_ar7240_switch = 1;
ar71xx_add_device_mdio(0, 0x0);
ar71xx_add_device_eth(1); ar71xx_add_device_eth(1);
/* WAN port */
ar71xx_add_device_eth(0); ar71xx_add_device_eth(0);
platform_device_register(&rb750_leds_device); platform_device_register(&rb750_leds_device);

13
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-mr3x20.c
View File

@ -123,23 +123,14 @@ static void __init tl_mr3x20_setup(void)
ARRAY_SIZE(tl_mr3x20_gpio_keys), ARRAY_SIZE(tl_mr3x20_gpio_keys),
tl_mr3x20_gpio_keys); tl_mr3x20_gpio_keys);
ar71xx_eth1_data.has_ar7240_switch = 1;
ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0); ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1); ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
/* WAN port */ ar71xx_add_device_mdio(0, 0x0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_data.phy_mask = BIT(4);
/* LAN ports */ /* LAN ports */
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.speed = SPEED_1000;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
ar71xx_add_device_mdio(0, 0x0);
ar71xx_add_device_eth(1); ar71xx_add_device_eth(1);
/* WAN port */
ar71xx_add_device_eth(0); ar71xx_add_device_eth(0);
ar71xx_add_device_usb(); ar71xx_add_device_usb();

5
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c
View File

@ -106,11 +106,6 @@ static void __init tl_wa901nd_setup(void)
* however we have a single LAN port only. * however we have a single LAN port only.
*/ */
ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 0); ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 0);
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.speed = SPEED_1000;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
ar71xx_eth1_data.has_ar7240_switch = 1;
ar71xx_add_device_mdio(0, 0x0); ar71xx_add_device_mdio(0, 0x0);
ar71xx_add_device_eth(1); ar71xx_add_device_eth(1);

5
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr703n.c
View File

@ -106,11 +106,6 @@ static void __init tl_wr703n_setup(void)
ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0); ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_data.phy_mask = BIT(4);
ar71xx_add_device_mdio(0, 0x0); ar71xx_add_device_mdio(0, 0x0);
ar71xx_add_device_eth(0); ar71xx_add_device_eth(0);

10
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd-v4.c
View File

@ -135,16 +135,6 @@ static void __init tl_wr741ndv4_setup(void)
ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0); ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1); ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_data.phy_mask = BIT(4);
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.speed = SPEED_1000;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
ar71xx_eth1_data.has_ar7240_switch = 1;
ar71xx_add_device_mdio(0, 0x0); ar71xx_add_device_mdio(0, 0x0);
ar71xx_add_device_eth(1); ar71xx_add_device_eth(1);
ar71xx_add_device_eth(0); ar71xx_add_device_eth(0);

14
target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
View File

@ -108,23 +108,15 @@ static void __init tl_wr741nd_setup(void)
ARRAY_SIZE(tl_wr741nd_gpio_keys), ARRAY_SIZE(tl_wr741nd_gpio_keys),
tl_wr741nd_gpio_keys); tl_wr741nd_gpio_keys);
ar71xx_eth1_data.has_ar7240_switch = 1;
ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0); ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1); ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
/* WAN port */ ar71xx_add_device_mdio(0, 0x0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_data.phy_mask = BIT(4);
/* LAN ports */ /* LAN ports */
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.speed = SPEED_1000;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
ar71xx_add_device_mdio(0, 0x0);
ar71xx_add_device_eth(1); ar71xx_add_device_eth(1);
/* WAN port */
ar71xx_add_device_eth(0); ar71xx_add_device_eth(0);
ap91_pci_setup_wmac_led_pin(1); ap91_pci_setup_wmac_led_pin(1);

16
target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
View File

@ -249,11 +249,6 @@ static void __init ubnt_m_setup(void)
ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0); ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0);
ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac2, 0); ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac2, 0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_data.phy_mask = UBNT_M_WAN_PHYMASK;
ar71xx_add_device_eth(0); ar71xx_add_device_eth(0);
ap91_pci_init(ee, NULL); ap91_pci_init(ee, NULL);
@ -282,12 +277,6 @@ MIPS_MACHINE(AR71XX_MACH_UBNT_ROCKET_M, "UBNT-RM", "Ubiquiti Rocket M",
static void __init ubnt_nano_m_setup(void) static void __init ubnt_nano_m_setup(void)
{ {
ubnt_m_setup(); ubnt_m_setup();
ar71xx_eth1_data.has_ar7240_switch = 1;
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.speed = SPEED_1000;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
ar71xx_add_device_eth(1); ar71xx_add_device_eth(1);
} }
@ -316,11 +305,6 @@ static void __init ubnt_unifi_setup(void)
ar71xx_add_device_mdio(0, ~UBNT_M_WAN_PHYMASK); ar71xx_add_device_mdio(0, ~UBNT_M_WAN_PHYMASK);
ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0); ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_data.phy_mask = UBNT_M_WAN_PHYMASK;
ar71xx_add_device_eth(0); ar71xx_add_device_eth(0);
ap91_pci_init(ee, NULL); ap91_pci_init(ee, NULL);

13
target/linux/ar71xx/files/arch/mips/ar71xx/mach-whr-hp-g300n.c
View File

@ -144,23 +144,14 @@ static void __init whrhpg300n_setup(void)
ARRAY_SIZE(whrhpg300n_gpio_keys), ARRAY_SIZE(whrhpg300n_gpio_keys),
whrhpg300n_gpio_keys); whrhpg300n_gpio_keys);
ar71xx_eth1_data.has_ar7240_switch = 1;
ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0); ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1); ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
/* WAN port */ ar71xx_add_device_mdio(0, 0x0);
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
ar71xx_eth0_data.phy_mask = BIT(4);
/* LAN ports */ /* LAN ports */
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.speed = SPEED_1000;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
ar71xx_add_device_mdio(0, 0x0);
ar71xx_add_device_eth(1); ar71xx_add_device_eth(1);
/* WAN port */
ar71xx_add_device_eth(0); ar71xx_add_device_eth(0);
ap91_pci_setup_wmac_led_pin(1); ap91_pci_setup_wmac_led_pin(1);

14
target/linux/ar71xx/files/arch/mips/ar71xx/mach-zcn-1523h.c
View File

@ -174,17 +174,9 @@ static void __init zcn_1523h_generic_setup(void)
ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0); ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1); ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
/* LAN1 port */
ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth0_data.speed = SPEED_100;
ar71xx_eth0_data.duplex = DUPLEX_FULL;
/* LAN2 port */
ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
ar71xx_eth1_data.speed = SPEED_1000;
ar71xx_eth1_data.duplex = DUPLEX_FULL;
ar71xx_add_device_mdio(0, 0x0); ar71xx_add_device_mdio(0, 0x0);
/* LAN1 port */
ar71xx_add_device_eth(0); ar71xx_add_device_eth(0);
} }
@ -207,6 +199,8 @@ static void __init zcn_1523h_5_setup(void)
ar71xx_add_device_leds_gpio(1, ARRAY_SIZE(zcn_1523h_5_leds_gpio), ar71xx_add_device_leds_gpio(1, ARRAY_SIZE(zcn_1523h_5_leds_gpio),
zcn_1523h_5_leds_gpio); zcn_1523h_5_leds_gpio);
/* LAN2 port */
ar71xx_add_device_eth(1); ar71xx_add_device_eth(1);
} }