diff options
author | Christoph Muellner <christoph.muellner@theobroma-systems.com> | 2018-03-15 19:13:37 +0100 |
---|---|---|
committer | Christoph Muellner <christoph.muellner@theobroma-systems.com> | 2018-04-04 14:49:30 +0200 |
commit | 289b50696df036db1228d7247f8b8b743f3eda13 (patch) | |
tree | 541442c44e7e43a117d13a930a7cdb2684ba5431 /drivers/net/ethernet/apm/xgene/xgene_enet_main.c | |
parent | b39982cacc3799111fa617ec14928ee19d8490bd (diff) |
[noupstream] Add gryphon support.
* arm64: dts: apm: Add serial 1 to shadowcat.dts
* arm64: dts: Add apm-gryphon.dts
* drivers: xgene: Allow to run the ethernet controller in MAC-to-MAC mode.
Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
Diffstat (limited to 'drivers/net/ethernet/apm/xgene/xgene_enet_main.c')
-rw-r--r-- | drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index 3b889efddf78..029ec75e5498 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -1765,6 +1765,10 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata) return -ENODEV; } + ret = device_property_read_u32(dev, "mac-to-mac-speed", &pdata->mac_to_mac_speed); + if (ret) + pdata->mac_to_mac_speed = 0; + ret = xgene_get_tx_delay(pdata); if (ret) return ret; |