에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit 84260e668bed6fcb18de7cc39fc94f7687e414c9

Authored by 장형기
1 parent e947c772f3
Exists in master and in 2 other branches fhd, fhd-demo

u-boot lcd enable

Showing 4 changed files with 25 additions and 32 deletions   Show diff stats
bootloader/u-boot_2015_04/board/falinux/mx6s_prime_oven/mx6s_prime_oven.c
  Diff comments   View file @84260e6
@@ -387,18 +387,10 @@ static iomux_v3_cfg_t const backlight_pads[] = { @@ -387,18 +387,10 @@ static iomux_v3_cfg_t const backlight_pads[] = {
387 // Dual LVDS 387 // Dual LVDS
388 static void enable_lvds(struct display_info_t const *dev) 388 static void enable_lvds(struct display_info_t const *dev)
389 { 389 {
390 - struct iomuxc *iomux = (struct iomuxc *) IOMUXC_BASE_ADDR;  
391 - u32 reg = readl(&iomux->gpr[2]);  
392 -  
393 - reg |= IOMUXC_GPR2_DATA_WIDTH_CH0_18BIT | IOMUXC_GPR2_DATA_WIDTH_CH1_18BIT;  
394 - writel(reg, &iomux->gpr[2]);  
395 -  
396 /* backlights off until needed */ 390 /* backlights off until needed */
397 imx_iomux_v3_setup_multiple_pads(backlight_pads, ARRAY_SIZE(backlight_pads)); 391 imx_iomux_v3_setup_multiple_pads(backlight_pads, ARRAY_SIZE(backlight_pads));
398 392
399 - gpio_direction_output(IMX_GPIO_NR(6, 7), 1);  
400 -  
401 - /* enable backlight PWM 1 */ 393 + /* enable backlight PWM 1 */
402 if (pwm_init(0, 0, 0)) 394 if (pwm_init(0, 0, 0))
403 goto error; 395 goto error;
404 /* duty cycle 500ns, period: 3000ns */ 396 /* duty cycle 500ns, period: 3000ns */
@@ -406,6 +398,11 @@ static void enable_lvds(struct display_info_t const *dev) @@ -406,6 +398,11 @@ static void enable_lvds(struct display_info_t const *dev)
406 goto error; 398 goto error;
407 if (pwm_enable(0)) 399 if (pwm_enable(0))
408 goto error; 400 goto error;
  401 +
  402 + gpio_direction_output(IMX_GPIO_NR(6, 7), 0);
  403 + mdelay(100);
  404 + gpio_set_value(IMX_GPIO_NR(6, 7), 1);
  405 +
409 return; 406 return;
410 407
411 error: 408 error:
@@ -425,10 +422,6 @@ static void enable_lvds_jeida(struct display_info_t const *dev) @@ -425,10 +422,6 @@ static void enable_lvds_jeida(struct display_info_t const *dev)
425 /* backlights off until needed */ 422 /* backlights off until needed */
426 imx_iomux_v3_setup_multiple_pads(backlight_pads, ARRAY_SIZE(backlight_pads)); 423 imx_iomux_v3_setup_multiple_pads(backlight_pads, ARRAY_SIZE(backlight_pads));
427 424
428 - gpio_direction_output(IMX_GPIO_NR(6, 7), 0);  
429 - mdelay(100);  
430 - gpio_set_value(IMX_GPIO_NR(6, 7), 1);  
431 -  
432 /* enable backlight PWM 1 */ 425 /* enable backlight PWM 1 */
433 if (pwm_init(0, 0, 0)) 426 if (pwm_init(0, 0, 0))
434 goto error; 427 goto error;
@@ -437,6 +430,11 @@ static void enable_lvds_jeida(struct display_info_t const *dev) @@ -437,6 +430,11 @@ static void enable_lvds_jeida(struct display_info_t const *dev)
437 goto error; 430 goto error;
438 if (pwm_enable(0)) 431 if (pwm_enable(0))
439 goto error; 432 goto error;
  433 +
  434 + gpio_direction_output(IMX_GPIO_NR(6, 7), 0);
  435 + mdelay(100);
  436 + gpio_set_value(IMX_GPIO_NR(6, 7), 1);
  437 +
440 return; 438 return;
441 439
442 error: 440 error:
@@ -448,7 +446,7 @@ struct display_info_t const displays[] = { @@ -448,7 +446,7 @@ struct display_info_t const displays[] = {
448 { 446 {
449 .bus = -1, 447 .bus = -1,
450 .addr = 0, 448 .addr = 0,
451 - .pixfmt = IPU_PIX_FMT_RGB24, 449 + .pixfmt = IPU_PIX_FMT_RGB666, // IPU_PIX_FMT_LVDS666
452 .detect = NULL, 450 .detect = NULL,
453 .enable = enable_lvds, 451 .enable = enable_lvds,
454 .mode = { 452 .mode = {
@@ -456,18 +454,14 @@ struct display_info_t const displays[] = { @@ -456,18 +454,14 @@ struct display_info_t const displays[] = {
456 .refresh = 60, 454 .refresh = 60,
457 .xres = 1600, 455 .xres = 1600,
458 .yres = 900, 456 .yres = 900,
459 - .pixclock = 10800, // ((1000000000 / (1600+44+24+24) * 1000) / (900+7+2+3)) / 60 = 10800  
460 -// .pixclock = KHZ2PICOS(108000), // ((1000000000 / (1600+44+24+24) * 1000) / (900+7+2+3)) / 60 = 10800  
461 - .left_margin = 44, // hsync back porch 457 + .pixclock = 10800, // ((1000000000 / (1600+44+24+24) * 1000) / (900+7+2+3)) / 60 = 10800
  458 + .left_margin = 54, // hsync back porch
462 .right_margin = 24, // hsync front porch 459 .right_margin = 24, // hsync front porch
463 .upper_margin = 7, // vsync back porch 460 .upper_margin = 7, // vsync back porch
464 .lower_margin = 2, // hsync fron porch 461 .lower_margin = 2, // hsync fron porch
465 .hsync_len = 24, 462 .hsync_len = 24,
466 .vsync_len = 3, 463 .vsync_len = 3,
467 -// .sync = 0,  
468 - .sync = FB_SYNC_HOR_HIGH_ACT |  
469 - FB_SYNC_VERT_HIGH_ACT |  
470 - FB_SYNC_EXT, 464 + .sync = FB_SYNC_EXT,
471 .vmode = FB_VMODE_NONINTERLACED 465 .vmode = FB_VMODE_NONINTERLACED
472 } 466 }
473 } 467 }
@@ -488,7 +482,8 @@ static void setup_display(void) @@ -488,7 +482,8 @@ static void setup_display(void)
488 482
489 /* IPU1 D0 clock is 227.5 / 3.5 = 65MHz */ 483 /* IPU1 D0 clock is 227.5 / 3.5 = 65MHz */
490 reg = readl(&mxc_ccm->cscmr2); 484 reg = readl(&mxc_ccm->cscmr2);
491 - reg |= MXC_CCM_CSCMR2_LDB_DI0_IPU_DIV | MXC_CCM_CSCMR2_LDB_DI1_IPU_DIV; 485 + reg &= ~(MXC_CCM_CSCMR2_LDB_DI0_IPU_DIV | MXC_CCM_CSCMR2_LDB_DI1_IPU_DIV); // divide by 3.5
  486 +// reg |= (MXC_CCM_CSCMR2_LDB_DI0_IPU_DIV | MXC_CCM_CSCMR2_LDB_DI1_IPU_DIV); // divide by 7
492 writel(reg, &mxc_ccm->cscmr2); 487 writel(reg, &mxc_ccm->cscmr2);
493 488
494 /* Set LDB_DI0, LDB_DI1 as clock source for IPU_DI0, IPU_DI1 */ 489 /* Set LDB_DI0, LDB_DI1 as clock source for IPU_DI0, IPU_DI1 */
@@ -516,9 +511,9 @@ static void setup_display(void) @@ -516,9 +511,9 @@ static void setup_display(void)
516 |IOMUXC_GPR2_DI1_VS_POLARITY_ACTIVE_LOW 511 |IOMUXC_GPR2_DI1_VS_POLARITY_ACTIVE_LOW
517 |IOMUXC_GPR2_DI0_VS_POLARITY_ACTIVE_LOW 512 |IOMUXC_GPR2_DI0_VS_POLARITY_ACTIVE_LOW
518 |IOMUXC_GPR2_BIT_MAPPING_CH1_SPWG 513 |IOMUXC_GPR2_BIT_MAPPING_CH1_SPWG
519 - |IOMUXC_GPR2_DATA_WIDTH_CH1_24BIT 514 + |IOMUXC_GPR2_DATA_WIDTH_CH1_18BIT
520 |IOMUXC_GPR2_BIT_MAPPING_CH0_SPWG 515 |IOMUXC_GPR2_BIT_MAPPING_CH0_SPWG
521 - |IOMUXC_GPR2_DATA_WIDTH_CH0_24BIT 516 + |IOMUXC_GPR2_DATA_WIDTH_CH0_18BIT
522 |IOMUXC_GPR2_SPLIT_MODE_EN_MASK 517 |IOMUXC_GPR2_SPLIT_MODE_EN_MASK
523 |IOMUXC_GPR2_LVDS_CH1_MODE_ENABLED_DI0 518 |IOMUXC_GPR2_LVDS_CH1_MODE_ENABLED_DI0
524 |IOMUXC_GPR2_LVDS_CH0_MODE_ENABLED_DI0; 519 |IOMUXC_GPR2_LVDS_CH0_MODE_ENABLED_DI0;
@@ -529,7 +524,6 @@ static void setup_display(void) @@ -529,7 +524,6 @@ static void setup_display(void)
529 | (IOMUXC_GPR3_MUX_SRC_IPU1_DI0 << IOMUXC_GPR3_LVDS0_MUX_CTL_OFFSET) 524 | (IOMUXC_GPR3_MUX_SRC_IPU1_DI0 << IOMUXC_GPR3_LVDS0_MUX_CTL_OFFSET)
530 | (IOMUXC_GPR3_MUX_SRC_IPU1_DI0 << IOMUXC_GPR3_LVDS1_MUX_CTL_OFFSET); 525 | (IOMUXC_GPR3_MUX_SRC_IPU1_DI0 << IOMUXC_GPR3_LVDS1_MUX_CTL_OFFSET);
531 writel(reg, &iomux->gpr[3]); 526 writel(reg, &iomux->gpr[3]);
532 -  
533 } 527 }
534 #endif 528 #endif
535 529
@@ -637,5 +631,5 @@ int misc_init_r(void) @@ -637,5 +631,5 @@ int misc_init_r(void)
637 #endif 631 #endif
638 setenv_hex("reset_cause", get_imx_reset_cause()); 632 setenv_hex("reset_cause", get_imx_reset_cause());
639 633
640 - return 0; 634 + return 0;
641 } 635 }
bootloader/u-boot_2015_04/drivers/video/ipu_disp.c
  Diff comments   View file @84260e6
@@ -887,15 +887,15 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk, @@ -887,15 +887,15 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk,
887 } 887 }
888 clk_set_parent(g_pixel_clk[disp], g_ldb_clk); 888 clk_set_parent(g_pixel_clk[disp], g_ldb_clk);
889 } else { 889 } else {
890 - if (clk_get_usecount(g_pixel_clk[disp]) != 0) 890 + if (clk_get_usecount(g_pixel_clk[disp]) != 0) {
891 clk_set_parent(g_pixel_clk[disp], g_ipu_clk); 891 clk_set_parent(g_pixel_clk[disp], g_ipu_clk);
  892 + }
892 } 893 }
893 rounded_pixel_clk = clk_round_rate(g_pixel_clk[disp], pixel_clk); 894 rounded_pixel_clk = clk_round_rate(g_pixel_clk[disp], pixel_clk);
894 clk_set_rate(g_pixel_clk[disp], rounded_pixel_clk); 895 clk_set_rate(g_pixel_clk[disp], rounded_pixel_clk);
895 udelay(5000); 896 udelay(5000);
896 /* Get integer portion of divider */ 897 /* Get integer portion of divider */
897 - div = clk_get_rate(clk_get_parent(g_pixel_clk[disp])) /  
898 - rounded_pixel_clk; 898 + div = clk_get_rate(clk_get_parent(g_pixel_clk[disp])) / rounded_pixel_clk;
899 899
900 ipu_di_data_wave_config(disp, SYNC_WAVE, div - 1, div - 1); 900 ipu_di_data_wave_config(disp, SYNC_WAVE, div - 1, div - 1);
901 ipu_di_data_pin_config(disp, SYNC_WAVE, DI_PIN15, 3, 0, div * 2); 901 ipu_di_data_pin_config(disp, SYNC_WAVE, DI_PIN15, 3, 0, div * 2);
bootloader/u-boot_2015_04/drivers/video/mxc_ipuv3_fb.c
  Diff comments   View file @84260e6
@@ -259,7 +259,6 @@ static int mxcfb_set_par(struct fb_info *fbi) @@ -259,7 +259,6 @@ static int mxcfb_set_par(struct fb_info *fbi)
259 sig_cfg.clkidle_en = 1; 259 sig_cfg.clkidle_en = 1;
260 260
261 debug("pixclock = %lu Hz\n", PICOS2KHZ(fbi->var.pixclock) * 1000UL); 261 debug("pixclock = %lu Hz\n", PICOS2KHZ(fbi->var.pixclock) * 1000UL);
262 - printf("pixclock = %lu Hz\n", PICOS2KHZ(fbi->var.pixclock) * 1000UL);  
263 262
264 if (ipu_init_sync_panel(mxc_fbi->ipu_di, 263 if (ipu_init_sync_panel(mxc_fbi->ipu_di,
265 (PICOS2KHZ(fbi->var.pixclock)) * 1000UL, 264 (PICOS2KHZ(fbi->var.pixclock)) * 1000UL,
kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven.dtsi
  Diff comments   View file @84260e6
@@ -410,10 +410,10 @@ @@ -410,10 +410,10 @@
410 display-timings { 410 display-timings {
411 native-mode = <&timing0>; 411 native-mode = <&timing0>;
412 timing0: LDB-LP133WD2 { 412 timing0: LDB-LP133WD2 {
413 - clock-frequency = <96870000>; /* 48870000 */ 413 + clock-frequency = <92592000>; /* 48870000 96870000*/
414 hactive = <1600>; 414 hactive = <1600>;
415 vactive = <900>; 415 vactive = <900>;
416 - hback-porch = <44>; 416 + hback-porch = <54>;
417 hfront-porch = <24>; 417 hfront-porch = <24>;
418 vback-porch = <7>; 418 vback-porch = <7>;
419 vfront-porch = <2>; 419 vfront-porch = <2>;