diff mbox

[2/7,trusty,SRU] (upstream) drivers: net: xgene: fix new firmware backward compatibility with older driver

Message ID 1432327761-10496-3-git-send-email-craig.magina@canonical.com
State New
Headers show

Commit Message

Craig Magina May 22, 2015, 8:49 p.m. UTC 
From: Iyappan Subramanian <isubramanian@apm.com>

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.

BugLink: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1458042

Signed-off-by: Iyappan Subramanian <isubramanian@apm.com>
Signed-off-by: Keyur Chudgar <kchudgar@apm.com>
Tested-by: Mark Langsdorf <mlangsdo@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit ecadf4e71de079d4050f249547d25b3bd333f89f)
Signed-off-by: Phong Vo <pvo@apm.com>
Signed-off-by: Craig Magina <craig.magina@canonical.com>

Conflicts:
	drivers/net/ethernet/apm/xgene/xgene_enet_main.c
---
 drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 ++
 1 file changed, 2 insertions(+)
diff mbox

Patch

diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
index 49788e3..a8a27b3 100644
--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -979,6 +979,8 @@  static int xgene_enet_remove(struct platform_device *pdev)
 
 static struct of_device_id xgene_enet_match[] = {
 	{.compatible = "apm,xgene-enet",},
+	{.compatible = "apm,xgene1-sgenet",},
+	{.compatible = "apm,xgene1-xgenet",},
 	{},
 };