diff options
5 files changed, 3 insertions, 180 deletions
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/0001-mx53_loco-add-USR-led-support.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/0001-mx53_loco-add-USR-led-support.patch deleted file mode 100644 index 1eff49447..000000000 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/0001-mx53_loco-add-USR-led-support.patch +++ /dev/null | |||
| @@ -1,68 +0,0 @@ | |||
| 1 | From 564ac4b9d7da4cc8e6fdca33ca45d19649dc3366 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com> | ||
| 3 | Date: Wed, 7 Mar 2012 23:24:54 +0100 | ||
| 4 | Subject: [PATCH] mx53_loco: add USR led support | ||
| 5 | MIME-Version: 1.0 | ||
| 6 | Content-Type: text/plain; charset=UTF-8 | ||
| 7 | Content-Transfer-Encoding: 8bit | ||
| 8 | |||
| 9 | Signed-off-by: Eric Bénard <eric@eukrea.com> | ||
| 10 | --- | ||
| 11 | arch/arm/mach-mx5/mx53_loco.c | 27 +++++++++++++++++++++++++++ | ||
| 12 | 1 files changed, 27 insertions(+), 0 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/arch/arm/mach-mx5/mx53_loco.c b/arch/arm/mach-mx5/mx53_loco.c | ||
| 15 | index c8417da..c91952b 100644 | ||
| 16 | --- a/arch/arm/mach-mx5/mx53_loco.c | ||
| 17 | +++ b/arch/arm/mach-mx5/mx53_loco.c | ||
| 18 | @@ -835,6 +835,28 @@ static void __init fixup_mxc_board(struct machine_desc *desc, struct tag *tags, | ||
| 19 | } | ||
| 20 | } | ||
| 21 | |||
| 22 | +static struct gpio_led gpio_leds[] = { | ||
| 23 | + { | ||
| 24 | + .name = "USR", | ||
| 25 | + .default_trigger = "heartbeat", | ||
| 26 | + .active_low = 0, | ||
| 27 | + .gpio = USER_LED_EN, | ||
| 28 | + }, | ||
| 29 | +}; | ||
| 30 | + | ||
| 31 | +static struct gpio_led_platform_data gpio_led_info = { | ||
| 32 | + .leds = gpio_leds, | ||
| 33 | + .num_leds = ARRAY_SIZE(gpio_leds), | ||
| 34 | +}; | ||
| 35 | + | ||
| 36 | +static struct platform_device leds_gpio = { | ||
| 37 | + .name = "leds-gpio", | ||
| 38 | + .id = -1, | ||
| 39 | + .dev = { | ||
| 40 | + .platform_data = &gpio_led_info, | ||
| 41 | + }, | ||
| 42 | +}; | ||
| 43 | + | ||
| 44 | static void __init mx53_loco_io_init(void) | ||
| 45 | { | ||
| 46 | mxc_iomux_v3_setup_multiple_pads(mx53_loco_pads, | ||
| 47 | @@ -865,6 +887,10 @@ static void __init mx53_loco_io_init(void) | ||
| 48 | gpio_request(DISP0_POWER_EN, "disp0-power-en"); | ||
| 49 | gpio_direction_output(DISP0_POWER_EN, 1); | ||
| 50 | |||
| 51 | + /* USR LED */ | ||
| 52 | + gpio_request(USER_LED_EN, "user-led-en"); | ||
| 53 | + gpio_direction_output(USER_LED_EN, 1); | ||
| 54 | + gpio_free(USER_LED_EN); | ||
| 55 | } | ||
| 56 | |||
| 57 | /*! | ||
| 58 | @@ -979,6 +1005,7 @@ static void __init mxc_board_init(void) | ||
| 59 | loco_add_device_buttons(); | ||
| 60 | pm_power_off = da9053_power_off; | ||
| 61 | pm_i2c_init(I2C1_BASE_ADDR - MX53_OFFSET); | ||
| 62 | + platform_device_register(&leds_gpio); | ||
| 63 | } | ||
| 64 | |||
| 65 | static void __init mx53_loco_timer_init(void) | ||
| 66 | -- | ||
| 67 | 1.7.7.6 | ||
| 68 | |||
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/devtmpfs-init-options-alignment.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/devtmpfs-init-options-alignment.patch deleted file mode 100644 index 19e5ef2fe..000000000 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/devtmpfs-init-options-alignment.patch +++ /dev/null | |||
| @@ -1,38 +0,0 @@ | |||
| 1 | Make the devtmpfs options static. This works around an issue that is still | ||
| 2 | under investigation. | ||
| 3 | |||
| 4 | The toolchain assumes it can generate unaligned accesses for ARMv6+, as these | ||
| 5 | cores can handle this, PROVIDED the bit is set in the CP15 control register. | ||
| 6 | |||
| 7 | However, Linux sets this bit lazely (upon first trap), which does not work for | ||
| 8 | kernel space code. | ||
| 9 | |||
| 10 | There was a lengthy thread over this, the agreement was the kernel should not | ||
| 11 | have non-aligned structures on stacks anyway. | ||
| 12 | |||
| 13 | Forcing this structure to be aligned on the stack did not help, unsure why. | ||
| 14 | This requires further investigation. | ||
| 15 | |||
| 16 | This fixes a kernel failure if devtmpfs was enabled in the kernel config. | ||
| 17 | |||
| 18 | Signed-off-by: Leon Woestenberg <leon@sidebranch.com> | ||
| 19 | diff -Nur orig/drivers/base/devtmpfs.c git/drivers/base/devtmpfs.c | ||
| 20 | --- orig/drivers/base/devtmpfs.c 2011-12-22 15:11:18.752904263 +0100 | ||
| 21 | +++ git/drivers/base/devtmpfs.c 2011-12-22 18:03:09.060928840 +0100 | ||
| 22 | @@ -365,6 +365,8 @@ | ||
| 23 | return err; | ||
| 24 | } | ||
| 25 | |||
| 26 | +static char options[] = "mode=0755"; | ||
| 27 | + | ||
| 28 | /* | ||
| 29 | * Create devtmpfs instance, driver-core devices will add their device | ||
| 30 | * nodes here. | ||
| 31 | @@ -373,7 +375,6 @@ | ||
| 32 | { | ||
| 33 | int err; | ||
| 34 | struct vfsmount *mnt; | ||
| 35 | - char options[] = "mode=0755"; | ||
| 36 | |||
| 37 | err = register_filesystem(&dev_fs_type); | ||
| 38 | if (err) { | ||
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/plat-mxc-double-dma-zone-max.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/plat-mxc-double-dma-zone-max.patch deleted file mode 100644 index cd1300076..000000000 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx-2.6.35.3/plat-mxc-double-dma-zone-max.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | Double the maximum value of DMA_ZONE_SIZE for i.MX (plat-mxc). | ||
| 2 | |||
| 3 | This allows to increase the DMA_ZONE, which prevents memory allocation | ||
| 4 | failures during playout V4L2, such as these: | ||
| 5 | |||
| 6 | gplay: page allocation failure. order:10, mode:0xd1 | ||
| 7 | [<80038538>] (unwind_backtrace+0x0/0xf0) from [<8009c4c8>] (__alloc_pages_nodemask+0x500/0x568) | ||
| 8 | [<8009c4c8>] (__alloc_pages_nodemask+0x500/0x568) from [<80038f70>] (__dma_alloc+0xec/0x2b8) | ||
| 9 | [<80038f70>] (__dma_alloc+0xec/0x2b8) from [<800391b4>] (dma_alloc_coherent+0x54/0x60) | ||
| 10 | [<800391b4>] (dma_alloc_coherent+0x54/0x60) from [<802e40b8>] (mxc_allocate_buffers+0x24/0x7c) | ||
| 11 | [<802e40b8>] (mxc_allocate_buffers+0x24/0x7c) from [<802e6098>] (mxc_v4l2out_do_ioctl+0x488/0xd9c) | ||
| 12 | [<802e6098>] (mxc_v4l2out_do_ioctl+0x488/0xd9c) from [<802d945c>] (video_usercopy+0x1e4/0x310) | ||
| 13 | [<802d945c>] (video_usercopy+0x1e4/0x310) from [<802d889c>] (v4l2_ioctl+0x44/0x4c) | ||
| 14 | [<802d889c>] (v4l2_ioctl+0x44/0x4c) from [<800d0bb4>] (vfs_ioctl+0x7c/0xac) | ||
| 15 | [<800d0bb4>] (vfs_ioctl+0x7c/0xac) from [<800d1204>] (do_vfs_ioctl+0x52c/0x57c) | ||
| 16 | [<800d1204>] (do_vfs_ioctl+0x52c/0x57c) from [<800d1288>] (sys_ioctl+0x34/0x54) | ||
| 17 | [<800d1288>] (sys_ioctl+0x34/0x54) from [<80033f80>] (ret_fast_syscall+0x0/0x30) | ||
| 18 | |||
| 19 | Although this fixes first symptoms, needs further analysis to see if this is | ||
| 20 | a long term fix. Is this contiguous memory? Does it fragment over time, thus | ||
| 21 | only delay the actual error occurance, etc? | ||
| 22 | |||
| 23 | Signed-off-by: Leon Woestenberg <leon@sidebranch.com> | ||
| 24 | diff -Nur orig/arch/arm/plat-mxc/Kconfig git/arch/arm/plat-mxc/Kconfig | ||
| 25 | --- orig/arch/arm/plat-mxc/Kconfig 2011-12-22 15:11:17.589371026 +0100 | ||
| 26 | +++ git/arch/arm/plat-mxc/Kconfig 2011-12-22 16:10:19.148873805 +0100 | ||
| 27 | @@ -87,7 +87,7 @@ | ||
| 28 | |||
| 29 | config DMA_ZONE_SIZE | ||
| 30 | int "DMA memory zone size" | ||
| 31 | - range 0 96 | ||
| 32 | + range 0 182 | ||
| 33 | default 24 | ||
| 34 | help | ||
| 35 | This is the size in MB for the DMA zone. The DMA zone is used for | ||
diff --git a/meta-fsl-arm/recipes-kernel/linux/linux-imx/egalax_ts-enable-single-event-support.patch b/meta-fsl-arm/recipes-kernel/linux/linux-imx/egalax_ts-enable-single-event-support.patch deleted file mode 100644 index e07a15d7d..000000000 --- a/meta-fsl-arm/recipes-kernel/linux/linux-imx/egalax_ts-enable-single-event-support.patch +++ /dev/null | |||
| @@ -1,30 +0,0 @@ | |||
| 1 | From ebe473696da4f4de48b973c93c8bd32300baa818 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Adrian Alonso <b38018@freescale.com> | ||
| 3 | Date: Wed, 24 Aug 2011 16:11:14 -0500 | ||
| 4 | Subject: [PATCH] egalax_ts: enable single event support | ||
| 5 | |||
| 6 | * Enable single event support for Ubuntu and | ||
| 7 | Sato desktop touchscreen support | ||
| 8 | |||
| 9 | Signed-off-by: Adrian Alonso <b38018@freescale.com> | ||
| 10 | --- | ||
| 11 | drivers/input/touchscreen/egalax_ts.c | 3 +++ | ||
| 12 | 1 files changed, 3 insertions(+), 0 deletions(-) | ||
| 13 | |||
| 14 | diff --git a/drivers/input/touchscreen/egalax_ts.c b/drivers/input/touchscreen/egalax_ts.c | ||
| 15 | index 58273b9..05c9c49 100644 | ||
| 16 | --- a/drivers/input/touchscreen/egalax_ts.c | ||
| 17 | +++ b/drivers/input/touchscreen/egalax_ts.c | ||
| 18 | @@ -57,6 +57,9 @@ | ||
| 19 | |||
| 20 | #define MAX_I2C_DATA_LEN 10 | ||
| 21 | |||
| 22 | +/* Enable single touch event mode */ | ||
| 23 | +#define FORCE_SINGLE_POINTER_SUPPORT 1 | ||
| 24 | + | ||
| 25 | struct egalax_pointer { | ||
| 26 | bool valid; | ||
| 27 | bool status; | ||
| 28 | -- | ||
| 29 | 1.7.4.1 | ||
| 30 | |||
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 739a63228..3b8c552d5 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 | |||
| @@ -1,18 +1,18 @@ | |||
| 1 | # Copyright (C) 2011-2012 Freescale Semiconductor | 1 | # Copyright (C) 2011-2012 Freescale Semiconductor |
| 2 | # Released under the MIT license (see COPYING.MIT for the terms) | 2 | # Released under the MIT license (see COPYING.MIT for the terms) |
| 3 | 3 | ||
| 4 | PR = "${INC_PR}.11" | 4 | PR = "${INC_PR}.12" |
| 5 | 5 | ||
| 6 | include linux-imx.inc | 6 | include linux-imx.inc |
| 7 | 7 | ||
| 8 | COMPATIBLE_MACHINE = "(mxs|mx5)" | 8 | COMPATIBLE_MACHINE = "(mxs|mx5)" |
| 9 | 9 | ||
| 10 | # Revision of imx_2.6.35_10.12.01 branch | 10 | # Revision of imx_2.6.35_10.12.01 branch |
| 11 | SRCREV_mxs = "38bf41cc376e24c384934fbeb10770d6712e9143" | 11 | SRCREV_mxs = "5910faa40398a445e6b76c2edd1793aa852f738a" |
| 12 | LOCALVERSION = "-10.12.01+yocto-${DATE}" | 12 | LOCALVERSION = "-10.12.01+yocto-${DATE}" |
| 13 | 13 | ||
| 14 | # Revision of imx_2.6.35_11.09.01 branch | 14 | # Revision of imx_2.6.35_11.09.01 branch |
| 15 | SRCREV_mx5 = "406cab2e8b3c030c0f86263282f846bb55a2faf6" | 15 | SRCREV_mx5 = "7bd2ccd2539dba25eee4107122cbe0df70544d7f" |
| 16 | LOCALVERSION = "-11.09.01+yocto-${DATE}" | 16 | LOCALVERSION = "-11.09.01+yocto-${DATE}" |
| 17 | 17 | ||
| 18 | SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ | 18 | SRC_URI += "file://NFS-Fix-nfsroot-support.patch \ |
| @@ -24,9 +24,3 @@ SRC_URI_append_mxs = " \ | |||
| 24 | file://mx28-removecpufreq.patch \ | 24 | file://mx28-removecpufreq.patch \ |
| 25 | file://mxs-duart-use-ttyAMA-for-device-name.patch \ | 25 | file://mxs-duart-use-ttyAMA-for-device-name.patch \ |
| 26 | " | 26 | " |
| 27 | |||
| 28 | SRC_URI_append_mx5 = " \ | ||
| 29 | file://mx5-fix-hang-with-framebuffer.patch \ | ||
| 30 | file://egalax_ts-enable-single-event-support.patch \ | ||
| 31 | file://0001-mx53_loco-add-USR-led-support.patch \ | ||
| 32 | " | ||
