net: phy: sunxi: Add new compatibles

mripard · davem330 · commit efe205704fa8 · 2014-02-06T19:46:54.000-08:00
The Allwinner A10 compatibles were following a slightly different compatible
patterns than the rest of the SoCs for historical reasons. Add compatibles
matching the other pattern to the mdio driver for consistency, and keep the
older one for backward compatibility.

Signed-off-by: Maxime Ripard &lt;maxime.ripard@free-electrons.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt b/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt
@@ -1,15 +1,16 @@
 * Allwinner A10 MDIO Ethernet Controller interface
 
 Required properties:
-- compatible: should be "allwinner,sun4i-mdio".
+- compatible: should be "allwinner,sun4i-a10-mdio"
+              (Deprecated: "allwinner,sun4i-mdio").
 - reg: address and length of the register set for the device.
 
 Optional properties:
 - phy-supply: phandle to a regulator if the PHY needs one
 
 Example at the SoC level:
 mdio@01c0b080 {
-	compatible = "allwinner,sun4i-mdio";
+	compatible = "allwinner,sun4i-a10-mdio";
 	reg = <0x01c0b080 0x14>;
 	#address-cells = <1>;
 	#size-cells = <0>;
diff --git a/drivers/net/phy/mdio-sun4i.c b/drivers/net/phy/mdio-sun4i.c
@@ -170,6 +170,9 @@ static int sun4i_mdio_remove(struct platform_device *pdev)
 }
 
 static const struct of_device_id sun4i_mdio_dt_ids[] = {
+	{ .compatible = "allwinner,sun4i-a10-mdio" },
+
+	/* Deprecated */
 	{ .compatible = "allwinner,sun4i-mdio" },
 	{ }
 };

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,9 @@ static int sun4i_mdio_remove(struct platform_device *pdev)`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`static const struct of_device_id sun4i_mdio_dt_ids[] = {`
	`173`	`+ { .compatible = "allwinner,sun4i-a10-mdio" },`
	`174`	`+`
	`175`	`+ /* Deprecated */`
`173`	`176`	`{ .compatible = "allwinner,sun4i-mdio" },`
`174`	`177`	`{ }`
`175`	`178`	`};`