diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-25 11:55:16 -0500 |
|---|---|---|
| committer | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-01-30 07:34:11 -0500 |
| commit | 66ac2f28b658f1938035966cafc42501758b4324 (patch) | |
| tree | d099d40c6a7a42b83798475b0276c74c34707994 | |
| parent | 7d58289fc315258b4829a29d21c540eb35dd6feb (diff) | |
mx25: deprecate UART1_BASE_ADDR and UART2_BASE_ADDR
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx25.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mx25.h b/arch/arm/plat-mxc/include/mach/mx25.h index 61052a33979c..4ef9d5332b4a 100644 --- a/arch/arm/plat-mxc/include/mach/mx25.h +++ b/arch/arm/plat-mxc/include/mach/mx25.h | |||
| @@ -27,8 +27,8 @@ | |||
| 27 | IMX_IO_ADDRESS(x, MX25_AIPS2) ?: \ | 27 | IMX_IO_ADDRESS(x, MX25_AIPS2) ?: \ |
| 28 | IMX_IO_ADDRESS(x, MX25_AVIC)) | 28 | IMX_IO_ADDRESS(x, MX25_AVIC)) |
| 29 | 29 | ||
| 30 | #define UART1_BASE_ADDR 0x43f90000 | 30 | #define MX25_UART1_BASE_ADDR 0x43f90000 |
| 31 | #define UART2_BASE_ADDR 0x43f94000 | 31 | #define MX25_UART2_BASE_ADDR 0x43f94000 |
| 32 | 32 | ||
| 33 | #define MX25_FEC_BASE_ADDR 0x50038000 | 33 | #define MX25_FEC_BASE_ADDR 0x50038000 |
| 34 | #define MX25_NFC_BASE_ADDR 0xbb000000 | 34 | #define MX25_NFC_BASE_ADDR 0xbb000000 |
| @@ -38,4 +38,9 @@ | |||
| 38 | #define MX25_INT_FEC 57 | 38 | #define MX25_INT_FEC 57 |
| 39 | #define MX25_INT_NANDFC 33 | 39 | #define MX25_INT_NANDFC 33 |
| 40 | 40 | ||
| 41 | #if defined(IMX_NEEDS_DEPRECATED_SYMBOLS) | ||
| 42 | #define UART1_BASE_ADDR MX25_UART1_BASE_ADDR | ||
| 43 | #define UART2_BASE_ADDR MX25_UART2_BASE_ADDR | ||
| 44 | #endif | ||
| 45 | |||
| 41 | #endif /* ifndef __MACH_MX25_H__ */ | 46 | #endif /* ifndef __MACH_MX25_H__ */ |