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: 3607941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0908EBF418 for ; Fri, 7 Feb 2014 21:06:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3C741200CF for ; Fri, 7 Feb 2014 21:06:57 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4D680200F0 for ; Fri, 7 Feb 2014 21:06:56 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBsd1-0008E1-01; Fri, 07 Feb 2014 21:06:27 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBsY3-0007QV-O0; Fri, 07 Feb 2014 21:01:19 +0000 Received: from top.free-electrons.com ([176.31.233.9] helo=mail.free-electrons.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBsXs-0007Oh-Ev for linux-arm-kernel@lists.infradead.org; Fri, 07 Feb 2014 21:01:09 +0000 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.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140207_160108_626170_E3C2DD6A X-CRM114-Status: GOOD ( 10.32 ) X-Spam-Score: -1.8 (-) Cc: netdev@vger.kernel.org, Maxime Ripard , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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",}, {}, };