Commit 510d573f authored by Marek Vasut's avatar Marek Vasut Committed by David S. Miller

phy/micrel: Rename KS80xx to KSZ80xx

There is no such part as KS8001, KS8041 or KS8051. There are only
KSZ8001, KSZ8041 and KSZ8051. Rename these parts as such to match
the Micrel naming.
Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Cc: David J. Choi <david.choi@micrel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Cc: Linux ARM kernel <linux-arm-kernel@lists.infradead.org>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 212ea99a
...@@ -261,7 +261,7 @@ static void __init apx4devkit_init(void) ...@@ -261,7 +261,7 @@ static void __init apx4devkit_init(void)
enable_clk_enet_out(); enable_clk_enet_out();
if (IS_BUILTIN(CONFIG_PHYLIB)) if (IS_BUILTIN(CONFIG_PHYLIB))
phy_register_fixup_for_uid(PHY_ID_KS8051, MICREL_PHY_ID_MASK, phy_register_fixup_for_uid(PHY_ID_KSZ8051, MICREL_PHY_ID_MASK,
apx4devkit_phy_fixup); apx4devkit_phy_fixup);
mxsfb_pdata.mode_list = apx4devkit_video_modes; mxsfb_pdata.mode_list = apx4devkit_video_modes;
......
...@@ -154,9 +154,9 @@ static struct phy_driver ksphy_driver[] = { ...@@ -154,9 +154,9 @@ static struct phy_driver ksphy_driver[] = {
.config_intr = kszphy_config_intr, .config_intr = kszphy_config_intr,
.driver = { .owner = THIS_MODULE,}, .driver = { .owner = THIS_MODULE,},
}, { }, {
.phy_id = PHY_ID_KS8041, .phy_id = PHY_ID_KSZ8041,
.phy_id_mask = 0x00fffff0, .phy_id_mask = 0x00fffff0,
.name = "Micrel KS8041", .name = "Micrel KSZ8041",
.features = (PHY_BASIC_FEATURES | SUPPORTED_Pause .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause
| SUPPORTED_Asym_Pause), | SUPPORTED_Asym_Pause),
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
...@@ -167,9 +167,9 @@ static struct phy_driver ksphy_driver[] = { ...@@ -167,9 +167,9 @@ static struct phy_driver ksphy_driver[] = {
.config_intr = kszphy_config_intr, .config_intr = kszphy_config_intr,
.driver = { .owner = THIS_MODULE,}, .driver = { .owner = THIS_MODULE,},
}, { }, {
.phy_id = PHY_ID_KS8051, .phy_id = PHY_ID_KSZ8051,
.phy_id_mask = 0x00fffff0, .phy_id_mask = 0x00fffff0,
.name = "Micrel KS8051", .name = "Micrel KSZ8051",
.features = (PHY_BASIC_FEATURES | SUPPORTED_Pause .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause
| SUPPORTED_Asym_Pause), | SUPPORTED_Asym_Pause),
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
...@@ -180,8 +180,8 @@ static struct phy_driver ksphy_driver[] = { ...@@ -180,8 +180,8 @@ static struct phy_driver ksphy_driver[] = {
.config_intr = kszphy_config_intr, .config_intr = kszphy_config_intr,
.driver = { .owner = THIS_MODULE,}, .driver = { .owner = THIS_MODULE,},
}, { }, {
.phy_id = PHY_ID_KS8001, .phy_id = PHY_ID_KSZ8001,
.name = "Micrel KS8001 or KS8721", .name = "Micrel KSZ8001 or KS8721",
.phy_id_mask = 0x00ffffff, .phy_id_mask = 0x00ffffff,
.features = (PHY_BASIC_FEATURES | SUPPORTED_Pause), .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause),
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
...@@ -227,11 +227,11 @@ MODULE_LICENSE("GPL"); ...@@ -227,11 +227,11 @@ MODULE_LICENSE("GPL");
static struct mdio_device_id __maybe_unused micrel_tbl[] = { static struct mdio_device_id __maybe_unused micrel_tbl[] = {
{ PHY_ID_KSZ9021, 0x000ffffe }, { PHY_ID_KSZ9021, 0x000ffffe },
{ PHY_ID_KS8001, 0x00ffffff }, { PHY_ID_KSZ8001, 0x00ffffff },
{ PHY_ID_KS8737, 0x00fffff0 }, { PHY_ID_KS8737, 0x00fffff0 },
{ PHY_ID_KSZ8021, 0x00ffffff }, { PHY_ID_KSZ8021, 0x00ffffff },
{ PHY_ID_KS8041, 0x00fffff0 }, { PHY_ID_KSZ8041, 0x00fffff0 },
{ PHY_ID_KS8051, 0x00fffff0 }, { PHY_ID_KSZ8051, 0x00fffff0 },
{ } { }
}; };
......
...@@ -6,10 +6,10 @@ ...@@ -6,10 +6,10 @@
#define PHY_ID_KSZ9021 0x00221610 #define PHY_ID_KSZ9021 0x00221610
#define PHY_ID_KS8737 0x00221720 #define PHY_ID_KS8737 0x00221720
#define PHY_ID_KSZ8021 0x00221555 #define PHY_ID_KSZ8021 0x00221555
#define PHY_ID_KS8041 0x00221510 #define PHY_ID_KSZ8041 0x00221510
#define PHY_ID_KS8051 0x00221550 #define PHY_ID_KSZ8051 0x00221550
/* both for ks8001 Rev. A/B, and for ks8721 Rev 3. */ /* both for ks8001 Rev. A/B, and for ks8721 Rev 3. */
#define PHY_ID_KS8001 0x0022161A #define PHY_ID_KSZ8001 0x0022161A
/* struct phy_device dev_flags definitions */ /* struct phy_device dev_flags definitions */
#define MICREL_PHY_50MHZ_CLK 0x00000001 #define MICREL_PHY_50MHZ_CLK 0x00000001
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment