iMX/i2som-imx-uboot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENGR00315894-70 iMX6SX:Video Update MXS LCDIF driver

Browse Source 
Add a new interface "mxs_lcd_panel_setup" to setup fb parameters and
specifies the LCDIF controller for multiple controllers of iMX6SX.
Pass fb parameters via "videomode" env remains work if the new interface
is not called before video initialization.

Modify LCDIF clock interface "mxs_set_lcdclk" to support multiple
LCDIF controllers on iMX6SX.

Signed-off-by: Ye.Li <B37916@freescale.com>
Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
(cherry picked from commit d7f49b9378)
This commit is contained in:
Ye.Li
2014-06-12 17:10:32 +08:00
committed by Ye Li
parent 86135fb7e5
commit e1343191b9
3 changed files with 89 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/arm926ejs/mxs/clock.c
View File

@ -5,7 +5,7 @@
* on behalf of DENX Software Engineering GmbH
*
* Based on code from LTIB:
* Copyright (C) 2010 Freescale Semiconductor, Inc.
* Copyright (C) 2010-2014 Freescale Semiconductor, Inc.
*
* SPDX-License-Identifier: GPL-2.0+
*/

71
drivers/video/mxsfb.c
View File

@ -3,6 +3,8 @@
*
* Copyright (C) 2011-2013 Marek Vasut <marex@denx.de>
*
* Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
*
* SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
@ -18,6 +20,11 @@
#include <asm/imx-common/dma.h>
#include "videomodes.h"
#include <linux/string.h>
#include <linux/list.h>
#include <linux/fb.h>
#include <mxsfb.h>
#define PS2KHZ(ps) (1000000000UL / (ps))
@ -35,6 +42,31 @@ __weak void mxsfb_system_setup(void)
{
}
static int setup;
static struct fb_videomode fbmode;
static int depth;
int mxs_lcd_panel_setup(struct fb_videomode mode, int bpp,
uint32_t base_addr)
{
fbmode = mode;
depth = bpp;
panel.isaBase = base_addr;
setup = 1;
return 0;
}
void mxs_lcd_get_panel(struct display_panel *dispanel)
{
dispanel->width = fbmode.xres;
dispanel->height = fbmode.yres;
dispanel->reg_base = panel.isaBase;
dispanel->gdfindex = panel.gdfIndex;
dispanel->gdfbytespp = panel.gdfBytesPP;
}
/*
* DENX M28EVK:
* setenv videomode
@ -50,12 +82,12 @@ __weak void mxsfb_system_setup(void)
static void mxs_lcd_init(GraphicDevice *panel,
struct ctfb_res_modes *mode, int bpp)
{
struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)MXS_LCDIF_BASE;
struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)(panel->isaBase);
uint32_t word_len = 0, bus_width = 0;
uint8_t valid_data = 0;
/* Kick in the LCDIF clock */
mxs_set_lcdclk(MXS_LCDIF_BASE, PS2KHZ(mode->pixclock));
mxs_set_lcdclk(panel->isaBase, PS2KHZ(mode->pixclock));
/* Restart the LCDIF block */
mxs_reset_block(&regs->hw_lcdif_ctrl_reg);
@ -133,7 +165,7 @@ static void mxs_lcd_init(GraphicDevice *panel,
void lcdif_power_down(void)
{
struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)MXS_LCDIF_BASE;
struct mxs_lcdif_regs *regs = (struct mxs_lcdif_regs *)(panel.isaBase);
int timeout = 1000000;
writel(panel.frameAdrs, &regs->hw_lcdif_cur_buf_reg);
@ -157,19 +189,37 @@ void *video_hw_init(void)
puts("Video: ");
/* Suck display configuration from "videomode" variable */
penv = getenv("videomode");
if (!penv) {
puts("MXSFB: 'videomode' variable not set!\n");
return NULL;
}
if (!setup) {
bpp = video_get_params(&mode, penv);
/* Suck display configuration from "videomode" variable */
penv = getenv("videomode");
if (!penv) {
printf("MXSFB: 'videomode' variable not set!\n");
return NULL;
}
bpp = video_get_params(&mode, penv);
panel.isaBase = MXS_LCDIF_BASE;
} else {
mode.xres = fbmode.xres;
mode.yres = fbmode.yres;
mode.pixclock = fbmode.pixclock;
mode.left_margin = fbmode.left_margin;
mode.right_margin = fbmode.right_margin;
mode.upper_margin = fbmode.upper_margin;
mode.lower_margin = fbmode.lower_margin;
mode.hsync_len = fbmode.hsync_len;
mode.vsync_len = fbmode.vsync_len;
mode.sync = fbmode.sync;
mode.vmode = fbmode.vmode;
bpp = depth;
}
/* fill in Graphic device struct */
sprintf(panel.modeIdent, "%dx%dx%d",
mode.xres, mode.yres, bpp);
panel.winSizeX = mode.xres;
panel.winSizeY = mode.yres;
panel.plnSizeX = mode.xres;
@ -196,6 +246,7 @@ void *video_hw_init(void)
panel.memSize = mode.xres * mode.yres * panel.gdfBytesPP;
/* Allocate framebuffer */
fb = memalign(ARCH_DMA_MINALIGN,
roundup(panel.memSize, ARCH_DMA_MINALIGN));

27
include/mxsfb.h Normal file
View File

@ -0,0 +1,27 @@
/*
* Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
*
* SPDX-License-Identifier: GPL-2.0+
*/
#ifndef __MXSFB_H__
#define __MXSFB_H__
#include <linux/fb.h>
#ifdef CONFIG_VIDEO_MXS
struct display_panel {
unsigned int reg_base;
unsigned int width;
unsigned int height;
unsigned int gdfindex;
unsigned int gdfbytespp;
};
void mxs_lcd_get_panel(struct display_panel *panel);
void lcdif_power_down(void);
int mxs_lcd_panel_setup(struct fb_videomode mode, int bpp,
uint32_t base_addr);
#endif
#endif /* __MXSFB_H__ */