From d830fe74eda151db32f83a72b5600be53a48d3cf Mon Sep 17 00:00:00 2001
From: Markinus <gitorious@markinus.de>
Date: Sun, 29 Aug 2010 11:03:51 +0200
Subject: [PATCH] htcleo: add MDP config

---
 drivers/video/msm/mdp.c      | 45 +++++++++++++++++++++++-------------
 drivers/video/msm/mdp_lcdc.c | 26 +++++++++++++--------
 2 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index 2f8a7555..5e21cf86 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -261,27 +261,40 @@ static void mdp_dmas_to_mddi(void *priv, uint32_t addr, uint32_t stride,
 	uint32_t video_packet_parameter;
 	uint16_t ld_param = 1;
 
-	dma2_cfg = DMA_PACK_TIGHT |
-		DMA_PACK_ALIGN_LSB |
-		DMA_OUT_SEL_AHB |
-		DMA_IBUF_NONCONTIGUOUS;
 
-	dma2_cfg |= mdp->format;
+	if(machine_is_htcleo()) {
+		dma2_cfg = DMA_PACK_ALIGN_MSB |
+			DMA_PACK_PATTERN_RGB;
 
-#if defined CONFIG_MSM_MDP22 || defined CONFIG_MSM_MDP30
-	if (mdp->format == DMA_IBUF_FORMAT_RGB888_OR_ARGB8888)
-#else
-	if (mdp->format == DMA_IBUF_FORMAT_XRGB8888)
-#endif
-		dma2_cfg |= DMA_PACK_PATTERN_BGR;
-	else
-		dma2_cfg |= DMA_PACK_PATTERN_RGB;
+		dma2_cfg |= mdp->format;
 
-	dma2_cfg |= DMA_OUT_SEL_MDDI;
+		dma2_cfg |= DMA_OUT_SEL_LCDC;
 
-	dma2_cfg |= DMA_MDDI_DMAOUT_LCD_SEL_PRIMARY;
+		dma2_cfg |= DMA_IBUF_FORMAT_RGB565;
+		
+	} else {
+		dma2_cfg = DMA_PACK_TIGHT |
+			DMA_PACK_ALIGN_LSB |
+			DMA_OUT_SEL_AHB |
+			DMA_IBUF_NONCONTIGUOUS;
 
-	dma2_cfg |= DMA_DITHER_EN;
+		dma2_cfg |= mdp->format;
+
+	#if defined CONFIG_MSM_MDP22 || defined CONFIG_MSM_MDP30
+		if (mdp->format == DMA_IBUF_FORMAT_RGB888_OR_ARGB8888)
+	#else
+		if (mdp->format == DMA_IBUF_FORMAT_XRGB8888)
+	#endif
+			dma2_cfg |= DMA_PACK_PATTERN_BGR;
+		else
+			dma2_cfg |= DMA_PACK_PATTERN_RGB;
+
+			dma2_cfg |= DMA_OUT_SEL_MDDI;
+
+			dma2_cfg |= DMA_MDDI_DMAOUT_LCD_SEL_PRIMARY;
+
+			dma2_cfg |= DMA_DITHER_EN;
+	}
 
 	if (mdp->mdp_dev.color_format == MSM_MDP_OUT_IF_FMT_RGB565) {
 		dma2_cfg |= DMA_DSTC0G_6BITS | DMA_DSTC1B_5BITS | DMA_DSTC2R_5BITS;
diff --git a/drivers/video/msm/mdp_lcdc.c b/drivers/video/msm/mdp_lcdc.c
index d1d87ffb..7a529a0a 100644
--- a/drivers/video/msm/mdp_lcdc.c
+++ b/drivers/video/msm/mdp_lcdc.c
@@ -189,16 +189,24 @@ static int lcdc_hw_init(struct mdp_lcdc_info *lcdc)
 
 	mdp_writel(lcdc->mdp, 0, MDP_DMA_P_OUT_XY);
 
-	dma_cfg = mdp_readl(lcdc->mdp, MDP_DMA_P_CONFIG);
-	if (lcdc->pdata->overrides & MSM_MDP_LCDC_DMA_PACK_ALIGN_LSB)
-		dma_cfg &= ~DMA_PACK_ALIGN_MSB;
-	else
-		dma_cfg |= DMA_PACK_ALIGN_MSB;
+	if(machine_is_htcleo()) {
+		dma_cfg = DMA_PACK_ALIGN_MSB |
+			DMA_PACK_PATTERN_RGB;
 
-	dma_cfg |= (DMA_PACK_PATTERN_RGB |
-		   DMA_DITHER_EN);
-	dma_cfg |= DMA_OUT_SEL_LCDC;
-	dma_cfg &= ~DMA_DST_BITS_MASK;
+		dma_cfg |= DMA_OUT_SEL_LCDC;
+		dma_cfg &= ~DMA_DST_BITS_MASK;
+	} else {
+		dma_cfg = mdp_readl(lcdc->mdp, MDP_DMA_P_CONFIG);
+		if (lcdc->pdata->overrides & MSM_MDP_LCDC_DMA_PACK_ALIGN_LSB)
+			dma_cfg &= ~DMA_PACK_ALIGN_MSB;
+		else
+			dma_cfg |= DMA_PACK_ALIGN_MSB;
+
+		dma_cfg |= (DMA_PACK_PATTERN_RGB |
+			  DMA_DITHER_EN);
+		dma_cfg |= DMA_OUT_SEL_LCDC;
+		dma_cfg &= ~DMA_DST_BITS_MASK;
+	}
 	if(lcdc->color_format == MSM_MDP_OUT_IF_FMT_RGB565)
 		dma_cfg |= DMA_DSTC0G_6BITS | DMA_DSTC1B_5BITS | DMA_DSTC2R_5BITS;
 	else if (lcdc->color_format == MSM_MDP_OUT_IF_FMT_RGB666)