diff options
| author | Oliver Brown <oliver.brown@freescale.com> | 2012-01-16 11:28:49 -0600 |
|---|---|---|
| committer | Oliver Brown <oliver.brown@freescale.com> | 2012-01-17 12:09:08 -0600 |
| commit | 19f1811ada0b5d135211a9f62859b4399a290705 (patch) | |
| tree | 909e423449429c0b763fff14a90a780e2b3f5647 | |
| parent | 74446060c52706c24e2638f0dadd721210981a12 (diff) | |
ENGR00171214: Changes for GPS.
Adding legacy psudoterminal support.
Fixing UART2 IO Mux setting.
Signed-off-by: Oliver Brown <oliver.brown@freescale.com>
| -rw-r--r-- | arch/arm/configs/imx5_android_defconfig | 5 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mx53.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/configs/imx5_android_defconfig b/arch/arm/configs/imx5_android_defconfig index b559243ab385..58b1a32aede4 100644 --- a/arch/arm/configs/imx5_android_defconfig +++ b/arch/arm/configs/imx5_android_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/arm 2.6.38 Kernel Configuration -# Wed Dec 28 21:56:17 2011 +# Thu Jan 12 13:48:58 2012 # CONFIG_ARM=y CONFIG_HAVE_PWM=y @@ -1318,7 +1318,8 @@ CONFIG_SERIAL_CORE_CONSOLE=y # CONFIG_SERIAL_IFX6X60 is not set CONFIG_UNIX98_PTYS=y # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set -# CONFIG_LEGACY_PTYS is not set +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=256 # CONFIG_TTY_PRINTK is not set # CONFIG_FSL_OTP is not set # CONFIG_HVC_DCC is not set diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx53.h b/arch/arm/plat-mxc/include/mach/iomux-mx53.h index 56bade10d581..4c12dc42df77 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mx53.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx53.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2011 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright (C) 2010-2012 Freescale Semiconductor, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -870,7 +870,7 @@ #define _MX53_PAD_PATA_DMACK__USBPHY2_DATAOUT_3 IOMUX_PAD(0x5F4, 0x274, 7, 0x0, 0, 0) #define _MX53_PAD_PATA_DMARQ__PATA_DMARQ IOMUX_PAD(0x5F8, 0x278, 0, 0x0, 0, 0) #define _MX53_PAD_PATA_DMARQ__GPIO7_0 IOMUX_PAD(0x5F8, 0x278, 1, 0x0, 0, 0) -#define _MX53_PAD_PATA_DMARQ__UART2_TXD_MUX IOMUX_PAD(0x5F8, 0x278, 3, 0x880, 2, 0) +#define _MX53_PAD_PATA_DMARQ__UART2_TXD_MUX IOMUX_PAD(0x5F8, 0x278, 3, 0, 0, 0) #define _MX53_PAD_PATA_DMARQ__CCM_CCM_OUT_0 IOMUX_PAD(0x5F8, 0x278, 5, 0x0, 0, 0) #define _MX53_PAD_PATA_DMARQ__USBPHY2_DATAOUT_4 IOMUX_PAD(0x5F8, 0x278, 7, 0x0, 0, 0) #define _MX53_PAD_PATA_BUFFER_EN__PATA_BUFFER_EN IOMUX_PAD(0x5FC, 0x27C, 0, 0x0, 0, 0) |