leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video: mxsfb: refactor for using display_timings

Browse Source 
struct display_timings provides more informations such clock and DE
polarity, so let's refactor the code to use struct display_timings
instead of struct ctfb_res_modes, so we'll become able to get clock and
DE polarity settings and set register according to them in the next patch.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Reviewed-by: Anatolij Gustschin <agust@denx.de>
This commit is contained in:
Giulio Benetti 2020-04-08 17:10:15 +02:00 committed by Stefano Babic
parent aa045701c2
commit abda0a5a22
1 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
drivers/video/mxsfb.c
View File

@ -54,7 +54,7 @@ __weak void mxsfb_system_setup(void)
*/ */
static void mxs_lcd_init(struct udevice *dev, u32 fb_addr, static void mxs_lcd_init(struct udevice *dev, u32 fb_addr,
struct ctfb_res_modes *mode, int bpp) struct display_timing *timings, int bpp)
{ {
struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)MXS_LCDIF_BASE; struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)MXS_LCDIF_BASE;
uint32_t word_len = 0, bus_width = 0; uint32_t word_len = 0, bus_width = 0;
@ -70,14 +70,14 @@ static void mxs_lcd_init(struct udevice *dev, u32 fb_addr,
return; return;
} }
ret = clk_set_rate(&per_clk, PS2KHZ(mode->pixclock) * 1000); ret = clk_set_rate(&per_clk, timings->pixelclock.typ);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Failed to set mxs clk: %d\n", ret); dev_err(dev, "Failed to set mxs clk: %d\n", ret);
return; return;
} }
#else #else
/* Kick in the LCDIF clock */ /* Kick in the LCDIF clock */
mxs_set_lcdclk(MXS_LCDIF_BASE, PS2KHZ(mode->pixclock)); mxs_set_lcdclk(MXS_LCDIF_BASE, timings->pixelclock.typ / 1000);
#endif #endif
/* Restart the LCDIF block */ /* Restart the LCDIF block */
@ -115,25 +115,25 @@ static void mxs_lcd_init(struct udevice *dev, u32 fb_addr,
mxsfb_system_setup(); mxsfb_system_setup();
writel((mode->yres << LCDIF_TRANSFER_COUNT_V_COUNT_OFFSET) | mode->xres, writel((timings->vactive.typ << LCDIF_TRANSFER_COUNT_V_COUNT_OFFSET) |
&regs->hw_lcdif_transfer_count); timings->hactive.typ, &regs->hw_lcdif_transfer_count);
writel(LCDIF_VDCTRL0_ENABLE_PRESENT | LCDIF_VDCTRL0_ENABLE_POL | writel(LCDIF_VDCTRL0_ENABLE_PRESENT | LCDIF_VDCTRL0_ENABLE_POL |
LCDIF_VDCTRL0_VSYNC_PERIOD_UNIT | LCDIF_VDCTRL0_VSYNC_PERIOD_UNIT |
LCDIF_VDCTRL0_VSYNC_PULSE_WIDTH_UNIT | LCDIF_VDCTRL0_VSYNC_PULSE_WIDTH_UNIT |
mode->vsync_len, &regs->hw_lcdif_vdctrl0); timings->vsync_len.typ, &regs->hw_lcdif_vdctrl0);
writel(mode->upper_margin + mode->lower_margin + writel(timings->vback_porch.typ + timings->vfront_porch.typ +
mode->vsync_len + mode->yres, timings->vsync_len.typ + timings->vactive.typ,
&regs->hw_lcdif_vdctrl1); &regs->hw_lcdif_vdctrl1);
writel((mode->hsync_len << LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_OFFSET) | writel((timings->hsync_len.typ << LCDIF_VDCTRL2_HSYNC_PULSE_WIDTH_OFFSET) |
(mode->left_margin + mode->right_margin + (timings->hback_porch.typ + timings->hfront_porch.typ +
mode->hsync_len + mode->xres), timings->hsync_len.typ + timings->hactive.typ),
&regs->hw_lcdif_vdctrl2); &regs->hw_lcdif_vdctrl2);
writel(((mode->left_margin + mode->hsync_len) << writel(((timings->hback_porch.typ + timings->hsync_len.typ) <<
LCDIF_VDCTRL3_HORIZONTAL_WAIT_CNT_OFFSET) | LCDIF_VDCTRL3_HORIZONTAL_WAIT_CNT_OFFSET) |
(mode->upper_margin + mode->vsync_len), (timings->vback_porch.typ + timings->vsync_len.typ),
&regs->hw_lcdif_vdctrl3); &regs->hw_lcdif_vdctrl3);
writel((0 << LCDIF_VDCTRL4_DOTCLK_DLY_SEL_OFFSET) | mode->xres, writel((0 << LCDIF_VDCTRL4_DOTCLK_DLY_SEL_OFFSET) | timings->hactive.typ,
&regs->hw_lcdif_vdctrl4); &regs->hw_lcdif_vdctrl4);
writel(fb_addr, &regs->hw_lcdif_cur_buf); writel(fb_addr, &regs->hw_lcdif_cur_buf);
@ -154,11 +154,11 @@ static void mxs_lcd_init(struct udevice *dev, u32 fb_addr,
writel(LCDIF_CTRL_RUN, &regs->hw_lcdif_ctrl_set); writel(LCDIF_CTRL_RUN, &regs->hw_lcdif_ctrl_set);
} }
static int mxs_probe_common(struct udevice *dev, struct ctfb_res_modes *mode, static int mxs_probe_common(struct udevice *dev, struct display_timing *timings,
int bpp, u32 fb) int bpp, u32 fb)
{ {
/* Start framebuffer */ /* Start framebuffer */
mxs_lcd_init(dev, fb, mode, bpp); mxs_lcd_init(dev, fb, timings, bpp);
#ifdef CONFIG_VIDEO_MXS_MODE_SYSTEM #ifdef CONFIG_VIDEO_MXS_MODE_SYSTEM
/* /*
@ -224,6 +224,7 @@ void *video_hw_init(void)
char *penv; char *penv;
void *fb = NULL; void *fb = NULL;
struct ctfb_res_modes mode; struct ctfb_res_modes mode;
struct display_timing timings;
puts("Video: "); puts("Video: ");
@ -280,7 +281,9 @@ void *video_hw_init(void)
printf("%s\n", panel.modeIdent); printf("%s\n", panel.modeIdent);
ret = mxs_probe_common(NULL, &mode, bpp, (u32)fb); video_ctfb_mode_to_display_timing(&mode, &timings);
ret = mxs_probe_common(NULL, &timings, bpp, (u32)fb);
if (ret) if (ret)
goto dealloc_fb; goto dealloc_fb;
@ -334,7 +337,6 @@ static int mxs_video_probe(struct udevice *dev)
struct video_uc_platdata *plat = dev_get_uclass_platdata(dev); struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev);
struct ctfb_res_modes mode;
struct display_timing timings; struct display_timing timings;
u32 bpp = 0; u32 bpp = 0;
u32 fb_start, fb_end; u32 fb_start, fb_end;
@ -347,17 +349,7 @@ static int mxs_video_probe(struct udevice *dev)
if (ret) if (ret)
return ret; return ret;
mode.xres = timings.hactive.typ; ret = mxs_probe_common(dev, &timings, bpp, plat->base);
mode.yres = timings.vactive.typ;
mode.left_margin = timings.hback_porch.typ;
mode.right_margin = timings.hfront_porch.typ;
mode.upper_margin = timings.vback_porch.typ;
mode.lower_margin = timings.vfront_porch.typ;
mode.hsync_len = timings.hsync_len.typ;
mode.vsync_len = timings.vsync_len.typ;
mode.pixclock = HZ2PS(timings.pixelclock.typ);
ret = mxs_probe_common(dev, &mode, bpp, plat->base);
if (ret) if (ret)
return ret; return ret;
@ -378,8 +370,8 @@ static int mxs_video_probe(struct udevice *dev)
return -EINVAL; return -EINVAL;
} }
uc_priv->xsize = mode.xres; uc_priv->xsize = timings.hactive.typ;
uc_priv->ysize = mode.yres; uc_priv->ysize = timings.vactive.typ;
/* Enable dcache for the frame buffer */ /* Enable dcache for the frame buffer */
fb_start = plat->base & ~(MMU_SECTION_SIZE - 1); fb_start = plat->base & ~(MMU_SECTION_SIZE - 1);