generic: fix adm6996 init

Kernel 3.14 added aditional genphy_soft_reset phy reset to phy_init_hw in drivers/net/phy/phy_device.c
Since adm6996 does in driver soft reset and doesn't use BMCR_RESET for soft reset
add dummy soft_reset callback to adm6996 driver, like it is done in ar8216.

This fixes ticket #20147

Signed-off-by: Andrej Vlasic <[email protected]>
SVN-Revision: 47272

diff --git a/target/linux/generic/files/drivers/net/phy/adm6996.c b/target/linux/generic/files/drivers/net/phy/adm6996.c
index bf5ed1593365f3bf557d448206ea7cadd63e77ba..cada4aa5db74092695f65ffa3348aed925c8d99c 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/adm6996.c
+++ b/target/linux/generic/files/drivers/net/phy/adm6996.c
@@ -1099,6 +1099,11 @@ static void adm6996_remove(struct phy_device *pdev)
                unregister_switch(&priv->dev);
 }
 
+static int adm6996_soft_reset(struct phy_device *phydev)
+{
+       /* we don't need an extra reset */
+       return 0;
+}
 
 static struct phy_driver adm6996_phy_driver = {
        .name           = "Infineon ADM6996",
@@ -1110,6 +1115,7 @@ static struct phy_driver adm6996_phy_driver = {
        .config_init    = &adm6996_config_init,
        .config_aneg    = &adm6996_config_aneg,
        .read_status    = &adm6996_read_status,
+       .soft_reset     = adm6996_soft_reset,
        .driver         = { .owner = THIS_MODULE,},
 };