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-05-15 18:37:28 +0200 |
| commit | 51803b4004e64ecba1e53ac766641934e32516e5 (patch) | |
| tree | ba7e776e582b7e259193778e997bc17407f7745e /drivers/net/ethernet/apm/xgene/xgene_enet_main.c | |
| parent | 24534b3511828c66215fdf1533d77a7bf2e1fdb2 (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; |