aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2010-05-11 05:20:09 -0400
committerRalf Baechle <ralf@linux-mips.org>2010-05-21 16:31:22 -0400
commit9c1b013a3951671e219c32ca056fc07381a9e113 (patch)
tree225f47b9a7a8d00df23947b2a4524797b46061b1 /arch/mips
parent3e1bf29f73ccb31b99215476b0278f477db1a247 (diff)
MIPS: AR7: use ar7_has_high_vlynq() to determine watchdog base address
Instead of doing yet another switch/case on the chip_id, use existing inline function to set the watchdog base address. Signed-off-by: Florian Fainelli <florian@openwrt.org> To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1211/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/ar7/platform.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index 2fafc78e5ce1..1d4a466ccb6f 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -576,7 +576,6 @@ static int __init ar7_register_devices(void)
576{ 576{
577 void __iomem *bootcr; 577 void __iomem *bootcr;
578 u32 val; 578 u32 val;
579 u16 chip_id;
580 int res; 579 int res;
581 580
582 res = ar7_register_uarts(); 581 res = ar7_register_uarts();
@@ -635,18 +634,10 @@ static int __init ar7_register_devices(void)
635 val = readl(bootcr); 634 val = readl(bootcr);
636 iounmap(bootcr); 635 iounmap(bootcr);
637 if (val & AR7_WDT_HW_ENA) { 636 if (val & AR7_WDT_HW_ENA) {
638 chip_id = ar7_chip_id(); 637 if (ar7_has_high_vlynq())
639 switch (chip_id) {
640 case AR7_CHIP_7100:
641 case AR7_CHIP_7200:
642 ar7_wdt_res.start = AR7_REGS_WDT;
643 break;
644 case AR7_CHIP_7300:
645 ar7_wdt_res.start = UR8_REGS_WDT; 638 ar7_wdt_res.start = UR8_REGS_WDT;
646 break; 639 else
647 default: 640 ar7_wdt_res.start = AR7_REGS_WDT;
648 break;
649 }
650 641
651 ar7_wdt_res.end = ar7_wdt_res.start + 0x20; 642 ar7_wdt_res.end = ar7_wdt_res.start + 0x20;
652 res = platform_device_register(&ar7_wdt); 643 res = platform_device_register(&ar7_wdt);