From patchwork Fri Feb 27 20:08:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iyappan Subramanian X-Patchwork-Id: 5903141 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 2BE669F37F for ; Fri, 27 Feb 2015 20:07:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 64E552025B for ; Fri, 27 Feb 2015 20:07:56 +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 7EF2F200D4 for ; Fri, 27 Feb 2015 20:07:55 +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 1YRRAI-0006ga-6s; Fri, 27 Feb 2015 20:05:38 +0000 Received: from exprod5og104.obsmtp.com ([64.18.0.178] helo=mail-pa0-f48.google.com) by bombadil.infradead.org with smtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YRR9S-0004pX-CS for linux-arm-kernel@lists.infradead.org; Fri, 27 Feb 2015 20:04:47 +0000 Received: from mail-pa0-f48.google.com ([209.85.220.48]) (using TLSv1) by exprod5ob104.postini.com ([64.18.4.12]) with SMTP ID DSNKVPDNzMQLGDX/VQJQ9bT0qmPIA86XiH/j@postini.com; Fri, 27 Feb 2015 12:04:46 PST Received: by pabrd3 with SMTP id rd3so25197105pab.4 for ; Fri, 27 Feb 2015 12:04:27 -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=QmJUHpNs5hKLuDlRRVsZhqexV2mtlr42urzhqrmUT1cI4xGqjOyHJXdhCavVeDs4x4 uoSWxD7q6AiPm8J7ZcMXqqk64PQOhyJn45c2E1L4yJb8vzo2Xg2F2Yglje75Phitsx1l +Z5c/b8TbqH6ZZSHNf21eRJmudZKlUXht6Mxqa6X6Vu7ehtaqnpX/pAvMD8xQ0ha+T09 SMvqdvEKfV7i2/lWYZ2lK+tjRggJWDc/JG+rDwNwFF2zyIIONwVWTwZmZZ3adgx1X/Hl uJ0fJZcm5DDLJ735VwS5lux3pgNDCd7n8CP+GjMxhIM9MfQ17hPnhJLwr0erYn7SZZEO OCWg== X-Gm-Message-State: ALoCoQm55xrDmsUhGCZuf5mZD+eL5sL7Q2RRn0EgNFvyTlPM3bIE01lpD6tpsZI5bbviHuixkT7Bl/rUBbALned9VJWE7k9vBP67DILglbfcEottcL+xCd29A0iFcCn2DFFkURqj7vvRVKvw8M2YRKjQinFFLHm8Q2Q7TQCs8x4/CkAbIkYdjvc= X-Received: by 10.68.211.228 with SMTP id nf4mr27051350pbc.66.1425067467841; Fri, 27 Feb 2015 12:04:27 -0800 (PST) X-Received: by 10.68.211.228 with SMTP id nf4mr27051324pbc.66.1425067467722; Fri, 27 Feb 2015 12:04:27 -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 g10sm4793926pdo.26.2015.02.27.12.04.26 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Feb 2015 12:04:26 -0800 (PST) From: Iyappan Subramanian To: davem@davemloft.net, netdev@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 3/3] drivers: net: xgene: fix new firmware backward compatibility with older driver Date: Fri, 27 Feb 2015 12:08:30 -0800 Message-Id: <1425067710-14879-4-git-send-email-isubramanian@apm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1425067710-14879-1-git-send-email-isubramanian@apm.com> References: <1425067710-14879-1-git-send-email-isubramanian@apm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150227_120446_502918_D2B6320A X-CRM114-Status: UNSURE ( 9.09 ) 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",}, {}, };