net: mdio-mux: add mdio_mux parameter to mdio_mux_init()

mdio_mux_init() use the parameter dev for two distinct thing:
1) Have a device for all devm_ functions
2) Get device_node from it

Since it is two distinct purpose, this patch add a parameter mdio_mux
that is linked to task 2.

This will also permit to register an of_node mdio-mux that lacks a direct
owning device.
For example a mdio-mux which is a subnode of a real device.

Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/mdio-mux-bcm-iproc.c b/drivers/net/phy/mdio-mux-bcm-iproc.c
index 0a5f62e0efccd0e6055c81d06c0f360788a114a1..0831b7142df7a334b889296688cc3218d8efa2a1 100644 (file)
--- a/drivers/net/phy/mdio-mux-bcm-iproc.c
+++ b/drivers/net/phy/mdio-mux-bcm-iproc.c
@@ -199,7 +199,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, md);
 
-       rc = mdio_mux_init(md->dev, mdio_mux_iproc_switch_fn,
+       rc = mdio_mux_init(md->dev, md->dev->of_node, mdio_mux_iproc_switch_fn,
                           &md->mux_handle, md, md->mii_bus);
        if (rc) {
                dev_info(md->dev, "mdiomux initialization failed\n");

diff --git a/drivers/net/phy/mdio-mux-gpio.c b/drivers/net/phy/mdio-mux-gpio.c
index 919949960a108bf7dcd8cc22856095b043a448d0..082ffef0dec4e31e6f92f7b11ad020a7b9a16376 100644 (file)
--- a/drivers/net/phy/mdio-mux-gpio.c
+++ b/drivers/net/phy/mdio-mux-gpio.c
@@ -54,7 +54,7 @@ static int mdio_mux_gpio_probe(struct platform_device *pdev)
        if (IS_ERR(s->gpios))
                return PTR_ERR(s->gpios);
 
-       r = mdio_mux_init(&pdev->dev,
+       r = mdio_mux_init(&pdev->dev, pdev->dev.of_node,
                          mdio_mux_gpio_switch_fn, &s->mux_handle, s, NULL);
 
        if (r != 0) {

diff --git a/drivers/net/phy/mdio-mux-mmioreg.c b/drivers/net/phy/mdio-mux-mmioreg.c
index c3825c7da0381aadd3096c7bca83eedefe407344..2573ab012f163ca02f14837f5f1af08d806c4fd3 100644 (file)
--- a/drivers/net/phy/mdio-mux-mmioreg.c
+++ b/drivers/net/phy/mdio-mux-mmioreg.c
@@ -159,7 +159,8 @@ static int mdio_mux_mmioreg_probe(struct platform_device *pdev)
                }
        }
 
-       ret = mdio_mux_init(&pdev->dev, mdio_mux_mmioreg_switch_fn,
+       ret = mdio_mux_init(&pdev->dev, pdev->dev.of_node,
+                           mdio_mux_mmioreg_switch_fn,
                            &s->mux_handle, s, NULL);
        if (ret) {
                dev_err(&pdev->dev, "failed to register mdio-mux bus %pOF\n",

diff --git a/drivers/net/phy/mdio-mux.c b/drivers/net/phy/mdio-mux.c
index 6f75e9f27fed26f7a74ef28044b158906fb85b51..0a86f1e4c02f59ac6fa4665dc3572009f60b779a 100644 (file)
--- a/drivers/net/phy/mdio-mux.c
+++ b/drivers/net/phy/mdio-mux.c
@@ -86,6 +86,7 @@ out:
 static int parent_count;
 
 int mdio_mux_init(struct device *dev,
+                 struct device_node *mux_node,
                  int (*switch_fn)(int cur, int desired, void *data),
                  void **mux_handle,
                  void *data,
@@ -98,11 +99,11 @@ int mdio_mux_init(struct device *dev,
        struct mdio_mux_parent_bus *pb;
        struct mdio_mux_child_bus *cb;
 
-       if (!dev->of_node)
+       if (!mux_node)
                return -ENODEV;
 
        if (!mux_bus) {
-               parent_bus_node = of_parse_phandle(dev->of_node,
+               parent_bus_node = of_parse_phandle(mux_node,
                                                   "mdio-parent-bus", 0);
 
                if (!parent_bus_node)
@@ -132,7 +133,7 @@ int mdio_mux_init(struct device *dev,
        pb->mii_bus = parent_bus;
 
        ret_val = -ENODEV;
-       for_each_available_child_of_node(dev->of_node, child_bus_node) {
+       for_each_available_child_of_node(mux_node, child_bus_node) {
                int v;
 
                r = of_property_read_u32(child_bus_node, "reg", &v);

diff --git a/include/linux/mdio-mux.h b/include/linux/mdio-mux.h
index 61f5b21b31c7782318c9cf6be916d96e91012747..a5d58f22193967d19d947b368fe3ae810079e0b5 100644 (file)
--- a/include/linux/mdio-mux.h
+++ b/include/linux/mdio-mux.h
@@ -12,7 +12,16 @@
 #include <linux/device.h>
 #include <linux/phy.h>
 
+/* mdio_mux_init() - Initialize a MDIO mux
+ * @dev                The device owning the MDIO mux
+ * @mux_node   The device node of the MDIO mux
+ * @switch_fn  The function called for switching target MDIO child
+ * mux_handle  A pointer to a (void *) used internaly by mdio-mux
+ * @data       Private data used by switch_fn()
+ * @mux_bus    An optional parent bus (Other case are to use parent_bus property)
+ */
 int mdio_mux_init(struct device *dev,
+                 struct device_node *mux_node,
                  int (*switch_fn) (int cur, int desired, void *data),
                  void **mux_handle,
                  void *data,