You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
58 lines
2.1 KiB
58 lines
2.1 KiB
11 years ago
|
From efe205704fa8435b7bca495138dd2dbd973e0c28 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
||
|
|
Date: Sun, 2 Feb 2014 14:49:12 +0100
|
||
|
|
Subject: [PATCH] net: phy: sunxi: Add new compatibles
|
||
|
|
|
||
|
|
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 <maxime.ripard@free-electrons.com>
|
||
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
|
|
---
|
||
|
|
Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt | 5 +++--
|
||
|
|
drivers/net/phy/mdio-sun4i.c | 3 +++
|
||
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt b/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt
|
||
|
|
index 00b9f9a..4ec5641 100644
|
||
|
|
--- a/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt
|
||
|
|
+++ b/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt
|
||
|
|
@@ -1,7 +1,8 @@
|
||
|
|
* 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:
|
||
|
|
@@ -9,7 +10,7 @@ Optional properties:
|
||
|
|
|
||
|
|
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
|
||
|
|
index bb88bc7..9367acc 100644
|
||
|
|
--- 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" },
|
||
|
|
{ }
|
||
|
|
};
|
||
|
|
--
|
||
|
|
1.8.5.5
|
||
|
|
|