diff options
Diffstat (limited to 'arch/arm/mach-mxs/mach-mxs.c')
| -rw-r--r-- | arch/arm/mach-mxs/mach-mxs.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index 052186713347..e7b781d3788f 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c | |||
| @@ -41,8 +41,6 @@ static struct fb_videomode mx23evk_video_modes[] = { | |||
| 41 | .lower_margin = 4, | 41 | .lower_margin = 4, |
| 42 | .hsync_len = 1, | 42 | .hsync_len = 1, |
| 43 | .vsync_len = 1, | 43 | .vsync_len = 1, |
| 44 | .sync = FB_SYNC_DATA_ENABLE_HIGH_ACT | | ||
| 45 | FB_SYNC_DOTCLK_FAILING_ACT, | ||
| 46 | }, | 44 | }, |
| 47 | }; | 45 | }; |
| 48 | 46 | ||
| @@ -59,8 +57,6 @@ static struct fb_videomode mx28evk_video_modes[] = { | |||
| 59 | .lower_margin = 10, | 57 | .lower_margin = 10, |
| 60 | .hsync_len = 10, | 58 | .hsync_len = 10, |
| 61 | .vsync_len = 10, | 59 | .vsync_len = 10, |
| 62 | .sync = FB_SYNC_DATA_ENABLE_HIGH_ACT | | ||
| 63 | FB_SYNC_DOTCLK_FAILING_ACT, | ||
| 64 | }, | 60 | }, |
| 65 | }; | 61 | }; |
| 66 | 62 | ||
| @@ -77,7 +73,6 @@ static struct fb_videomode m28evk_video_modes[] = { | |||
| 77 | .lower_margin = 45, | 73 | .lower_margin = 45, |
| 78 | .hsync_len = 1, | 74 | .hsync_len = 1, |
| 79 | .vsync_len = 1, | 75 | .vsync_len = 1, |
| 80 | .sync = FB_SYNC_DATA_ENABLE_HIGH_ACT, | ||
| 81 | }, | 76 | }, |
| 82 | }; | 77 | }; |
| 83 | 78 | ||
| @@ -94,9 +89,7 @@ static struct fb_videomode apx4devkit_video_modes[] = { | |||
| 94 | .lower_margin = 13, | 89 | .lower_margin = 13, |
| 95 | .hsync_len = 48, | 90 | .hsync_len = 48, |
| 96 | .vsync_len = 3, | 91 | .vsync_len = 3, |
| 97 | .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | | 92 | .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
| 98 | FB_SYNC_DATA_ENABLE_HIGH_ACT | | ||
| 99 | FB_SYNC_DOTCLK_FAILING_ACT, | ||
| 100 | }, | 93 | }, |
| 101 | }; | 94 | }; |
| 102 | 95 | ||
| @@ -113,9 +106,7 @@ static struct fb_videomode apf28dev_video_modes[] = { | |||
| 113 | .lower_margin = 0x15, | 106 | .lower_margin = 0x15, |
| 114 | .hsync_len = 64, | 107 | .hsync_len = 64, |
| 115 | .vsync_len = 4, | 108 | .vsync_len = 4, |
| 116 | .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT | | 109 | .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
| 117 | FB_SYNC_DATA_ENABLE_HIGH_ACT | | ||
| 118 | FB_SYNC_DOTCLK_FAILING_ACT, | ||
| 119 | }, | 110 | }, |
| 120 | }; | 111 | }; |
| 121 | 112 | ||
| @@ -132,7 +123,6 @@ static struct fb_videomode cfa10049_video_modes[] = { | |||
| 132 | .lower_margin = 2, | 123 | .lower_margin = 2, |
| 133 | .hsync_len = 15, | 124 | .hsync_len = 15, |
| 134 | .vsync_len = 15, | 125 | .vsync_len = 15, |
| 135 | .sync = FB_SYNC_DATA_ENABLE_HIGH_ACT | ||
| 136 | }, | 126 | }, |
| 137 | }; | 127 | }; |
| 138 | 128 | ||
| @@ -259,6 +249,8 @@ static void __init imx23_evk_init(void) | |||
| 259 | mxsfb_pdata.mode_count = ARRAY_SIZE(mx23evk_video_modes); | 249 | mxsfb_pdata.mode_count = ARRAY_SIZE(mx23evk_video_modes); |
| 260 | mxsfb_pdata.default_bpp = 32; | 250 | mxsfb_pdata.default_bpp = 32; |
| 261 | mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT; | 251 | mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT; |
| 252 | mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT | | ||
| 253 | MXSFB_SYNC_DOTCLK_FAILING_ACT; | ||
| 262 | } | 254 | } |
| 263 | 255 | ||
| 264 | static inline void enable_clk_enet_out(void) | 256 | static inline void enable_clk_enet_out(void) |
| @@ -278,6 +270,8 @@ static void __init imx28_evk_init(void) | |||
| 278 | mxsfb_pdata.mode_count = ARRAY_SIZE(mx28evk_video_modes); | 270 | mxsfb_pdata.mode_count = ARRAY_SIZE(mx28evk_video_modes); |
| 279 | mxsfb_pdata.default_bpp = 32; | 271 | mxsfb_pdata.default_bpp = 32; |
| 280 | mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT; | 272 | mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT; |
| 273 | mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT | | ||
| 274 | MXSFB_SYNC_DOTCLK_FAILING_ACT; | ||
| 281 | 275 | ||
| 282 | mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0); | 276 | mxs_saif_clkmux_select(MXS_DIGCTL_SAIF_CLKMUX_EXTMSTR0); |
| 283 | } | 277 | } |
| @@ -297,6 +291,7 @@ static void __init m28evk_init(void) | |||
| 297 | mxsfb_pdata.mode_count = ARRAY_SIZE(m28evk_video_modes); | 291 | mxsfb_pdata.mode_count = ARRAY_SIZE(m28evk_video_modes); |
| 298 | mxsfb_pdata.default_bpp = 16; | 292 | mxsfb_pdata.default_bpp = 16; |
| 299 | mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT; | 293 | mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT; |
| 294 | mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT; | ||
| 300 | } | 295 | } |
| 301 | 296 | ||
| 302 | static void __init sc_sps1_init(void) | 297 | static void __init sc_sps1_init(void) |
| @@ -322,6 +317,8 @@ static void __init apx4devkit_init(void) | |||
| 322 | mxsfb_pdata.mode_count = ARRAY_SIZE(apx4devkit_video_modes); | 317 | mxsfb_pdata.mode_count = ARRAY_SIZE(apx4devkit_video_modes); |
| 323 | mxsfb_pdata.default_bpp = 32; | 318 | mxsfb_pdata.default_bpp = 32; |
| 324 | mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT; | 319 | mxsfb_pdata.ld_intf_width = STMLCDIF_24BIT; |
| 320 | mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT | | ||
| 321 | MXSFB_SYNC_DOTCLK_FAILING_ACT; | ||
| 325 | } | 322 | } |
| 326 | 323 | ||
| 327 | #define ENET0_MDC__GPIO_4_0 MXS_GPIO_NR(4, 0) | 324 | #define ENET0_MDC__GPIO_4_0 MXS_GPIO_NR(4, 0) |
| @@ -402,17 +399,18 @@ static void __init cfa10049_init(void) | |||
| 402 | { | 399 | { |
| 403 | enable_clk_enet_out(); | 400 | enable_clk_enet_out(); |
| 404 | update_fec_mac_prop(OUI_CRYSTALFONTZ); | 401 | update_fec_mac_prop(OUI_CRYSTALFONTZ); |
| 402 | |||
| 403 | mxsfb_pdata.mode_list = cfa10049_video_modes; | ||
| 404 | mxsfb_pdata.mode_count = ARRAY_SIZE(cfa10049_video_modes); | ||
| 405 | mxsfb_pdata.default_bpp = 32; | ||
| 406 | mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT; | ||
| 407 | mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT; | ||
| 405 | } | 408 | } |
| 406 | 409 | ||
| 407 | static void __init cfa10037_init(void) | 410 | static void __init cfa10037_init(void) |
| 408 | { | 411 | { |
| 409 | enable_clk_enet_out(); | 412 | enable_clk_enet_out(); |
| 410 | update_fec_mac_prop(OUI_CRYSTALFONTZ); | 413 | update_fec_mac_prop(OUI_CRYSTALFONTZ); |
| 411 | |||
| 412 | mxsfb_pdata.mode_list = cfa10049_video_modes; | ||
| 413 | mxsfb_pdata.mode_count = ARRAY_SIZE(cfa10049_video_modes); | ||
| 414 | mxsfb_pdata.default_bpp = 32; | ||
| 415 | mxsfb_pdata.ld_intf_width = STMLCDIF_18BIT; | ||
| 416 | } | 414 | } |
| 417 | 415 | ||
| 418 | static void __init apf28_init(void) | 416 | static void __init apf28_init(void) |
| @@ -423,6 +421,8 @@ static void __init apf28_init(void) | |||
| 423 | mxsfb_pdata.mode_count = ARRAY_SIZE(apf28dev_video_modes); | 421 | mxsfb_pdata.mode_count = ARRAY_SIZE(apf28dev_video_modes); |
| 424 | mxsfb_pdata.default_bpp = 16; | 422 | mxsfb_pdata.default_bpp = 16; |
| 425 | mxsfb_pdata.ld_intf_width = STMLCDIF_16BIT; | 423 | mxsfb_pdata.ld_intf_width = STMLCDIF_16BIT; |
| 424 | mxsfb_pdata.sync = MXSFB_SYNC_DATA_ENABLE_HIGH_ACT | | ||
| 425 | MXSFB_SYNC_DOTCLK_FAILING_ACT; | ||
| 426 | } | 426 | } |
| 427 | 427 | ||
| 428 | static void __init mxs_machine_init(void) | 428 | static void __init mxs_machine_init(void) |
