aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorDaniel F. Dickinson <cshored@thecshore.com>2018-07-29 07:40:01 -0400
committerJohn Crispin <john@phrozen.org>2018-08-01 11:23:54 +0200
commit0b7a9688ce49c60a18575b925138b100f4e8e078 (patch)
tree4b2c30d97423644ac68f77f919aac6796740095c /target/linux/ar71xx
parentb6c8bc0981855b50b7bf22f0743bb9a75fc2b341 (diff)
downloadupstream-0b7a9688ce49c60a18575b925138b100f4e8e078.tar.gz
upstream-0b7a9688ce49c60a18575b925138b100f4e8e078.tar.bz2
upstream-0b7a9688ce49c60a18575b925138b100f4e8e078.zip
ar71xx: cr3000: cleanup board definition
1) Add comments so it's clear why we did things; this may prevent someone (e.g. me) from sinking time into fixing things that aren't broken and/or were done for reason. 2) Drop mdio 0 probe/register; we don't use ag1xx mdio bus 0. 3) Cosmetic reording of some code (tested) that makes the defintion more clear. Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/files/arch/mips/ath79/mach-cr3000.c39
1 files changed, 23 insertions, 16 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-cr3000.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-cr3000.c
index b2fcca88fa..235b0ec769 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-cr3000.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-cr3000.c
@@ -21,7 +21,6 @@
*/
#include <linux/gpio.h>
-#include <linux/pci.h>
#include <linux/phy.h>
#include <linux/platform_device.h>
#include <linux/ath9k_platform.h>
@@ -31,7 +30,6 @@
#include <asm/mach-ath79/ath79.h>
#include "common.h"
-#include "dev-ap9x-pci.h"
#include "dev-eth.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
@@ -58,7 +56,6 @@
#define CR3000_MAC1_OFFSET 6
#define CR3000_WMAC_CALDATA_OFFSET 0x1000
#define CR3000_WMAC_MAC_OFFSET 0x1002
-#define CR3000_PCIE_CALDATA_OFFSET 0x5000
static struct gpio_led cr3000_leds_gpio[] __initdata = {
{
@@ -132,27 +129,37 @@ static void __init cr3000_setup(void)
/* WLAN 2GHz onboard */
ath79_register_wmac(art + CR3000_WMAC_CALDATA_OFFSET, art + CR3000_WMAC_MAC_OFFSET);
-
- ath79_register_mdio(1, 0x0);
- ath79_register_mdio(0, 0x0);
+ /* FE Lan on first 4-ports of internal switch and attached to GMAC1
+ * WAN Fast Ethernet interface attached to GMAC0
+ * Could be configured as a 5-port switch, but we use
+ * the SoC capabilities to attach port 5 to a separate PHY/MAC
+ * theoretically this leaves future possibility of using SoC
+ * acceleration/offloading.
+ */
ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_PHY_SWAP);
- /* Lan 4-port switch attached to GMAC1 internal switch */
- ath79_init_mac(ath79_eth1_data.mac_addr, art + CR3000_MAC0_OFFSET, 0);
+ /* GMAC0 attached to PHY4 (port 5 of the internal switch) */
+ ath79_switch_data.phy4_mii_en = 1;
+ /* For switch carrier ignore port 5 (wan) */
+ ath79_switch_data.phy_poll_mask = 0x1;
+
+ /* Register MII bus */
+ ath79_register_mdio(1, 0x0);
+
+ /* GMAC0 attached to PHY4 (port 5 of the internal switch) */
+ ath79_switch_data.phy4_mii_en = 1;
+ ath79_switch_data.phy_poll_mask = 0x1;
+ /* LAN */
+ ath79_init_mac(ath79_eth1_data.mac_addr, art + CR3000_MAC0_OFFSET, 0);
ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
- ath79_eth1_data.speed = SPEED_1000;
- ath79_eth1_data.duplex = DUPLEX_FULL;
ath79_register_eth(1);
- ath79_init_mac(ath79_eth0_data.mac_addr, art + CR3000_MAC1_OFFSET, 0);
-
- /* WAN Fast Ethernet interface attached to GMAC0 */
- ath79_switch_data.phy4_mii_en = 1;
- ath79_switch_data.phy_poll_mask = BIT(0);
- ath79_eth0_data.phy_mask = BIT(0);
+ /* Wan */
+ ath79_init_mac(ath79_eth0_data.mac_addr, art + CR3000_MAC0_OFFSET, 1);
ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+ ath79_eth0_data.phy_mask = BIT(0);
ath79_eth0_data.mii_bus_dev = &ath79_mdio1_device.dev;
ath79_register_eth(0);
}