summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@bootlin.com>2020-02-19 15:15:51 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2020-02-24 14:41:13 +0000
commit1e61a30b3cc71075ce3b06aa56924d305e2c427e (patch)
tree397a16a59792f4661fc6bd8951fa5dcfd9c21d4a /kernel
parente930c9e1a3ea2d61023b30d2161a7963b44f76a5 (diff)
net: macb: Properly handle phylink on at91rm9200
at91ether_init was handling the phy mode and speed but since the switch to phylink, the NCFGR register got overwritten by macb_mac_config(). The issue is that the RM9200_RMII bit and the MACB_CLK_DIV32 field are cleared but never restored as they conflict with the PAE, GBE and PCSSEL bits. Add new capability to differentiate between EMAC and the other versions of the IP and use it to set and avoid clearing the relevant bits. Also, this fixes a NULL pointer dereference in macb_mac_link_up as the EMAC doesn't use any rings/bufffers/queues. Fixes: 7897b071ac3b ("net: macb: convert to phylink") Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions