1 files changed, 8 insertions, 21 deletions

diff --git a/arch/arm/mach-pxa/cm-x2xx.c b/arch/arm/mach-pxa/cm-x2xx.c
index 0b3ce3b6d896..d99fd9e4d888 100644
--- a/arch/arm/mach-pxa/cm-x2xx.c
+++ b/arch/arm/mach-pxa/cm-x2xx.c
@@ -210,10 +210,8 @@ static struct pxafb_mode_info generic_stn_320x240_mode = {
 static struct pxafb_mach_info generic_stn_320x240 = {
         .modes          = &generic_stn_320x240_mode,
         .num_modes      = 1,
-        .lccr0          = 0,
-        .lccr3          = (LCCR3_PixClkDiv(0x03) |
-                           LCCR3_Acb(0xff) |
-                           LCCR3_PCP),
+        .lcd_conn       = LCD_COLOR_STN_8BPP | LCD_PCLK_EDGE_FALL |\
+                          LCD_AC_BIAS_FREQ(0xff),
         .cmap_inverse   = 0,
         .cmap_static    = 0,
 };
@@ -236,10 +234,8 @@ static struct pxafb_mode_info generic_tft_640x480_mode = {
 static struct pxafb_mach_info generic_tft_640x480 = {
         .modes          = &generic_tft_640x480_mode,
         .num_modes      = 1,
-        .lccr0          = (LCCR0_PAS),
-        .lccr3          = (LCCR3_PixClkDiv(0x01) |
-                           LCCR3_Acb(0xff) |
-                           LCCR3_PCP),
+        .lcd_conn       = LCD_COLOR_TFT_8BPP | LCD_PCLK_EDGE_FALL |\
+                          LCD_AC_BIAS_FREQ(0xff),
         .cmap_inverse   = 0,
         .cmap_static    = 0,
 };
@@ -263,9 +259,7 @@ static struct pxafb_mode_info generic_crt_640x480_mode = {
 static struct pxafb_mach_info generic_crt_640x480 = {
         .modes          = &generic_crt_640x480_mode,
         .num_modes      = 1,
-        .lccr0          = (LCCR0_PAS),
-        .lccr3          = (LCCR3_PixClkDiv(0x01) |
-                           LCCR3_Acb(0xff)),
+        .lcd_conn       = LCD_COLOR_TFT_8BPP | LCD_AC_BIAS_FREQ(0xff),
         .cmap_inverse   = 0,
         .cmap_static    = 0,
 };
@@ -289,9 +283,7 @@ static struct pxafb_mode_info generic_crt_800x600_mode = {
 static struct pxafb_mach_info generic_crt_800x600 = {
         .modes          = &generic_crt_800x600_mode,
         .num_modes      = 1,
-        .lccr0          = (LCCR0_PAS),
-        .lccr3          = (LCCR3_PixClkDiv(0x02) |
-                           LCCR3_Acb(0xff)),
+        .lcd_conn       = LCD_COLOR_TFT_8BPP | LCD_AC_BIAS_FREQ(0xff),
         .cmap_inverse   = 0,
         .cmap_static    = 0,
 };
@@ -314,10 +306,7 @@ static struct pxafb_mode_info generic_tft_320x240_mode = {
 static struct pxafb_mach_info generic_tft_320x240 = {
         .modes          = &generic_tft_320x240_mode,
         .num_modes      = 1,
-        .lccr0          = (LCCR0_PAS),
-        .lccr3          = (LCCR3_PixClkDiv(0x06) |
-                           LCCR3_Acb(0xff) |
-                           LCCR3_PCP),
+        .lcd_conn       = LCD_COLOR_TFT_16BPP | LCD_AC_BIAS_FREQ(0xff),
         .cmap_inverse   = 0,
         .cmap_static    = 0,
 };
@@ -341,9 +330,7 @@ static struct pxafb_mode_info generic_stn_640x480_mode = {
 static struct pxafb_mach_info generic_stn_640x480 = {
         .modes          = &generic_stn_640x480_mode,
         .num_modes      = 1,
-        .lccr0          = 0,
-        .lccr3          = (LCCR3_PixClkDiv(0x02) |
-                           LCCR3_Acb(0xff)),
+        .lcd_conn       = LCD_COLOR_STN_8BPP | LCD_AC_BIAS_FREQ(0xff),
         .cmap_inverse   = 0,
         .cmap_static    = 0,
 };