OSDN Git Service

Merge branch 'dsa-mv88e6xxx-post-refactor-fixes'
authorDavid S. Miller <davem@davemloft.net>
Mon, 14 Nov 2016 03:36:42 +0000 (22:36 -0500)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Nov 2016 03:36:42 +0000 (22:36 -0500)
commit5aad5b42bd4b8c067cdac153636db56b00ac874c
tree9f6b2fedc17e9e8804dfefb5dded2b2307ed87fe
parent63fb571ee50320191a3cc2c4634c9c9f918a2c44
parent94d66ae63151ab8db47fe468f5fe37a616f7bfeb
Merge branch 'dsa-mv88e6xxx-post-refactor-fixes'

Andrew Lunn says:

====================
dsa: mv88e6xxx: Fixes for port refactoring

The patches which refactored setting up the switch MACs introduced a
couple of regressions. The RGMII delays for a port can be set using
other mechanism than just phy-mode. Don't overwrite the delays unless
explicitly asked to. This broke my Armada 370 RD. Also, the mv88e6351
family supports setting RGMII delays, but is missing the necessary
entries in the ops structures to allow this.

These fixes are to patches currently in net-next. No need for stable
etc.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>