m68knommu: remove unused CONFIG_DISKtel symbol

[linux-2.6-omap-h63xx.git] / include / asm-m68knommu / mcfuart.h

diff --git a/include/asm-m68knommu/mcfuart.h b/include/asm-m68knommu/mcfuart.h
index b016fad83119a9b7cdfea60b51dd59a9ee43fc6f..1319a81814b15cb840f61987fc37842145b58668 100644 (file)
--- a/include/asm-m68knommu/mcfuart.h
+++ b/include/asm-m68knommu/mcfuart.h
@@ -12,8 +12,6 @@
 #define        mcfuart_h
 /****************************************************************************/
 
-#include <linux/config.h>
-
 /*
  *     Define the base address of the UARTS within the MBAR address
  *     space.
@@ -34,7 +32,7 @@
 #define MCFUART_BASE2          0x240           /* Base address of UART2 */
 #define MCFUART_BASE3          0x280           /* Base address of UART3 */
 #elif defined(CONFIG_M5249) || defined(CONFIG_M5307) || defined(CONFIG_M5407)
-#if defined(CONFIG_NETtel) || defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3)
+#if defined(CONFIG_NETtel) || defined(CONFIG_SECUREEDGEMP3)
 #define MCFUART_BASE1          0x200           /* Base address of UART1 */
 #define MCFUART_BASE2          0x1c0           /* Base address of UART2 */
 #else
@@ -45,9 +43,23 @@
 #define MCFUART_BASE1          0x60000         /* Base address of UART1 */
 #define MCFUART_BASE2          0x64000         /* Base address of UART2 */
 #define MCFUART_BASE3          0x68000         /* Base address of UART2 */
+#elif defined(CONFIG_M532x)
+#define MCFUART_BASE1          0xfc060000      /* Base address of UART1 */
+#define MCFUART_BASE2          0xfc064000      /* Base address of UART2 */
+#define MCFUART_BASE3          0xfc068000      /* Base address of UART3 */
 #endif
 
 
+#include <linux/serial_core.h>
+#include <linux/platform_device.h>
+
+struct mcf_platform_uart {
+       unsigned long   mapbase;        /* Physical address base */
+       void __iomem    *membase;       /* Virtual address if mapped */
+       unsigned int    irq;            /* Interrupt vector */
+       unsigned int    uartclk;        /* UART clock rate */
+};
+
 /*
  *     Define the ColdFire UART register set addresses.
  */