From patchwork Tue Mar 3 19:39:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 5925711 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 671B99F820 for ; Tue, 3 Mar 2015 19:38:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A0EF22037A for ; Tue, 3 Mar 2015 19:38:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 C22F6203B4 for ; Tue, 3 Mar 2015 19:38:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YSscW-0001uJ-Jv; Tue, 03 Mar 2015 19:36:44 +0000 Received: from exprod5og111.obsmtp.com ([64.18.0.22] helo=mail-pd0-f176.google.com) by bombadil.infradead.org with smtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YSsbo-0001aP-U1 for linux-arm-kernel@lists.infradead.org; Tue, 03 Mar 2015 19:36:01 +0000 Received: from mail-pd0-f176.google.com ([209.85.192.176]) (using TLSv1) by exprod5ob111.postini.com ([64.18.4.12]) with SMTP ID DSNKVPYNCnc4oJScTZomOM3XorEHCA6bVXFo@postini.com; Tue, 03 Mar 2015 11:36:00 PST Received: by pdev10 with SMTP id v10so4330129pde.0 for ; Tue, 03 Mar 2015 11:35:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4DWGezCYRtM4YUhmUwDPVCuA4MzPI7Uxxdm747025/g=; b=f4NoZpjqqaZJDJLZfPvMGzGU3gV40+L/a4ftglXyBx9SkbkCQEBboYMuY+4B7wgX3e Bvt0hfP9sBmhaiVK747TOHUrFA9amvkc7fBbILppaom1ySaruUWpQdTrcRjref+o/++A k5+vQPsdwsaWgJhaXYhF20xNaYGekIUdMd3AkES+U3/KP7f4MG1xqpQ0eGFNX5Ln6ZAt OYaPOEqL1yX8wXJaTd+4yB1PqjOVIpBiuz5zinn0oBLFzBJLfWokUbWoUOjaWN/vfDpe S+dKbP/lr6brdnUY16zqIa6oOzaVXeSLwmSVuHHnj264So8f1p2Fszvw/4W0wAmA/jiY Vxow== X-Gm-Message-State: ALoCoQltlo6lCqS6uP9xau1VH8BNJkxhlGwjZYpS5hqyak1/rQtby8Kxnkd1JTmADM1kjb6d4bpTQfW0YqscLhwC102nQJ/Z7aqj9bqh/AtRzuF98zHsWrOYjJUoejKTL/V3L5u8gM8MHz9kPTv63px0+zXp+HjbzGhZHteEK0wEL+i6+jPvq1k= X-Received: by 10.68.206.101 with SMTP id ln5mr632996pbc.156.1425411338481; Tue, 03 Mar 2015 11:35:38 -0800 (PST) X-Received: by 10.68.206.101 with SMTP id ln5mr632990pbc.156.1425411338406; Tue, 03 Mar 2015 11:35:38 -0800 (PST) Received: from svdclab-13-11.amcc.com (67-207-112-226.static.wiline.com. [67.207.112.226]) by mx.google.com with ESMTPSA id kn5sm1757263pdb.42.2015.03.03.11.35.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 03 Mar 2015 11:35:37 -0800 (PST) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH v2 3/3] drivers: net: xgene: fix new firmware backward compatibility with older driver Date: Tue, 3 Mar 2015 11:39:41 -0800 Message-Id: <1425411581-25463-4-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1425411581-25463-1-git-send-email-isubramanian@apm.com> References: <1425411581-25463-1-git-send-email-isubramanian@apm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150303_113601_076132_5F45B94C X-CRM114-Status: UNSURE ( 9.31 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.3 (--) Cc: Keyur Chudgar , mlangsdo@redhat.com, patches@apm.com, linux-arm-kernel@lists.infradead.org, Iyappan Subramanian X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch fixes the backward compatibile of the older driver with the newer firmware by making the binding unique so that the older driver won't recognize the non-supported interfaces. Signed-off-by: Iyappan Subramanian Signed-off-by: Keyur Chudgar Tested-by: Mark Langsdorf --- drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index 4de62b2..635a83b 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c @@ -1025,6 +1025,8 @@ static int xgene_enet_remove(struct platform_device *pdev) #ifdef CONFIG_ACPI static const struct acpi_device_id xgene_enet_acpi_match[] = { { "APMC0D05", }, + { "APMC0D30", }, + { "APMC0D31", }, { } }; MODULE_DEVICE_TABLE(acpi, xgene_enet_acpi_match); @@ -1033,6 +1035,8 @@ MODULE_DEVICE_TABLE(acpi, xgene_enet_acpi_match); #ifdef CONFIG_OF static struct of_device_id xgene_enet_of_match[] = { {.compatible = "apm,xgene-enet",}, + {.compatible = "apm,xgene1-sgenet",}, + {.compatible = "apm,xgene1-xgenet",}, {}, };