diff options
| author | Chuanhong Guo <gch981213@gmail.com> | 2018-12-15 15:44:34 +0800 |
|---|---|---|
| committer | Daniel Golle <daniel@makrotopia.org> | 2019-03-05 03:02:34 +0100 |
| commit | cea3e9e4383688f00ce5ef76c2b694aeead4c0ac (patch) | |
| tree | 3521133f1f96ce8d87336ab42664ff8fba632256 /target/linux/ath79/files/drivers | |
| parent | 596a5325cd7255faa94aa5e13ae97a6ee64f0bd2 (diff) | |
| download | upstream-cea3e9e4383688f00ce5ef76c2b694aeead4c0ac.tar.gz upstream-cea3e9e4383688f00ce5ef76c2b694aeead4c0ac.tar.bz2 upstream-cea3e9e4383688f00ce5ef76c2b694aeead4c0ac.zip | |
ath79: ag71xx: add support for optional mdio reset
On ar933x and later chips, there are separated mac/mdio resets, but
resetting the entire gmac block with register values requires both
mac_reset and mdio_reset to be asserted together.
Add support for optional mdio reset so that we can do a full reset
if needed.
This patch also replaced deprecated devm_reset_control_get for
mac reset.
To use this feature, the following is needed:
1. drop "simple-mfd" compatible to register mdio0 after gmac init
so that mdio registers aren't reset after initialization.
2. move mdio reset from mdio-bus to its parent eth node.
NOTE: This can't be applied on gmac1 with builtin switch since we
haven't add a feature to defer probe if phy connection failed.
Signed-off-by: Chuanhong Guo <gch981213@gmail.com>
Diffstat (limited to 'target/linux/ath79/files/drivers')
| -rw-r--r-- | target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h | 1 | ||||
| -rw-r--r-- | target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h index 9aac1998a8..fde9db3745 100644 --- a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h +++ b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h @@ -188,6 +188,7 @@ struct ag71xx { struct timer_list oom_timer; struct reset_control *mac_reset; + struct reset_control *mdio_reset; u32 fifodata[3]; u32 plldata[3]; diff --git a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c index bf9239163d..1f8c5b409b 100644 --- a/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c +++ b/target/linux/ath79/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c @@ -453,8 +453,12 @@ static void ag71xx_hw_init(struct ag71xx *ag) udelay(20); reset_control_assert(ag->mac_reset); + if (ag->mdio_reset) + reset_control_assert(ag->mdio_reset); msleep(100); reset_control_deassert(ag->mac_reset); + if (ag->mdio_reset) + reset_control_deassert(ag->mdio_reset); msleep(200); ag71xx_hw_setup(ag); @@ -1352,12 +1356,14 @@ static int ag71xx_probe(struct platform_device *pdev) AG71XX_DEFAULT_MSG_ENABLE); spin_lock_init(&ag->lock); - ag->mac_reset = devm_reset_control_get(&pdev->dev, "mac"); + ag->mac_reset = devm_reset_control_get_exclusive(&pdev->dev, "mac"); if (IS_ERR(ag->mac_reset)) { dev_err(&pdev->dev, "missing mac reset\n"); return PTR_ERR(ag->mac_reset); } + ag->mdio_reset = devm_reset_control_get_optional_exclusive(&pdev->dev, "mdio"); + if (of_property_read_u32_array(np, "fifo-data", ag->fifodata, 3)) { if (of_device_is_compatible(np, "qca,ar9130-eth") || of_device_is_compatible(np, "qca,ar7100-eth")) { |