From 4878ad35123a4a56872ce0fb8cf9ba90282aeeb9 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Wed, 11 Jan 2017 16:59:14 +0100 Subject: net/phy: marvell: rename 88E1545 to 88E1540 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Linux driver calls it 88E1540 so do it here, too. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer --- drivers/net/phy/marvell.c | 4 ++-- include/linux/marvell_phy.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 9a963f6d5e..4bf8bae59a 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -266,9 +266,9 @@ static struct phy_driver marvell_phys[] = { .read_status = marvell_read_status, }, { - .phy_id = MARVELL_PHY_ID_88E1545, + .phy_id = MARVELL_PHY_ID_88E1540, .phy_id_mask = MARVELL_PHY_ID_MASK, - .drv.name = "Marvell 88E1545", + .drv.name = "Marvell 88E1540", .features = PHY_GBIT_FEATURES, .config_init = m88e1540_config_init, .config_aneg = genphy_config_aneg, diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h index b7baae137d..9e7c8b7596 100644 --- a/include/linux/marvell_phy.h +++ b/include/linux/marvell_phy.h @@ -27,8 +27,8 @@ #define MARVELL_PHY_ID_88E1318S 0x01410e90 #define MARVELL_PHY_ID_88E1116R 0x01410e40 #define MARVELL_PHY_ID_88E1510 0x01410dd0 +#define MARVELL_PHY_ID_88E1540 0x01410eb0 #define MARVELL_PHY_ID_88E1543 0x01410ea0 -#define MARVELL_PHY_ID_88E1545 0x01410eb0 /* Mask used for ID comparisons */ #define MARVELL_PHY_ID_MASK 0xfffffff0 -- cgit v1.2.3