diff options
| author | sascha <sascha@nomad.localdomain> | 2007-10-18 11:17:32 +0200 |
|---|---|---|
| committer | sascha <sascha@nomad.localdomain> | 2007-10-18 11:17:32 +0200 |
| commit | 75b605bfd2b27808915a14dde30a9f1f82ac1fd2 (patch) | |
| tree | eb466684f01245ca4636ac84418d75d1c7fd4506 /drivers | |
| parent | 1b272d80f11438821efa40c91883f2d2713243ad (diff) | |
| parent | 2e36bc0781f075a1ae8e69bca2e87082eb47a06e (diff) | |
| download | barebox-75b605bfd2b27808915a14dde30a9f1f82ac1fd2.tar.gz barebox-75b605bfd2b27808915a14dde30a9f1f82ac1fd2.tar.xz | |
Merge octopus:/home/git/projects/u-boot-v2
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/serial_imx.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/serial/serial_imx.c b/drivers/serial/serial_imx.c index b547b6cc30..14f3059bba 100644 --- a/drivers/serial/serial_imx.c +++ b/drivers/serial/serial_imx.c @@ -154,14 +154,17 @@ * create default values for different platforms */ #ifdef CONFIG_ARCH_IMX1 +# define UCR1_VAL (UCR1_UARTCLKEN) # define UCR3_VAL 0 # define UCR4_VAL (UCR4_CTSTL_32 | UCR4_REF16) #endif #ifdef CONFIG_ARCH_IMX27 +# define UCR1_VAL (UCR1_UARTCLKEN) # define UCR3_VAL (0x700 | UCR3_RXDMUXSEL) # define UCR4_VAL UCR4_CTSTL_32 #endif #ifdef CONFIG_ARCH_IMX31 +# define UCR1_VAL (0) # define UCR3_VAL (0x700 | UCR3_RXDMUXSEL) # define UCR4_VAL UCR4_CTSTL_32 #endif @@ -186,7 +189,7 @@ static int imx_serial_init_port(struct console_device *cdev) struct device_d *dev = cdev->dev; ulong base = dev->map_base; - UCR1(base) = UCR1_UARTCLKEN; + UCR1(base) = UCR1_VAL; UCR2(base) = UCR2_WS | UCR2_IRTS; UCR3(base) = UCR3_VAL; UCR4(base) = UCR4_VAL; @@ -199,7 +202,7 @@ static int imx_serial_init_port(struct console_device *cdev) /* Configure FIFOs */ UFCR(base) = 0xa81; -#ifdef CONFIG_ARCH_IMX27 +#if defined(CONFIG_ARCH_IMX27) || defined(CONFIG_ARCH_IMX31) ONEMS(base) = imx_serial_reffreq(base) / 1000; #endif |