linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / serial / cpm_uart / cpm_uart.h

diff --git a/drivers/serial/cpm_uart/cpm_uart.h b/drivers/serial/cpm_uart/cpm_uart.h
index a8f894c..73c8a08 100644 (file)
--- a/drivers/serial/cpm_uart/cpm_uart.h
+++ b/drivers/serial/cpm_uart/cpm_uart.h
@@ -5,19 +5,11 @@
  *
  *  Copyright (C) 2004 Freescale Semiconductor, Inc.
  *
- *  2006 (c) MontaVista Software, Inc.
- *     Vitaly Bordug <vbordug@ru.mvista.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- *
  */
 #ifndef CPM_UART_H
 #define CPM_UART_H
 
-#include <linux/platform_device.h>
-#include <linux/fs_uart_pd.h>
+#include <linux/config.h>
 
 #if defined(CONFIG_CPM2)
 #include "cpm_uart_cpm2.h"
@@ -34,14 +26,14 @@
 #define FLAG_SMC       0x00000002
 #define FLAG_CONSOLE   0x00000001
 
-#define UART_SMC1      fsid_smc1_uart
-#define UART_SMC2      fsid_smc2_uart
-#define UART_SCC1      fsid_scc1_uart
-#define UART_SCC2      fsid_scc2_uart
-#define UART_SCC3      fsid_scc3_uart
-#define UART_SCC4      fsid_scc4_uart
+#define UART_SMC1      0
+#define UART_SMC2      1
+#define UART_SCC1      2
+#define UART_SCC2      3
+#define UART_SCC3      4
+#define UART_SCC4      5
 
-#define UART_NR                fs_uart_nr
+#define UART_NR        6
 
 #define RX_NUM_FIFO    4
 #define RX_BUF_SIZE    32
@@ -72,7 +64,6 @@ struct uart_cpm_port {
        uint                     dp_addr;
        void                    *mem_addr;
        dma_addr_t               dma_addr;
-       u32                     mem_size;
        /* helpers */
        int                      baud;
        int                      bits;
@@ -99,38 +90,4 @@ void scc2_lineif(struct uart_cpm_port *pinfo);
 void scc3_lineif(struct uart_cpm_port *pinfo);
 void scc4_lineif(struct uart_cpm_port *pinfo);
 
-/*
-   virtual to phys transtalion
-*/
-static inline unsigned long cpu2cpm_addr(void* addr, struct uart_cpm_port *pinfo)
-{
-       int offset;
-       u32 val = (u32)addr;
-       /* sane check */
-       if (likely((val >= (u32)pinfo->mem_addr)) &&
-                       (val<((u32)pinfo->mem_addr + pinfo->mem_size))) {
-               offset = val - (u32)pinfo->mem_addr;
-               return pinfo->dma_addr+offset;
-       }
-       /* something nasty happened */
-       BUG();
-       return 0;
-}
-
-static inline void *cpm2cpu_addr(unsigned long addr, struct uart_cpm_port *pinfo)
-{
-       int offset;
-       u32 val = addr;
-       /* sane check */
-       if (likely((val >= pinfo->dma_addr) &&
-                       (val<(pinfo->dma_addr + pinfo->mem_size)))) {
-               offset = val - (u32)pinfo->dma_addr;
-               return (void*)(pinfo->mem_addr+offset);
-       }
-       /* something nasty happened */
-       BUG();
-       return 0;
-}
-
-
 #endif /* CPM_UART_H */