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

phy: bcm-ns-usb3: add MDIO driver using proper bus layer

As USB 3.0 PHY is attached to the MDIO bus this module should provide a
MDIO driver and use a proper bus layer. This is a proper (cleaner)
solution which doesn't require code to know this specific MDIO bus
details. It also allows reusing the driver with other MDIO buses.

For now keep platform device support in place. We may consider dropping
it once MDIO bindings gets used "everywhere".

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

authored by

Rafał Miłecki and committed by
Kishon Vijay Abraham I
af850e14 91699e98

+105 -1
+1
drivers/phy/broadcom/Kconfig
··· 31 31 depends on ARCH_BCM_IPROC || COMPILE_TEST 32 32 depends on HAS_IOMEM && OF 33 33 select GENERIC_PHY 34 + select MDIO_DEVICE 34 35 help 35 36 Enable this to support Broadcom USB 3.0 PHY connected to the USB 36 37 controller on Northstar family.
+104 -1
drivers/phy/broadcom/phy-bcm-ns-usb3.c
··· 16 16 #include <linux/bcma/bcma.h> 17 17 #include <linux/delay.h> 18 18 #include <linux/err.h> 19 + #include <linux/mdio.h> 19 20 #include <linux/module.h> 21 + #include <linux/of_address.h> 20 22 #include <linux/of_platform.h> 21 23 #include <linux/platform_device.h> 22 24 #include <linux/phy/phy.h> ··· 54 52 enum bcm_ns_family family; 55 53 void __iomem *dmp; 56 54 void __iomem *ccb_mii; 55 + struct mdio_device *mdiodev; 57 56 struct phy *phy; 58 57 59 58 int (*phy_write)(struct bcm_ns_usb3 *usb3, u16 reg, u16 value); ··· 186 183 }; 187 184 188 185 /************************************************** 186 + * MDIO driver code 187 + **************************************************/ 188 + 189 + static int bcm_ns_usb3_mdiodev_phy_write(struct bcm_ns_usb3 *usb3, u16 reg, 190 + u16 value) 191 + { 192 + struct mdio_device *mdiodev = usb3->mdiodev; 193 + 194 + return mdiobus_write(mdiodev->bus, mdiodev->addr, reg, value); 195 + } 196 + 197 + static int bcm_ns_usb3_mdio_probe(struct mdio_device *mdiodev) 198 + { 199 + struct device *dev = &mdiodev->dev; 200 + const struct of_device_id *of_id; 201 + struct phy_provider *phy_provider; 202 + struct device_node *syscon_np; 203 + struct bcm_ns_usb3 *usb3; 204 + struct resource res; 205 + int err; 206 + 207 + usb3 = devm_kzalloc(dev, sizeof(*usb3), GFP_KERNEL); 208 + if (!usb3) 209 + return -ENOMEM; 210 + 211 + usb3->dev = dev; 212 + usb3->mdiodev = mdiodev; 213 + 214 + of_id = of_match_device(bcm_ns_usb3_id_table, dev); 215 + if (!of_id) 216 + return -EINVAL; 217 + usb3->family = (enum bcm_ns_family)of_id->data; 218 + 219 + syscon_np = of_parse_phandle(dev->of_node, "usb3-dmp-syscon", 0); 220 + err = of_address_to_resource(syscon_np, 0, &res); 221 + of_node_put(syscon_np); 222 + if (err) 223 + return err; 224 + 225 + usb3->dmp = devm_ioremap_resource(dev, &res); 226 + if (IS_ERR(usb3->dmp)) { 227 + dev_err(dev, "Failed to map DMP regs\n"); 228 + return PTR_ERR(usb3->dmp); 229 + } 230 + 231 + usb3->phy_write = bcm_ns_usb3_mdiodev_phy_write; 232 + 233 + usb3->phy = devm_phy_create(dev, NULL, &ops); 234 + if (IS_ERR(usb3->phy)) { 235 + dev_err(dev, "Failed to create PHY\n"); 236 + return PTR_ERR(usb3->phy); 237 + } 238 + 239 + phy_set_drvdata(usb3->phy, usb3); 240 + 241 + phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate); 242 + 243 + return PTR_ERR_OR_ZERO(phy_provider); 244 + } 245 + 246 + static struct mdio_driver bcm_ns_usb3_mdio_driver = { 247 + .mdiodrv = { 248 + .driver = { 249 + .name = "bcm_ns_mdio_usb3", 250 + .of_match_table = bcm_ns_usb3_id_table, 251 + }, 252 + }, 253 + .probe = bcm_ns_usb3_mdio_probe, 254 + }; 255 + 256 + /************************************************** 189 257 * Platform driver code 190 258 **************************************************/ 191 259 ··· 371 297 .of_match_table = bcm_ns_usb3_id_table, 372 298 }, 373 299 }; 374 - module_platform_driver(bcm_ns_usb3_driver); 300 + 301 + static int __init bcm_ns_usb3_module_init(void) 302 + { 303 + int err; 304 + 305 + /* 306 + * For backward compatibility we register as MDIO and platform driver. 307 + * After getting MDIO binding commonly used (e.g. switching all DT files 308 + * to use it) we should deprecate the old binding and eventually drop 309 + * support for it. 310 + */ 311 + 312 + err = mdio_driver_register(&bcm_ns_usb3_mdio_driver); 313 + if (err) 314 + return err; 315 + 316 + err = platform_driver_register(&bcm_ns_usb3_driver); 317 + if (err) 318 + mdio_driver_unregister(&bcm_ns_usb3_mdio_driver); 319 + 320 + return err; 321 + } 322 + module_init(bcm_ns_usb3_module_init); 323 + 324 + static void __exit bcm_ns_usb3_module_exit(void) 325 + { 326 + platform_driver_unregister(&bcm_ns_usb3_driver); 327 + mdio_driver_unregister(&bcm_ns_usb3_mdio_driver); 328 + } 329 + module_exit(bcm_ns_usb3_module_exit) 375 330 376 331 MODULE_LICENSE("GPL v2");