From ff5148a1c870e927f98cc079f3bcd6449b00a3b0 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 11 May 2010 11:20:09 +0200
Subject: [PATCH] --- yaml --- r: 196792 b: refs/heads/master c:
 9c1b013a3951671e219c32ca056fc07381a9e113 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/arch/mips/ar7/platform.c | 15 +++------------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 64c358408001..5b2baca1cfaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3e1bf29f73ccb31b99215476b0278f477db1a247
+refs/heads/master: 9c1b013a3951671e219c32ca056fc07381a9e113
diff --git a/trunk/arch/mips/ar7/platform.c b/trunk/arch/mips/ar7/platform.c
index 2fafc78e5ce1..1d4a466ccb6f 100644
--- a/trunk/arch/mips/ar7/platform.c
+++ b/trunk/arch/mips/ar7/platform.c
@@ -576,7 +576,6 @@ static int __init ar7_register_devices(void)
 {
 	void __iomem *bootcr;
 	u32 val;
-	u16 chip_id;
 	int res;
 
 	res = ar7_register_uarts();
@@ -635,18 +634,10 @@ static int __init ar7_register_devices(void)
 	val = readl(bootcr);
 	iounmap(bootcr);
 	if (val & AR7_WDT_HW_ENA) {
-		chip_id = ar7_chip_id();
-		switch (chip_id) {
-		case AR7_CHIP_7100:
-		case AR7_CHIP_7200:
-			ar7_wdt_res.start = AR7_REGS_WDT;
-			break;
-		case AR7_CHIP_7300:
+		if (ar7_has_high_vlynq())
 			ar7_wdt_res.start = UR8_REGS_WDT;
-			break;
-		default:
-			break;
-		}
+		else
+			ar7_wdt_res.start = AR7_REGS_WDT;
 
 		ar7_wdt_res.end = ar7_wdt_res.start + 0x20;
 		res = platform_device_register(&ar7_wdt);