[PATCH 1/2] ethernet: sun4i: Drop the older compatibles

Maxime Ripard maxime.ripard at free-electrons.com
Fri Feb 7 15:57:51 EST 2014


The DT maintainers said it was OK to remove the older compatible pattern, since
we are still a moving target, users will have to update their DT either way.

Drop the older ethernet compatibles, to avoid maintaining legacy compatibles.

Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
---
 Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt | 3 +--
 drivers/net/ethernet/allwinner/sun4i-emac.c                    | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt b/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt
index 863d5b81..82f1571 100644
--- a/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt
+++ b/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt
@@ -1,8 +1,7 @@
 * Allwinner EMAC ethernet controller
 
 Required properties:
-- compatible: should be "allwinner,sun4i-a10-emac" (Deprecated:
-              "allwinner,sun4i-emac")
+- compatible: should be "allwinner,sun4i-a10-emac"
 - reg: address and length of the register set for the device.
 - interrupts: interrupt for the device
 - phy: A phandle to a phy node defining the PHY address (as the reg
diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c
index 6673106..04a9699 100644
--- a/drivers/net/ethernet/allwinner/sun4i-emac.c
+++ b/drivers/net/ethernet/allwinner/sun4i-emac.c
@@ -931,9 +931,6 @@ static int emac_resume(struct platform_device *dev)
 
 static const struct of_device_id emac_of_match[] = {
 	{.compatible = "allwinner,sun4i-a10-emac",},
-
-	/* Deprecated */
-	{.compatible = "allwinner,sun4i-emac",},
 	{},
 };
 
-- 
1.8.4.2




More information about the linux-arm-kernel mailing list