Re: [PATCH RFC 12/28] net: dsa: Make dsa,mii-bus optional

[Florian Fainelli]

Le 23/12/2015 04:56, Andrew Lunn a écrit :
> When all the switches are devices and register to the DSA framework,
> having a dsa,mii-bus property is not required.
> 
> Signed-off-by: Andrew Lunn 

Acked-by: Florian Fainelli 
-- 
Florian
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH RFC 12/28] net: dsa: Make dsa,mii-bus optional

[Andrew Lunn]

When all the switches are devices and register to the DSA framework,
having a dsa,mii-bus property is not required.

Signed-off-by: Andrew Lunn 
---
 Documentation/devicetree/bindings/net/dsa/dsa.txt |  3 ++-
 net/dsa/dsa.c | 26 +--
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.txt 
b/Documentation/devicetree/bindings/net/dsa/dsa.txt
index f99e5694a61f..625b2e5d8ae2 100644
--- a/Documentation/devicetree/bindings/net/dsa/dsa.txt
+++ b/Documentation/devicetree/bindings/net/dsa/dsa.txt
@@ -8,11 +8,12 @@ Required properties:
  Second cell is used only when cascading/chaining.
 - #size-cells  : Must be 0
 - dsa,ethernet : Should be a phandle to a valid Ethernet device node
-- dsa,mii-bus  : Should be a phandle to a valid MDIO bus device node
 
 Optional properties:
 - interrupts   : property with a value describing the switch
  interrupt number (not supported by the driver)
+- dsa,mii-bus  : Should be a phandle to a valid MDIO bus device node.
+ Required when not all switches are devices.
 
 A DSA node can contain multiple switch chips which are therefore child nodes of
 the parent DSA node. The maximum number of allowed child nodes is 4
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 8b89eece6b52..eca487dcc9fe 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -656,7 +656,7 @@ static int dsa_of_probe(struct device *dev, struct 
dsa_platform_data *pd)
 {
struct device_node *np = dev->of_node;
struct device_node *child, *chip, *mdio, *ethernet, *port;
-   struct mii_bus *mdio_bus, *mdio_bus_switch;
+   struct mii_bus *mdio_bus = NULL, *mdio_bus_switch;
struct net_device *ethernet_dev;
struct dsa_chip_data *cd;
const char *port_name;
@@ -669,12 +669,6 @@ static int dsa_of_probe(struct device *dev, struct 
dsa_platform_data *pd)
int ret = 0;
 
mdio = of_parse_phandle(np, "dsa,mii-bus", 0);
-   if (!mdio)
-   return -EINVAL;
-
-   mdio_bus = of_mdio_find_bus(mdio);
-   if (!mdio_bus)
-   return -EPROBE_DEFER;
 
ethernet = of_parse_phandle(np, "dsa,ethernet", 0);
if (!ethernet) {
@@ -706,11 +700,20 @@ static int dsa_of_probe(struct device *dev, struct 
dsa_platform_data *pd)
cd->of_node = child;
 
chip = of_parse_phandle(child, "switch", 0);
-   if (chip)
+   if (chip) {
cd->of_chip = chip;
+   } else {
+   if (!mdio)
+   return -EINVAL;
+
+   mdio_bus = of_mdio_find_bus(mdio);
+   if (!mdio_bus)
+   return -EPROBE_DEFER;
 
-   /* When assigning the host device, increment its refcount */
-   cd->host_dev = get_device(_bus->dev);
+   /* When assigning the host device, increment
+* its refcount */
+   cd->host_dev = get_device(_bus->dev);
+   }
 
sw_addr = of_get_property(child, "reg", NULL);
if (!sw_addr)
@@ -784,7 +787,8 @@ static int dsa_of_probe(struct device *dev, struct 
dsa_platform_data *pd)
 
/* The individual chips hold their own refcount on the mdio bus,
 * so drop ours */
-   put_device(_bus->dev);
+   if (mdio_bus)
+   put_device(_bus->dev);
 
return 0;
 
-- 
2.6.3

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html