[Armadeus-commitlog] SF.net SVN: armadeus:[1307] trunk/buildroot/target/device/armadeus/linux/ kern
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1307] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.29
|
From: <ar...@us...> - 2009-05-26 16:35:18
|
Revision: 1307
http://armadeus.svn.sourceforge.net/armadeus/?rev=1307&view=rev
Author: artemys
Date: 2009-05-26 16:35:12 +0000 (Tue, 26 May 2009)
Log Message:
-----------
[LINUX] Add i.MX27 support to mainline framebuffer (part 1)
Added Paths:
-----------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-add_mx27_support.patch
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/329-pengu-imxfb-fix_tft_mode_init.patch
Removed Paths:
-------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-fix_tft_mode_init.patch
Added: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-add_mx27_support.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-add_mx27_support.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-add_mx27_support.patch 2009-05-26 16:35:12 UTC (rev 1307)
@@ -0,0 +1,82 @@
+From: Sascha Hauer <s....@pe...>
+Date: Mon, 26 Jan 2009 16:29:10 +0000 (+0100)
+Subject: imxfb: add mx27 support
+X-Git-Url: http://git.pengutronix.de/?p=imx%2Flinux-2.6.git;a=commitdiff_plain;h=1d0f98709347c4babac08dd933466674e089f188
+
+imxfb: add mx27 support
+
+Signed-off-by: Sascha Hauer <s....@pe...>
+---
+
+diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
+index 5c61286..9dd2757 100644
+--- a/drivers/video/imxfb.c
++++ b/drivers/video/imxfb.c
+@@ -43,7 +43,12 @@
+
+ #define LCDC_SIZE 0x04
+ #define SIZE_XMAX(x) ((((x) >> 4) & 0x3f) << 20)
++
++#ifdef CONFIG_ARCH_MX1
+ #define SIZE_YMAX(y) ((y) & 0x1ff)
++#else
++#define SIZE_YMAX(y) ((y) & 0x3ff)
++#endif
+
+ #define LCDC_VPW 0x08
+ #define VPW_VPW(x) ((x) & 0x3ff)
+@@ -53,7 +58,12 @@
+ #define CPOS_CC0 (1<<30)
+ #define CPOS_OP (1<<28)
+ #define CPOS_CXP(x) (((x) & 3ff) << 16)
++
++#ifdef CONFIG_ARCH_MX1
+ #define CPOS_CYP(y) ((y) & 0x1ff)
++#else
++#define CPOS_CYP(y) ((y) & 0x3ff)
++#endif
+
+ #define LCDC_LCWHB 0x10
+ #define LCWHB_BK_EN (1<<31)
+@@ -62,9 +72,16 @@
+ #define LCWHB_BD(x) ((x) & 0xff)
+
+ #define LCDC_LCHCC 0x14
++
++#ifdef CONFIG_ARCH_MX1
+ #define LCHCC_CUR_COL_R(r) (((r) & 0x1f) << 11)
+ #define LCHCC_CUR_COL_G(g) (((g) & 0x3f) << 5)
+ #define LCHCC_CUR_COL_B(b) ((b) & 0x1f)
++#else
++#define LCHCC_CUR_COL_R(r) (((r) & 0x3f) << 12)
++#define LCHCC_CUR_COL_G(g) (((g) & 0x3f) << 6)
++#define LCHCC_CUR_COL_B(b) ((b) & 0x3f)
++#endif
+
+ #define LCDC_PCR 0x18
+
+@@ -91,7 +108,13 @@
+ /* bit fields in imxfb.h */
+
+ #define LCDC_RMCR 0x34
++
++#ifdef CONFIG_ARCH_MX1
+ #define RMCR_LCDC_EN (1<<1)
++#else
++#define RMCR_LCDC_EN 0
++#endif
++
+ #define RMCR_SELF_REF (1<<0)
+
+ #define LCDC_LCDICR 0x38
+@@ -365,10 +388,6 @@ static void imxfb_enable_controller(struct imxfb_info *fbi)
+ {
+ pr_debug("Enabling LCD controller\n");
+
+- /* initialize LCDC */
+- writel(readl(fbi->regs + LCDC_RMCR) & ~RMCR_LCDC_EN,
+- fbi->regs + LCDC_RMCR); /* just to be safe... */
+-
+ writel(fbi->screen_dma, fbi->regs + LCDC_SSA);
+
+ /* physical screen start address */
Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-fix_tft_mode_init.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-fix_tft_mode_init.patch 2009-05-26 16:29:54 UTC (rev 1306)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-fix_tft_mode_init.patch 2009-05-26 16:35:12 UTC (rev 1307)
@@ -1,28 +0,0 @@
-From: Sascha Hauer <s....@pe...>
-Date: Thu, 26 Mar 2009 11:38:26 +0000 (+0100)
-Subject: imxfb: Fix TFT mode
-X-Git-Tag: v2.6.30-rc1~636^2~3^2
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4d1e4e5a6387aad97590e2da9c6db1350f22f63a
-
-imxfb: Fix TFT mode
-
-We read from the PCR reg to determine whether to use TFT mode or not.
-This is not possible because it may not have been initialized with
-the correct value yet. Select it using fbi->pcr instead.
-
-Signed-off-by: Sascha Hauer <s....@pe...>
----
-
-diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
-index 8f7a2b2..15a0ee6 100644
---- a/drivers/video/imxfb.c
-+++ b/drivers/video/imxfb.c
-@@ -327,7 +327,7 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
- break;
- case 16:
- default:
-- if (readl(fbi->regs + LCDC_PCR) & PCR_TFT)
-+ if (fbi->pcr & PCR_TFT)
- rgb = &def_rgb_16_tft;
- else
- rgb = &def_rgb_16_stn;
Copied: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/329-pengu-imxfb-fix_tft_mode_init.patch (from rev 1304, trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/325-pengu-imxfb-fix_tft_mode_init.patch)
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/329-pengu-imxfb-fix_tft_mode_init.patch (rev 0)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/329-pengu-imxfb-fix_tft_mode_init.patch 2009-05-26 16:35:12 UTC (rev 1307)
@@ -0,0 +1,28 @@
+From: Sascha Hauer <s....@pe...>
+Date: Thu, 26 Mar 2009 11:38:26 +0000 (+0100)
+Subject: imxfb: Fix TFT mode
+X-Git-Tag: v2.6.30-rc1~636^2~3^2
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=4d1e4e5a6387aad97590e2da9c6db1350f22f63a
+
+imxfb: Fix TFT mode
+
+We read from the PCR reg to determine whether to use TFT mode or not.
+This is not possible because it may not have been initialized with
+the correct value yet. Select it using fbi->pcr instead.
+
+Signed-off-by: Sascha Hauer <s....@pe...>
+---
+
+diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
+index 8f7a2b2..15a0ee6 100644
+--- a/drivers/video/imxfb.c
++++ b/drivers/video/imxfb.c
+@@ -327,7 +327,7 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
+ break;
+ case 16:
+ default:
+- if (readl(fbi->regs + LCDC_PCR) & PCR_TFT)
++ if (fbi->pcr & PCR_TFT)
+ rgb = &def_rgb_16_tft;
+ else
+ rgb = &def_rgb_16_stn;
Property changes on: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/329-pengu-imxfb-fix_tft_mode_init.patch
___________________________________________________________________
Added: svn:mergeinfo
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
