Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

phy: Add Marvell 88E1510 phy ID

Add support for this new phy ID.

Signed-off-by: Rick Hoover <RHoover@digilentinc.com>
Signed-off-by: Steven Wang <steven.wang@digilentinc.com>
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Michal Simek and committed by
David S. Miller
10e24caa 3da09a51

+26
+25
drivers/net/phy/marvell.c
··· 374 374 return m88e1121_config_aneg(phydev); 375 375 } 376 376 377 + static int m88e1510_config_aneg(struct phy_device *phydev) 378 + { 379 + int err; 380 + 381 + err = m88e1318_config_aneg(phydev); 382 + if (err < 0) 383 + return err; 384 + 385 + return marvell_of_reg_init(phydev); 386 + } 387 + 377 388 static int m88e1116r_config_init(struct phy_device *phydev) 378 389 { 379 390 int temp; ··· 1015 1004 .config_intr = &marvell_config_intr, 1016 1005 .driver = { .owner = THIS_MODULE }, 1017 1006 }, 1007 + { 1008 + .phy_id = MARVELL_PHY_ID_88E1510, 1009 + .phy_id_mask = MARVELL_PHY_ID_MASK, 1010 + .name = "Marvell 88E1510", 1011 + .features = PHY_GBIT_FEATURES, 1012 + .flags = PHY_HAS_INTERRUPT, 1013 + .config_aneg = &m88e1510_config_aneg, 1014 + .read_status = &marvell_read_status, 1015 + .ack_interrupt = &marvell_ack_interrupt, 1016 + .config_intr = &marvell_config_intr, 1017 + .did_interrupt = &m88e1121_did_interrupt, 1018 + .driver = { .owner = THIS_MODULE }, 1019 + }, 1018 1020 }; 1019 1021 1020 1022 static int __init marvell_init(void) ··· 1056 1032 { MARVELL_PHY_ID_88E1240, MARVELL_PHY_ID_MASK }, 1057 1033 { MARVELL_PHY_ID_88E1318S, MARVELL_PHY_ID_MASK }, 1058 1034 { MARVELL_PHY_ID_88E1116R, MARVELL_PHY_ID_MASK }, 1035 + { MARVELL_PHY_ID_88E1510, MARVELL_PHY_ID_MASK }, 1059 1036 { } 1060 1037 }; 1061 1038
+1
include/linux/marvell_phy.h
··· 15 15 #define MARVELL_PHY_ID_88E1240 0x01410e30 16 16 #define MARVELL_PHY_ID_88E1318S 0x01410e90 17 17 #define MARVELL_PHY_ID_88E1116R 0x01410e40 18 + #define MARVELL_PHY_ID_88E1510 0x01410dd0 18 19 19 20 /* struct phy_device dev_flags definitions */ 20 21 #define MARVELL_PHY_M1145_FLAGS_RESISTANCE 0x00000001