aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-09-23 12:58:50 -0400
committerDavid S. Miller <davem@davemloft.net>2012-09-24 15:54:33 -0400
commit510d573fefed904a136b220b259bf48d99d5e381 (patch)
tree7af965230f3691616be27c42fd6a5cc26de8d558 /drivers/net/phy
parent212ea99a85d30dbc834888384c57ad5abbc67a0a (diff)
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>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/micrel.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index e8e00dc087f1..2165d5fdb8c0 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -154,9 +154,9 @@ static struct phy_driver ksphy_driver[] = {
154 .config_intr = kszphy_config_intr, 154 .config_intr = kszphy_config_intr,
155 .driver = { .owner = THIS_MODULE,}, 155 .driver = { .owner = THIS_MODULE,},
156}, { 156}, {
157 .phy_id = PHY_ID_KS8041, 157 .phy_id = PHY_ID_KSZ8041,
158 .phy_id_mask = 0x00fffff0, 158 .phy_id_mask = 0x00fffff0,
159 .name = "Micrel KS8041", 159 .name = "Micrel KSZ8041",
160 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause 160 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause
161 | SUPPORTED_Asym_Pause), 161 | SUPPORTED_Asym_Pause),
162 .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, 162 .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
@@ -167,9 +167,9 @@ static struct phy_driver ksphy_driver[] = {
167 .config_intr = kszphy_config_intr, 167 .config_intr = kszphy_config_intr,
168 .driver = { .owner = THIS_MODULE,}, 168 .driver = { .owner = THIS_MODULE,},
169}, { 169}, {
170 .phy_id = PHY_ID_KS8051, 170 .phy_id = PHY_ID_KSZ8051,
171 .phy_id_mask = 0x00fffff0, 171 .phy_id_mask = 0x00fffff0,
172 .name = "Micrel KS8051", 172 .name = "Micrel KSZ8051",
173 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause 173 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause
174 | SUPPORTED_Asym_Pause), 174 | SUPPORTED_Asym_Pause),
175 .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, 175 .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
@@ -180,8 +180,8 @@ static struct phy_driver ksphy_driver[] = {
180 .config_intr = kszphy_config_intr, 180 .config_intr = kszphy_config_intr,
181 .driver = { .owner = THIS_MODULE,}, 181 .driver = { .owner = THIS_MODULE,},
182}, { 182}, {
183 .phy_id = PHY_ID_KS8001, 183 .phy_id = PHY_ID_KSZ8001,
184 .name = "Micrel KS8001 or KS8721", 184 .name = "Micrel KSZ8001 or KS8721",
185 .phy_id_mask = 0x00ffffff, 185 .phy_id_mask = 0x00ffffff,
186 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause), 186 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause),
187 .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, 187 .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
@@ -227,11 +227,11 @@ MODULE_LICENSE("GPL");
227 227
228static struct mdio_device_id __maybe_unused micrel_tbl[] = { 228static struct mdio_device_id __maybe_unused micrel_tbl[] = {
229 { PHY_ID_KSZ9021, 0x000ffffe }, 229 { PHY_ID_KSZ9021, 0x000ffffe },
230 { PHY_ID_KS8001, 0x00ffffff }, 230 { PHY_ID_KSZ8001, 0x00ffffff },
231 { PHY_ID_KS8737, 0x00fffff0 }, 231 { PHY_ID_KS8737, 0x00fffff0 },
232 { PHY_ID_KSZ8021, 0x00ffffff }, 232 { PHY_ID_KSZ8021, 0x00ffffff },
233 { PHY_ID_KS8041, 0x00fffff0 }, 233 { PHY_ID_KSZ8041, 0x00fffff0 },
234 { PHY_ID_KS8051, 0x00fffff0 }, 234 { PHY_ID_KSZ8051, 0x00fffff0 },
235 { } 235 { }
236}; 236};
237 237