The patch titled
gxfb: don't enable the CRT DACs when we are in flatpanel mode
has been removed from the -mm tree. Its filename was
gxfb-dont-enable-the-crt-dacs-when-we-are-in-flatpanel-mode.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: gxfb: don't enable the CRT DACs when we are in flatpanel mode
From: Jordan Crouse <jordan.crouse@xxxxxxx>
When the FP strap is enabled, don't turn on the CRT DACs - that will save
about 35 mA of power.
Updated/cleaned up by Andres Salomon.
Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx>
Signed-off-by: Jordan Crouse <jordan.crouse@xxxxxxx>
Cc: "Antonino A. Daplas" <adaplas@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/video/geode/video_gx.c | 32 ++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff -puN drivers/video/geode/video_gx.c~gxfb-dont-enable-the-crt-dacs-when-we-are-in-flatpanel-mode drivers/video/geode/video_gx.c
--- a/drivers/video/geode/video_gx.c~gxfb-dont-enable-the-crt-dacs-when-we-are-in-flatpanel-mode
+++ a/drivers/video/geode/video_gx.c
@@ -239,18 +239,6 @@ static void gx_configure_display(struct
struct geodefb_par *par = info->par;
u32 dcfg, misc;
- /* Set up the MISC register */
-
- misc = readl(par->vid_regs + GX_MISC);
-
- /* Power up the DAC */
- misc &= ~(GX_MISC_A_PWRDN | GX_MISC_DAC_PWRDN);
-
- /* Disable gamma correction */
- misc |= GX_MISC_GAM_EN;
-
- writel(misc, par->vid_regs + GX_MISC);
-
/* Write the display configuration */
dcfg = readl(par->vid_regs + GX_DCFG);
@@ -269,14 +257,28 @@ static void gx_configure_display(struct
/* Enable hsync and vsync. */
dcfg |= GX_DCFG_HSYNC_EN | GX_DCFG_VSYNC_EN;
- /* Only change the sync polarities if we are running
- * in CRT mode. The FP polarities will be handled in
- * gxfb_configure_tft */
+ misc = readl(par->vid_regs + GX_MISC);
+
+ /* Disable gamma correction */
+ misc |= GX_MISC_GAM_EN;
+
if (par->enable_crt) {
+
+ /* Power up the CRT DACs */
+ misc &= ~(GX_MISC_A_PWRDN | GX_MISC_DAC_PWRDN);
+ writel(misc, par->vid_regs + GX_MISC);
+
+ /* Only change the sync polarities if we are running
+ * in CRT mode. The FP polarities will be handled in
+ * gxfb_configure_tft */
if (!(info->var.sync & FB_SYNC_HOR_HIGH_ACT))
dcfg |= GX_DCFG_CRT_HSYNC_POL;
if (!(info->var.sync & FB_SYNC_VERT_HIGH_ACT))
dcfg |= GX_DCFG_CRT_VSYNC_POL;
+ } else {
+ /* Power down the CRT DACs if in FP mode */
+ misc |= (GX_MISC_A_PWRDN | GX_MISC_DAC_PWRDN);
+ writel(misc, par->vid_regs + GX_MISC);
}
/* Enable the display logic */
_
Patches currently in -mm which might be from jordan.crouse@xxxxxxx are
origin.patch
git-watchdog.patch
x86-olpc-add-one-laptop-per-child-architecture-support.patch
x86-olpc-add-one-laptop-per-child-architecture-support-fix.patch
x86-olpc-add-one-laptop-per-child-architecture-support-fix-2.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
