From: David S. Miller Date: Wed, 18 Oct 2017 12:44:47 +0000 (+0100) Subject: Merge branch 'DSA-DPAA' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=54e6d7bee50f1395fc8fd772259c2f765fd7266d;p=linux.git 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 --- 54e6d7bee50f1395fc8fd772259c2f765fd7266d