diff options
Diffstat (limited to 'recipes-kernel/linux')
| -rw-r--r-- | recipes-kernel/linux/linux-imx-2.6.35.3/mx5-fix-hang-with-framebuffer.patch | 59 | ||||
| -rw-r--r-- | recipes-kernel/linux/linux-imx_2.6.35.3.bb | 3 |
2 files changed, 1 insertions, 61 deletions
diff --git a/recipes-kernel/linux/linux-imx-2.6.35.3/mx5-fix-hang-with-framebuffer.patch b/recipes-kernel/linux/linux-imx-2.6.35.3/mx5-fix-hang-with-framebuffer.patch deleted file mode 100644 index fa94faf..0000000 --- a/recipes-kernel/linux/linux-imx-2.6.35.3/mx5-fix-hang-with-framebuffer.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 3bd0148cfe28a9908ff4cbb7b542d309107591a4 Mon Sep 17 00:00:00 2001 -From: Fabio Estevam <fabio.estevam@freescale.com> -Date: Wed, 5 Sep 2012 19:54:54 -0300 -Subject: [PATCH 1/2] ARM: mach-mx5: Fix IPU hang when framebuffer is enabled - in U-boot - -If bootloader enableds framebuffer, it is necessary to turn off IPU early in -the boot process to avoid kernel hang. - -Suggested-by: Troy Kisky <troy.kisky@boundarydevices.com> -Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> ---- - arch/arm/mach-mx5/clock.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/arch/arm/mach-mx5/clock.c b/arch/arm/mach-mx5/clock.c -index 4559876..4d5a2cc 100644 ---- a/arch/arm/mach-mx5/clock.c -+++ b/arch/arm/mach-mx5/clock.c -@@ -4453,6 +4453,20 @@ static void clk_tree_init(void) - } - } - -+#define IPU_CONF 0x000 -+#define IPU_DISP_GEN 0x0C4 -+ -+void turn_off_display(int physical_base) -+{ -+ void __iomem *ipuc = ioremap(physical_base, SZ_4K); -+ if (ipuc) { -+ /* clear DI0/DI1 counter release */ -+ unsigned reg = __raw_readl(ipuc + IPU_DISP_GEN); -+ __raw_writel(reg & ~(3 << 24), ipuc + IPU_DISP_GEN); -+ __raw_writel(0, ipuc + IPU_CONF); -+ iounmap(ipuc); -+ } -+} - - int __init mx51_clocks_init(unsigned long ckil, unsigned long osc, unsigned long ckih1, unsigned long ckih2) - { -@@ -4462,6 +4476,7 @@ int __init mx51_clocks_init(unsigned long ckil, unsigned long osc, unsigned long - int wp_cnt = 0; - u32 pll1_rate; - -+ turn_off_display(MX51_IPU_CTRL_BASE_ADDR + ((512 - 32) << 20)); - pll1_base = ioremap(PLL1_BASE_ADDR, SZ_4K); - pll2_base = ioremap(PLL2_BASE_ADDR, SZ_4K); - pll3_base = ioremap(PLL3_BASE_ADDR, SZ_4K); -@@ -4782,6 +4797,7 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc, unsigned long - int i = 0, j = 0, reg; - u32 pll1_rate; - -+ turn_off_display(MX53_IPU_CTRL_BASE_ADDR + ((128 - 32) << 20)); - pll1_base = ioremap(MX53_BASE_ADDR(PLL1_BASE_ADDR), SZ_4K); - pll2_base = ioremap(MX53_BASE_ADDR(PLL2_BASE_ADDR), SZ_4K); - pll3_base = ioremap(MX53_BASE_ADDR(PLL3_BASE_ADDR), SZ_4K); --- -1.7.10.4 - diff --git a/recipes-kernel/linux/linux-imx_2.6.35.3.bb b/recipes-kernel/linux/linux-imx_2.6.35.3.bb index 083231e..7127d1a 100644 --- a/recipes-kernel/linux/linux-imx_2.6.35.3.bb +++ b/recipes-kernel/linux/linux-imx_2.6.35.3.bb @@ -1,7 +1,7 @@ # Copyright (C) 2011-2012 Freescale Semiconductor # Released under the MIT license (see COPYING.MIT for the terms) -PR = "${INC_PR}.8" +PR = "${INC_PR}.9" include linux-imx.inc @@ -25,7 +25,6 @@ SRC_URI_append_mxs = " \ " SRC_URI_append_mx5 = " \ - file://mx5-fix-hang-with-framebuffer.patch \ file://egalax_ts-enable-single-event-support.patch \ file://0001-mx53_loco-add-USR-led-support.patch \ " |