diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2012-05-19 15:18:14 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2012-05-21 08:02:53 -0300 |
commit | 1a90d5e8a2ff4fb8e4e3897c25b69516cc839806 (patch) | |
tree | 206ff7116d8fe2c047155b3d4890c2570e64a535 /meta-fsl-arm | |
parent | 00407d407ec188044b87a8ec50f1b1701e96a6e5 (diff) | |
download | meta-freescale-1a90d5e8a2ff4fb8e4e3897c25b69516cc839806.tar.gz |
linux-imx (2.6.35.3): use ttyAMA as debug serial
Follow the debug serial device name of i.MX23 and i.MX28 used in
mainline kernel.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'meta-fsl-arm')
-rw-r--r-- | meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mxs-duart-use-ttyAMA-for-device-name.patch | 42 | ||||
-rw-r--r-- | meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb | 3 |
2 files changed, 44 insertions, 1 deletions
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mxs-duart-use-ttyAMA-for-device-name.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mxs-duart-use-ttyAMA-for-device-name.patch new file mode 100644 index 000000000..6b89bb66a --- /dev/null +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mxs-duart-use-ttyAMA-for-device-name.patch | |||
@@ -0,0 +1,42 @@ | |||
1 | From e0b2222000d04b43e7892148dc9892c9375de939 Mon Sep 17 00:00:00 2001 | ||
2 | From: Otavio Salvador <otavio@ossystems.com.br> | ||
3 | Date: Sat, 5 May 2012 15:04:24 -0300 | ||
4 | Subject: [PATCH] mxs-duart: use ttyAMA for device name | ||
5 | |||
6 | This allow to easy configuration of u-boot avoiding divergences | ||
7 | between Freescale's and mainline kernels. | ||
8 | |||
9 | Upstream-Status: Inapropriate [configuration] | ||
10 | |||
11 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
12 | --- | ||
13 | drivers/serial/mxs-duart.c | 6 +++--- | ||
14 | 1 file changed, 3 insertions(+), 3 deletions(-) | ||
15 | |||
16 | diff --git a/drivers/serial/mxs-duart.c b/drivers/serial/mxs-duart.c | ||
17 | index 64e5057..2ba0c33 100644 | ||
18 | --- a/drivers/serial/mxs-duart.c | ||
19 | +++ b/drivers/serial/mxs-duart.c | ||
20 | @@ -665,7 +665,7 @@ static int __init duart_console_setup(struct console *co, char *options) | ||
21 | } | ||
22 | |||
23 | static struct console duart_console = { | ||
24 | - .name = "ttyAM", | ||
25 | + .name = "ttyAMA", | ||
26 | .write = duart_console_write, | ||
27 | .device = uart_console_device, | ||
28 | .setup = duart_console_setup, | ||
29 | @@ -688,8 +688,8 @@ console_initcall(duart_console_init); | ||
30 | |||
31 | static struct uart_driver duart_drv = { | ||
32 | .owner = THIS_MODULE, | ||
33 | - .driver_name = "ttyAM", | ||
34 | - .dev_name = "ttyAM", | ||
35 | + .driver_name = "ttyAMA", | ||
36 | + .dev_name = "ttyAMA", | ||
37 | .major = SERIAL_DUART_MAJOR, | ||
38 | .minor = SERIAL_DUART_MINOR, | ||
39 | .nr = 1, | ||
40 | -- | ||
41 | 1.7.10 | ||
42 | |||
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb index 83062b92f..1f4a453a2 100644 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb +++ b/meta-fsl-arm/recipes-kernel/linux/linux-imx_2.6.35.3.bb | |||
@@ -4,7 +4,7 @@ | |||
4 | DESCRIPTION = "Linux kernel for imx platforms" | 4 | DESCRIPTION = "Linux kernel for imx platforms" |
5 | LICENSE = "GPLv2" | 5 | LICENSE = "GPLv2" |
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" | 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" |
7 | PR = "r16" | 7 | PR = "r17" |
8 | 8 | ||
9 | inherit kernel | 9 | inherit kernel |
10 | COMPATIBLE_MACHINE = "(mxs|mx5)" | 10 | COMPATIBLE_MACHINE = "(mxs|mx5)" |
@@ -29,6 +29,7 @@ SRC_URI = "git://git.freescale.com/imx/linux-2.6-imx.git;tag=rel_imx_2.6.35_11.0 | |||
29 | file://1147-ENGR00170244-2-ARM-AHCI-Enable-PDDQ-mode-when-no-d.patch \ | 29 | file://1147-ENGR00170244-2-ARM-AHCI-Enable-PDDQ-mode-when-no-d.patch \ |
30 | file://no-unaligned-access.patch \ | 30 | file://no-unaligned-access.patch \ |
31 | file://mx28-removecpufreq.patch \ | 31 | file://mx28-removecpufreq.patch \ |
32 | file://mxs-duart-use-ttyAMA-for-device-name.patch \ | ||
32 | file://0001-mx53_loco-add-USR-led-support.patch \ | 33 | file://0001-mx53_loco-add-USR-led-support.patch \ |
33 | file://001_Add_accept4_syscall.patch \ | 34 | file://001_Add_accept4_syscall.patch \ |
34 | file://002_Return_ERESTARTSYS_from_IPU_GET_EVENT.patch \ | 35 | file://002_Return_ERESTARTSYS_from_IPU_GET_EVENT.patch \ |