diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-03-31 11:16:46 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-03-31 11:17:57 +0200 |
| commit | 331819b180850d9adcaba0616449ab5ae52919d8 (patch) | |
| tree | 03344183a954e985e8297e6478201831aaa8a26b /drivers | |
| parent | 5a2e3219f56782de748f48eaa192fe1ef5cf8d87 (diff) | |
| download | barebox-331819b180850d9adcaba0616449ab5ae52919d8.tar.gz barebox-331819b180850d9adcaba0616449ab5ae52919d8.tar.xz | |
i.MX serial driver: remove duplicated defines
Also, the i.MX1 is the only one different, so change the #ifdef
accordingly
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/serial_imx.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index 6cb260b741..35f18700bd 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -38,10 +38,6 @@ #define UBIR(base) __REG( 0xa4 +(base)) /* BRM Incremental Register */ #define UBMR(base) __REG( 0xa8 +(base)) /* BRM Modulator Register */ #define UBRC(base) __REG( 0xac +(base)) /* Baud Rate Count Register */ -#if defined CONFIG_ARCH_IMX27 || defined CONFIG_ARCH_IMX35 -#define ONEMS(base) __REG( 0xb0 +(base)) /* One Millisecond register (i.MX27) */ -#define UTS(base) __REG( 0xb4 +(base)) /* UART Test Register */ -#endif #ifdef CONFIG_ARCH_IMX1 #define BIPR1(base) __REG( 0xb0 +(base)) /* Incremental Preset Register 1 */ #define BIPR2(base) __REG( 0xb4 +(base)) /* Incremental Preset Register 2 */ @@ -52,10 +48,9 @@ #define BMPR3(base) __REG( 0xc8 +(base)) /* BRM Modulator Register 3 */ #define BMPR4(base) __REG( 0xcc +(base)) /* BRM Modulator Register 4 */ #define UTS(base) __REG( 0xd0 +(base)) /* UART Test Register */ -#endif -#ifdef CONFIG_ARCH_IMX31 -# define ONEMS(base) __REG( 0xb0 +(base)) /* One Millisecond register (i.MX27) */ -# define UTS(base) __REG( 0xb4 +(base)) /* UART Test Register */ +#else +#define ONEMS(base) __REG( 0xb0 +(base)) /* One Millisecond register */ +#define UTS(base) __REG( 0xb4 +(base)) /* UART Test Register */ #endif /* UART Control Register Bit Fields.*/ |