ARM: ep93xx: tidy up TS-72xx Watchdog resources

The ts-72xx watchdog uses two byte sized registers. Tidy up the resource
declaration so that the proper information is shown in /proc/iomem.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index 8745162ec05d3a887f940ecd84a0d90d2e736eca..eb9be7ef59fce1c490bb2b1baec09381805164a0 100644 (file)
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -186,24 +186,22 @@ static struct platform_device ts72xx_rtc_device = {
        .num_resources  = ARRAY_SIZE(ts72xx_rtc_resources),
 };
 
+/*************************************************************************
+ * Watchdog (in CPLD)
+ *************************************************************************/
+#define TS72XX_WDT_CONTROL_PHYS_BASE   (EP93XX_CS2_PHYS_BASE + 0x03800000)
+#define TS72XX_WDT_FEED_PHYS_BASE      (EP93XX_CS2_PHYS_BASE + 0x03c00000)
+
 static struct resource ts72xx_wdt_resources[] = {
-       {
-               .start  = TS72XX_WDT_CONTROL_PHYS_BASE,
-               .end    = TS72XX_WDT_CONTROL_PHYS_BASE + SZ_4K - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       {
-               .start  = TS72XX_WDT_FEED_PHYS_BASE,
-               .end    = TS72XX_WDT_FEED_PHYS_BASE + SZ_4K - 1,
-               .flags  = IORESOURCE_MEM,
-       },
+       DEFINE_RES_MEM(TS72XX_WDT_CONTROL_PHYS_BASE, 0x01),
+       DEFINE_RES_MEM(TS72XX_WDT_FEED_PHYS_BASE, 0x01),
 };
 
 static struct platform_device ts72xx_wdt_device = {
        .name           = "ts72xx-wdt",
        .id             = -1,
-       .num_resources  = ARRAY_SIZE(ts72xx_wdt_resources),
        .resource       = ts72xx_wdt_resources,
+       .num_resources  = ARRAY_SIZE(ts72xx_wdt_resources),
 };
 
 static struct ep93xx_eth_data __initdata ts72xx_eth_data = {

diff --git a/arch/arm/mach-ep93xx/ts72xx.h b/arch/arm/mach-ep93xx/ts72xx.h
index 2255ba29fdd64d4bdc3102a69869184972a31f60..4e6519b2a3c46924278ca281f03aadd4819b7f7f 100644 (file)
--- a/arch/arm/mach-ep93xx/ts72xx.h
+++ b/arch/arm/mach-ep93xx/ts72xx.h
@@ -38,9 +38,6 @@
 #define TS72XX_OPTIONS2_TS9420         0x04
 #define TS72XX_OPTIONS2_TS9420_BOOT    0x02
 
-#define TS72XX_WDT_CONTROL_PHYS_BASE   0x23800000
-#define TS72XX_WDT_FEED_PHYS_BASE      0x23c00000
-
 #ifndef __ASSEMBLY__
 
 static inline int ts72xx_model(void)