From: David S. Miller Date: Fri, 21 Nov 2014 19:09:01 +0000 (-0500) Subject: Merge branch 'phy_device_type' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d123cee2751836d82b170a293e86e7c7dfdd01e0;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'phy_device_type' Johan Hovold says: ==================== net: phy: add device-type abstraction This series adds device and device-type abstractions to the micrel driver, and enables support for RMII-reference clock selection for KSZ8081 and KSZ8091 devices. While adding support for more features for the Micrel PHYs mentioned above, it became apparent that the configuration space is much too large and that adding type-specific callbacks will simply not scale. Instead I added a driver_data field to struct phy_device, which can be used to store static device type data that can be parsed and acted on in generic driver callbacks. This allows a lot of duplicated code to be removed, and should make it much easier to add new features or deal with device-type quirks in the future. The series has been tested on a dual KSZ8081 setup. Further testing on other Micrel PHYs would be much appreciated. The recent commit a95a18afe4c8 ("phy/micrel: KSZ8031RNL RMII clock reconfiguration bug") currently prevents KSZ8031 PHYs from using the generic config-init. Bruno, who is the author of that patch, has agreed to test this series and some follow-up diagnostic patches to determine how best to incorporate these devices as well. I intend to send a follow-up patch that removes the custom 8031 config-init and documents this quirk, but the current series can be applied meanwhile. These patches are against net-next which contains some already merged prerequisite patches to the driver. ==================== Signed-off-by: David S. Miller --- d123cee2751836d82b170a293e86e7c7dfdd01e0