bcm53xx: use of_machine_is_compatible helper in b53 fix

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 45684
This commit is contained in:
Rafał Miłecki 2015-05-13 14:34:23 +00:00
parent afb98aea4d
commit af019cad56

View File

@ -1,30 +1,33 @@
From cd3c4317688caa967f6a1dfda36830ce2fa7059e Mon Sep 17 00:00:00 2001 From ec2ae8fc837772afd7a89f98c8a1ec71e2ab322b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com> From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
Date: Wed, 13 May 2015 14:13:28 +0200 Date: Wed, 13 May 2015 14:13:28 +0200
Subject: [PATCH] b53: add hacky CPU port fix for Netgear R8000 Subject: [PATCH] b53: add hacky CPU port fix for Netgear R8000
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--- ---
drivers/net/phy/b53/b53_common.c | 5 +++++ drivers/net/phy/b53/b53_common.c | 4 ++++
1 file changed, 5 insertions(+) 1 file changed, 4 insertions(+)
diff --git a/drivers/net/phy/b53/b53_common.c b/drivers/net/phy/b53/b53_common.c diff --git a/drivers/net/phy/b53/b53_common.c b/drivers/net/phy/b53/b53_common.c
index 2b05d5d..525103c 100644 index 2b05d5d..ba16107 100644
--- a/drivers/net/phy/b53/b53_common.c --- a/drivers/net/phy/b53/b53_common.c
+++ b/drivers/net/phy/b53/b53_common.c +++ b/drivers/net/phy/b53/b53_common.c
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/switch.h> #include <linux/switch.h>
#include <linux/platform_data/b53.h> #include <linux/platform_data/b53.h>
+#include <linux/of_fdt.h> +#include <linux/of.h>
#include "b53_regs.h" #include "b53_regs.h"
#include "b53_priv.h" #include "b53_priv.h"
@@ -1313,6 +1314,10 @@ static int b53_switch_init(struct b53_device *dev) @@ -1313,6 +1314,9 @@ static int b53_switch_init(struct b53_device *dev)
sw_dev->cpu_port = 5; sw_dev->cpu_port = 5;
} }
+ if (of_flat_dt_is_compatible(of_get_flat_dt_root(), + if (of_machine_is_compatible("netgear,r8000"))
+ "netgear,r8000"))
+ sw_dev->cpu_port = 8; + sw_dev->cpu_port = 8;
+ +
/* cpu port is always last */ /* cpu port is always last */