Home Esplora Aiuto
Registrati Accedi
FreifunkHochstift
/
gluon
6
0
Forka 0
File Problemi 0 Pull Requests 0
Albero (Tree): 167e1b34dc
Rami (Branch) Tag
gluon
/
patches
/
lede
/
0051-ar71xx-fix-lan-ports-on-archer-C59-and-C60.patch

0051-ar71xx-fix-lan-ports-on-archer-C59-and-C60.patch 5.1 KB
Cronologia Originale

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128 
  1. From: Henryk Heisig <hyniu@o2.pl>
    2. 

  2. Date: Thu, 16 Feb 2017 15:22:49 +0100
    3. 

  3. Subject: ar71xx: fix lan ports on archer C59 and C60
    4. 

  4. 

  5. Signed-off-by: Henryk Heisig <hyniu@o2.pl>
    6. 

  6. 

  7. diff --git a/target/linux/ar71xx/base-files/etc/board.d/01_leds b/target/linux/ar71xx/base-files/etc/board.d/01_leds
    8. 

  8. index 8552cde564b3fbed9425f42d5331f95fe5c3aaa8..5c6b47d0249c979934d61078e16759fc22aa41c7 100755
    9. 

  9. --- a/target/linux/ar71xx/base-files/etc/board.d/01_leds
    10. 

  10. +++ b/target/linux/ar71xx/base-files/etc/board.d/01_leds
    11. 

  11. @@ -64,8 +64,8 @@ archer-c25-v1)
    12. 

  12.  	;;
    13. 

  13.  archer-c59-v1|\
    14. 

  14.  archer-c60-v1)
    15. 

  15. -	ucidef_set_led_switch "lan" "LAN" "$board:green:lan" "switch0" "0x3C"
    16. 

  16. -	ucidef_set_led_switch "wan" "WAN" "$board:green:wan" "switch0" "0x02"
    17. 

  17. +	ucidef_set_led_switch "lan" "LAN" "$board:green:lan" "switch0" "0x1E"
    18. 

  18. +	ucidef_set_led_netdev "wan" "WAN" "$board:green:wan" "eth0"
    19. 

  19.  	ucidef_set_led_wlan "wlan" "WLAN" "$board:green:wlan2g" "phy1tpt"
    20. 

  20.  	ucidef_set_led_wlan "wlan5g" "WLAN5G" "$board:green:wlan5g" "phy0tpt"
    21. 

  21.  
    22. 

  22. diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
    23. 

  23. index 3abe1114ee31c79abb125b85119876c3d75bb7c0..933ed22815ee076c98a83173aad143c010c9a131 100755
    24. 

  24. --- a/target/linux/ar71xx/base-files/etc/board.d/02_network
    25. 

  25. +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
    26. 

  26. @@ -206,9 +206,15 @@ ar71xx_setup_interfaces()
    27. 

  27.  			"0@eth1" "2:lan" "3:lan" "4:lan" "5:lan" "6@eth0" "1:wan"
    28. 

  28.  		;;
    29. 

  29.  	archer-c59-v1|\
    30. 

  30. +	rb-450g)
    31. 

  31. +		ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
    32. 

  32. +		ucidef_add_switch "switch0" \
    33. 

  33. +			"0@eth1" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
    34. 

  34. +		;;
    35. 

  35.  	archer-c60-v1)
    36. 

  36. +		ucidef_set_interfaces_lan_wan "eth1.1" "eth0"
    37. 

  37.  		ucidef_add_switch "switch0" \
    38. 

  38. -			"0@eth0" "2:lan:4" "3:lan:3" "4:lan:2" "5:lan:1" "1:wan"
    39. 

  39. +			"0@eth1" "1:lan:1" "2:lan:2" "3:lan:3" "4:lan:4"
    40. 

  40.  		;;
    41. 

  41.  	arduino-yun|\
    42. 

  42.  	dir-505-a1|\
    43. 

  43. @@ -370,11 +376,6 @@ ar71xx_setup_interfaces()
    44. 

  44.  		ucidef_add_switch "switch0" \
    45. 

  45.  			"0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "5@eth1"
    46. 

  46.  		;;
    47. 

  47. -	rb-450g)
    48. 

  48. -		ucidef_set_interfaces_lan_wan "eth1" "eth0"
    49. 

  49. -		ucidef_add_switch "switch0" \
    50. 

  50. -			"0@eth1" "1:lan:1" "2:lan:4" "3:lan:3" "4:lan:2"
    51. 

  51. -		;;
    52. 

  52.  	routerstation-pro)
    53. 

  53.  		ucidef_set_interfaces_lan_wan "eth1" "eth0"
    54. 

  54.  		ucidef_add_switch "switch0" \
    55. 

  55. diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
    56. 

  56. index 28353aa77b05078b895ab48cf6b1ae53abe98ce2..d55f9b9f75b38159ed7209aa5acd73ff31088b51 100644
    57. 

  57. --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
    58. 

  58. +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c59-v1.c
    59. 

  59. @@ -194,19 +194,33 @@ static void __init archer_c59_v1_setup(void)
    60. 

  60.  					ARRAY_SIZE(archer_c59_v1_gpio_keys),
    61. 

  61.  					archer_c59_v1_gpio_keys);
    62. 

  62.  
    63. 

  63. +	ath79_setup_qca956x_eth_cfg(QCA956X_ETH_CFG_SW_PHY_SWAP |
    64. 

  64. +				   QCA956X_ETH_CFG_SW_PHY_ADDR_SWAP);
    65. 

  65. +
    66. 

  66. +	ath79_register_mdio(0, 0x0);
    67. 

  67.  	ath79_register_mdio(1, 0x0);
    68. 

  68.  
    69. 

  69. -	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
    70. 

  70. +	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
    71. 

  71.  	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
    72. 

  72. +
    73. 

  73. +	/* WAN port */
    74. 

  74. +	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
    75. 

  75. +	ath79_eth0_data.speed = SPEED_100;
    76. 

  76. +	ath79_eth0_data.duplex = DUPLEX_FULL;
    77. 

  77. +	ath79_eth0_data.phy_mask = BIT(0);
    78. 

  78. +	ath79_register_eth(0);
    79. 

  79. +
    80. 

  80. +	/* LAN ports */
    81. 

  81. +	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
    82. 

  82.  	ath79_eth1_data.speed = SPEED_1000;
    83. 

  83.  	ath79_eth1_data.duplex = DUPLEX_FULL;
    84. 

  84. -	ath79_eth1_data.phy_mask = BIT(4);
    85. 

  85. +	ath79_switch_data.phy_poll_mask |= BIT(4);
    86. 

  86. +	ath79_switch_data.phy4_mii_en = 1;
    87. 

  87.  	ath79_register_eth(1);
    88. 

  88.  
    89. 

  89.  	ath79_register_wmac(art + ARCHER_C59_V1_WMAC_CALDATA_OFFSET, mac);
    90. 

  90.  	ap91_pci_init(art + ARCHER_C59_V1_PCI_CALDATA_OFFSET, NULL);
    91. 

  91.  
    92. 

  92. -
    93. 

  93.  	ath79_register_usb();
    94. 

  94.  	gpio_request_one(ARCHER_C59_V1_GPIO_USB_POWER,
    95. 

  95.  			 GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
    96. 

  96. diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c
    97. 

  97. index 78186f02cda0a231afda4e53a1d6ff696ecb6b4a..4d83fa737b9650935b4f7f985d58f471c38cd9da 100644
    98. 

  98. --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c
    99. 

  99. +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-archer-c60-v1.c
    100. 

  100. @@ -116,15 +116,25 @@ static void __init archer_c60_v1_setup(void)
    101. 

  101.  					ARRAY_SIZE(archer_c60_v1_gpio_keys),
    102. 

  102.  					archer_c60_v1_gpio_keys);
    103. 

  103.  
    104. 

  104. -	ath79_setup_qca956x_eth_cfg(QCA956X_ETH_CFG_SW_PHY_SWAP |
    105. 

  105. -				   QCA956X_ETH_CFG_SW_PHY_ADDR_SWAP);
    106. 

  106. +	ath79_register_mdio(0, 0x0);
    107. 

  107.  	ath79_register_mdio(1, 0x0);
    108. 

  108.  
    109. 

  109. -	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
    110. 

  110. +	ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
    111. 

  111. +	ath79_init_mac(ath79_eth1_data.mac_addr, mac, 1);
    112. 

  112.  
    113. 

  113. +	/* WAN port */
    114. 

  114. +	ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
    115. 

  115. +	ath79_eth0_data.speed = SPEED_100;
    116. 

  116. +	ath79_eth0_data.duplex = DUPLEX_FULL;
    117. 

  117. +	ath79_eth0_data.phy_mask = BIT(4);
    118. 

  118. +	ath79_register_eth(0);
    119. 

  119. +
    120. 

  120. +	/* LAN ports */
    121. 

  121.  	ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
    122. 

  122.  	ath79_eth1_data.speed = SPEED_1000;
    123. 

  123.  	ath79_eth1_data.duplex = DUPLEX_FULL;
    124. 

  124. +	ath79_switch_data.phy_poll_mask |= BIT(4);
    125. 

  125. +	ath79_switch_data.phy4_mii_en = 1;
    126. 

  126.  	ath79_register_eth(1);
    127. 

  127.  
    128. 

  128.  	ath79_register_wmac(art + ARCHER_C60_V1_WMAC_CALDATA_OFFSET, mac);
    129.