From 1a90d5e8a2ff4fb8e4e3897c25b69516cc839806 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 19 May 2012 15:18:14 -0300 Subject: [PATCH] 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 --- ...mxs-duart-use-ttyAMA-for-device-name.patch | 42 +++++++++++++++++++ .../linux/linux-imx_2.6.35.3.bb | 3 +- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/mxs-duart-use-ttyAMA-for-device-name.patch 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 00000000..6b89bb66 --- /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 @@ +From e0b2222000d04b43e7892148dc9892c9375de939 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Sat, 5 May 2012 15:04:24 -0300 +Subject: [PATCH] mxs-duart: use ttyAMA for device name + +This allow to easy configuration of u-boot avoiding divergences +between Freescale's and mainline kernels. + +Upstream-Status: Inapropriate [configuration] + +Signed-off-by: Otavio Salvador +--- + drivers/serial/mxs-duart.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/drivers/serial/mxs-duart.c b/drivers/serial/mxs-duart.c +index 64e5057..2ba0c33 100644 +--- a/drivers/serial/mxs-duart.c ++++ b/drivers/serial/mxs-duart.c +@@ -665,7 +665,7 @@ static int __init duart_console_setup(struct console *co, char *options) + } + + static struct console duart_console = { +- .name = "ttyAM", ++ .name = "ttyAMA", + .write = duart_console_write, + .device = uart_console_device, + .setup = duart_console_setup, +@@ -688,8 +688,8 @@ console_initcall(duart_console_init); + + static struct uart_driver duart_drv = { + .owner = THIS_MODULE, +- .driver_name = "ttyAM", +- .dev_name = "ttyAM", ++ .driver_name = "ttyAMA", ++ .dev_name = "ttyAMA", + .major = SERIAL_DUART_MAJOR, + .minor = SERIAL_DUART_MINOR, + .nr = 1, +-- +1.7.10 + 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 83062b92..1f4a453a 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 @@ DESCRIPTION = "Linux kernel for imx platforms" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" -PR = "r16" +PR = "r17" inherit kernel 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 file://1147-ENGR00170244-2-ARM-AHCI-Enable-PDDQ-mode-when-no-d.patch \ file://no-unaligned-access.patch \ file://mx28-removecpufreq.patch \ + file://mxs-duart-use-ttyAMA-for-device-name.patch \ file://0001-mx53_loco-add-USR-led-support.patch \ file://001_Add_accept4_syscall.patch \ file://002_Return_ERESTARTSYS_from_IPU_GET_EVENT.patch \ -- 2.40.1