mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-09-26 18:16:26 +00:00
Merge branch 'DSA-DPAA'
Madalin Bucur says: ==================== adapt DPAA drivers for DSA Junote Cai reported that he was not able to get a DSA setup involving the DPAA/FMAN driver to work and narrowed it down to of_find_net_device_by_node() call in DSA setup. The initial attempt to fix this by adding of_node to the platform device results in a second, failed, probing of the FMan MAC driver against the new platform device created for the DPAA Ethernet driver. Solve these issues by removing the of_node pointer from the platform device and changing the net_dev dev to the of_device dev to ensure the DSA init will be able to find the DPAA net_dev using of_find_net_device_by_node(). Several changes were required to enable this solution: refactoring the adjust_link (also resulted in lesser, cleaner code) and renaming the fman kernel modules to keep the legacy udev rules happy. Changes in v2: - fix issue on error path in "dpaa_eth: change device used" patch - cleanup the dpaa_eth_probe() error paths Changes in v3: - remove obsolete comment in moved code - add explanation for module rename ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
54e6d7bee5
4 changed files with 115 additions and 177 deletions
Loading…
Add table
Add a link
Reference in a new issue