From patchwork Fri Feb 7 20:57:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 318199 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AD0552C00A1 for ; Sat, 8 Feb 2014 08:00:48 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752847AbaBGVAp (ORCPT ); Fri, 7 Feb 2014 16:00:45 -0500 Received: from top.free-electrons.com ([176.31.233.9]:49810 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751689AbaBGVAn (ORCPT ); Fri, 7 Feb 2014 16:00:43 -0500 Received: by mail.free-electrons.com (Postfix, from userid 106) id 4FAAE7FE; Fri, 7 Feb 2014 22:00:45 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost (189.58.26.109.rev.sfr.net [109.26.58.189]) by mail.free-electrons.com (Postfix) with ESMTPSA id 61A4DAEF; Fri, 7 Feb 2014 22:00:04 +0100 (CET) From: Maxime Ripard To: davem@davemloft.net Cc: netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Maxime Ripard Subject: [PATCH 1/2] ethernet: sun4i: Drop the older compatibles Date: Fri, 7 Feb 2014 21:57:51 +0100 Message-Id: <1391806672-27846-1-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.8.4.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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",}, {}, };