Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu arch updates from Greg Ungerer:
 "Most of it is a cleanup of the ColdFire hardware header files.  We
  have had a few occurrances of bugs caused by inconsistent definitions
  of peripheral addresses.  These patches make them all consistent, and
  also clean out a bunch of old crap.  Overall we remove about 1000
  lines."

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (27 commits)
  m68knommu: fix inconsistent formating in ColdFire 5407 definitions
  m68knommu: fix inconsistent formating in ColdFire 5307 definitions
  m68knommu: fix inconsistent formating in ColdFire 527x definitions
  m68knommu: fix inconsistent formating in ColdFire 5272 definitions
  m68knommu: fix inconsistent formating in ColdFire 523x definitions
  m68knommu: clean up ColdFire 54xx General Timer definitions
  m68knommu: clean up Pin Assignment definitions for the 54xx ColdFire CPU
  m68knommu: fix multi-function pin setup for FEC module on ColdFire 523x
  m68knommu: move ColdFire slice timer address defiens to 54xx header
  m68knommu: use read/write IO access functions in ColdFire m532x setup code
  m68knommu: modify ColdFire 532x GPIO register definitions to be consistent
  m68knommu: remove a lot of unsed definitions for 532x ColdFire
  m68knommu: use definitions for the ColdFire 528x FEC multi-function pins
  m68knommu: remove address offsets relative to IPSBAR for ColdFire 527x
  m68knommu: remove unused ColdFire 5282 register definitions
  m68knommu: fix wrong register offsets used for ColdFire 5272 multi-function pins
  m68knommu: make ColdFire 5249 MBAR2 register definitions absolute addresses
  m68knommu: make remaining ColdFire 5272 register definitions absolute addresses
  m68knommu: make ColdFire Park and Assignment register definitions absolute addresses
  m68knommu: make ColdFire Chip Select register definitions absolute addresses
  ...

1 files changed, 10 insertions, 11 deletions

diff --git a/drivers/watchdog/m54xx_wdt.c b/drivers/watchdog/m54xx_wdt.c
index 663cad86c63..173494a681e 100644
--- a/drivers/watchdog/m54xx_wdt.c
+++ b/drivers/watchdog/m54xx_wdt.c
@@ -46,17 +46,17 @@ static void wdt_enable(void)
         unsigned int gms0;
 
         /* preserve GPIO usage, if any */
-        gms0 = __raw_readl(MCF_MBAR + MCF_GPT_GMS0);
+        gms0 = __raw_readl(MCF_GPT_GMS0);
         if (gms0 & MCF_GPT_GMS_TMS_GPIO)
                 gms0 &= (MCF_GPT_GMS_TMS_GPIO | MCF_GPT_GMS_GPIO_MASK
                                                         | MCF_GPT_GMS_OD);
         else
                 gms0 = MCF_GPT_GMS_TMS_GPIO | MCF_GPT_GMS_OD;
-        __raw_writel(gms0, MCF_MBAR + MCF_GPT_GMS0);
+        __raw_writel(gms0, MCF_GPT_GMS0);
         __raw_writel(MCF_GPT_GCIR_PRE(heartbeat*(MCF_BUSCLK/0xffff)) |
-                        MCF_GPT_GCIR_CNT(0xffff), MCF_MBAR + MCF_GPT_GCIR0);
+                        MCF_GPT_GCIR_CNT(0xffff), MCF_GPT_GCIR0);
         gms0 |= MCF_GPT_GMS_OCPW(0xA5) | MCF_GPT_GMS_WDEN | MCF_GPT_GMS_CE;
-        __raw_writel(gms0, MCF_MBAR + MCF_GPT_GMS0);
+        __raw_writel(gms0, MCF_GPT_GMS0);
 }
 
 static void wdt_disable(void)
@@ -64,18 +64,18 @@ static void wdt_disable(void)
         unsigned int gms0;
 
         /* disable watchdog */
-        gms0 = __raw_readl(MCF_MBAR + MCF_GPT_GMS0);
+        gms0 = __raw_readl(MCF_GPT_GMS0);
         gms0 &= ~(MCF_GPT_GMS_WDEN | MCF_GPT_GMS_CE);
-        __raw_writel(gms0, MCF_MBAR + MCF_GPT_GMS0);
+        __raw_writel(gms0, MCF_GPT_GMS0);
 }
 
 static void wdt_keepalive(void)
 {
         unsigned int gms0;
 
-        gms0 = __raw_readl(MCF_MBAR + MCF_GPT_GMS0);
+        gms0 = __raw_readl(MCF_GPT_GMS0);
         gms0 |= MCF_GPT_GMS_OCPW(0xA5);
-        __raw_writel(gms0, MCF_MBAR + MCF_GPT_GMS0);
+        __raw_writel(gms0, MCF_GPT_GMS0);
 }
 
 static int m54xx_wdt_open(struct inode *inode, struct file *file)
@@ -195,8 +195,7 @@ static struct miscdevice m54xx_wdt_miscdev = {
 
 static int __init m54xx_wdt_init(void)
 {
-        if (!request_mem_region(MCF_MBAR + MCF_GPT_GCIR0, 4,
-                                                "Coldfire M54xx Watchdog")) {
+        if (!request_mem_region(MCF_GPT_GCIR0, 4, "Coldfire M54xx Watchdog")) {
                 pr_warn("I/O region busy\n");
                 return -EBUSY;
         }
@@ -208,7 +207,7 @@ static int __init m54xx_wdt_init(void)
 static void __exit m54xx_wdt_exit(void)
 {
         misc_deregister(&m54xx_wdt_miscdev);
-        release_mem_region(MCF_MBAR + MCF_GPT_GCIR0, 4);
+        release_mem_region(MCF_GPT_GCIR0, 4);
 }
 
 module_init(m54xx_wdt_init);