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

Pull m68knommu updates from Greg Ungerer:
 "The bulk of the changes are generalizing the ColdFire v3 core support
  and adding in 537x CPU support.  Also a couple of other bug fixes, one
  to fix a reintroduction of a past bug in the romfs filesystem nommu
  support."

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68knommu: enable Timer on coldfire 532x
  m68knommu: fix ColdFire 5373/5329 QSPI base address
  m68knommu: add support for configuring a Freescale M5373EVB board
  m68knommu: add support for the ColdFire 537x family of CPUs
  m68knommu: make ColdFire M532x platform support more v3 generic
  m68knommu: create and use a common M53xx ColdFire class of CPUs
  m68k: remove unused asm/dbg.h
  m68k: Set ColdFire ACR1 cache mode depending on kernel configuration
  romfs: fix nommu map length to keep inside filesystem
  m68k: clean up unused "config ROMVECSIZE"

diff --combined arch/m68k/Kconfig.cpu
index d266787725b468ab94286aeb3e7cca62698c5d6c,2debb5519b695c1d45bfeabe3da9fd229136a745..33013dfcd3e1d58fb0b0f3495ce1956c76233340
--- 1/arch/m68k/Kconfig.cpu
--- 2/arch/m68k/Kconfig.cpu
+++ b/arch/m68k/Kconfig.cpu
@@@ -22,7 -22,8 +22,7 @@@ config M68KCLASSI
  
  config COLDFIRE
        bool "Coldfire CPU family support"
 -      select GENERIC_GPIO
 -      select ARCH_WANT_OPTIONAL_GPIOLIB
 +      select ARCH_REQUIRE_GPIOLIB
        select ARCH_HAVE_CUSTOM_GPIO_H
        select CPU_HAS_NO_BITFIELDS
        select CPU_HAS_NO_MULDIV64
@@@ -223,13 -224,25 +223,25 @@@ config M530
        help
          Motorola ColdFire 5307 processor support.
  
+ config M53xx
+       bool
+ 
  config M532x
        bool "MCF532x"
        depends on !MMU
+       select M53xx
        select HAVE_CACHE_CB
        help
          Freescale (Motorola) ColdFire 532x processor support.
  
+ config M537x
+       bool "MCF537x"
+       depends on !MMU
+       select M53xx
+       select HAVE_CACHE_CB
+       help
+         Freescale ColdFire 537x processor support.
+ 
  config M5407
        bool "MCF5407"
        depends on !MMU

diff --combined drivers/tty/serial/68328serial.c
index ef2e08e9b5901fdd9267a66896da10f829f931ac,208c411393d89eb658e1365d448262a15dfc4215..5dc9c4bfa66e4686d5360ab33da61eff1109715a
--- 1/drivers/tty/serial/68328serial.c
--- 2/drivers/tty/serial/68328serial.c
+++ b/drivers/tty/serial/68328serial.c
@@@ -14,7 -14,6 +14,6 @@@
   * 2.4/2.5 port                 David McCullough
   */
  
- #include <asm/dbg.h>
  #include <linux/module.h>
  #include <linux/errno.h>
  #include <linux/serial.h>
@@@ -630,7 -629,8 +629,7 @@@ static void rs_flush_chars(struct tty_s
        /* Enable transmitter */
        local_irq_save(flags);
  
 -      if (info->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
 -                      !info->xmit_buf) {
 +      if (info->xmit_cnt <= 0 || tty->stopped || !info->xmit_buf) {
                local_irq_restore(flags);
                return;
        }
@@@ -696,7 -696,7 +695,7 @@@ static int rs_write(struct tty_struct 
                total += c;
        }
  
 -      if (info->xmit_cnt && !tty->stopped && !tty->hw_stopped) {
 +      if (info->xmit_cnt && !tty->stopped) {
                /* Enable transmitter */
                local_irq_disable();            
  #ifndef USE_INTS
@@@ -977,8 -977,10 +976,8 @@@ static void rs_set_termios(struct tty_s
        change_speed(info, tty);
  
        if ((old_termios->c_cflag & CRTSCTS) &&
 -          !(tty->termios.c_cflag & CRTSCTS)) {
 -              tty->hw_stopped = 0;
 +          !(tty->termios.c_cflag & CRTSCTS))
                rs_start(tty);
 -      }
        
  }