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

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: Marek 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: David S. Miller <davem@davemloft.net>

authored by

Marek Vasut and committed by
David S. Miller
510d573f 212ea99a

+13 -13
+1 -1
arch/arm/mach-mxs/mach-mxs.c
··· 261 261 enable_clk_enet_out(); 262 262 263 263 if (IS_BUILTIN(CONFIG_PHYLIB)) 264 - phy_register_fixup_for_uid(PHY_ID_KS8051, MICREL_PHY_ID_MASK, 264 + phy_register_fixup_for_uid(PHY_ID_KSZ8051, MICREL_PHY_ID_MASK, 265 265 apx4devkit_phy_fixup); 266 266 267 267 mxsfb_pdata.mode_list = apx4devkit_video_modes;
+9 -9
drivers/net/phy/micrel.c
··· 154 154 .config_intr = kszphy_config_intr, 155 155 .driver = { .owner = THIS_MODULE,}, 156 156 }, { 157 - .phy_id = PHY_ID_KS8041, 157 + .phy_id = PHY_ID_KSZ8041, 158 158 .phy_id_mask = 0x00fffff0, 159 - .name = "Micrel KS8041", 159 + .name = "Micrel KSZ8041", 160 160 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause 161 161 | SUPPORTED_Asym_Pause), 162 162 .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, ··· 167 167 .config_intr = kszphy_config_intr, 168 168 .driver = { .owner = THIS_MODULE,}, 169 169 }, { 170 - .phy_id = PHY_ID_KS8051, 170 + .phy_id = PHY_ID_KSZ8051, 171 171 .phy_id_mask = 0x00fffff0, 172 - .name = "Micrel KS8051", 172 + .name = "Micrel KSZ8051", 173 173 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause 174 174 | SUPPORTED_Asym_Pause), 175 175 .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, ··· 180 180 .config_intr = kszphy_config_intr, 181 181 .driver = { .owner = THIS_MODULE,}, 182 182 }, { 183 - .phy_id = PHY_ID_KS8001, 184 - .name = "Micrel KS8001 or KS8721", 183 + .phy_id = PHY_ID_KSZ8001, 184 + .name = "Micrel KSZ8001 or KS8721", 185 185 .phy_id_mask = 0x00ffffff, 186 186 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause), 187 187 .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, ··· 227 227 228 228 static struct mdio_device_id __maybe_unused micrel_tbl[] = { 229 229 { PHY_ID_KSZ9021, 0x000ffffe }, 230 - { PHY_ID_KS8001, 0x00ffffff }, 230 + { PHY_ID_KSZ8001, 0x00ffffff }, 231 231 { PHY_ID_KS8737, 0x00fffff0 }, 232 232 { PHY_ID_KSZ8021, 0x00ffffff }, 233 - { PHY_ID_KS8041, 0x00fffff0 }, 234 - { PHY_ID_KS8051, 0x00fffff0 }, 233 + { PHY_ID_KSZ8041, 0x00fffff0 }, 234 + { PHY_ID_KSZ8051, 0x00fffff0 }, 235 235 { } 236 236 }; 237 237
+3 -3
include/linux/micrel_phy.h
··· 6 6 #define PHY_ID_KSZ9021 0x00221610 7 7 #define PHY_ID_KS8737 0x00221720 8 8 #define PHY_ID_KSZ8021 0x00221555 9 - #define PHY_ID_KS8041 0x00221510 10 - #define PHY_ID_KS8051 0x00221550 9 + #define PHY_ID_KSZ8041 0x00221510 10 + #define PHY_ID_KSZ8051 0x00221550 11 11 /* both for ks8001 Rev. A/B, and for ks8721 Rev 3. */ 12 - #define PHY_ID_KS8001 0x0022161A 12 + #define PHY_ID_KSZ8001 0x0022161A 13 13 14 14 /* struct phy_device dev_flags definitions */ 15 15 #define MICREL_PHY_50MHZ_CLK 0x00000001