Commit 772a9e63 authored by Sascha Hauer's avatar Sascha Hauer Committed by Russell King

[PATCH] ARM: 2687/1: i.MX framebuffer: make dmacr register platform configurable

Patch from Sascha Hauer

The dmacr needs different settings on some boards. This patch makes the
register configurable by the platform part.
Also we have imxfb_disable_controller(), so lets use it.

Signed-off-by: Steven Scholz
Signed-off-by: Sascha Hauer
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 246b4976
...@@ -249,9 +249,6 @@ static void imxfb_enable_controller(struct imxfb_info *fbi) ...@@ -249,9 +249,6 @@ static void imxfb_enable_controller(struct imxfb_info *fbi)
/* disable hardware cursor */ /* disable hardware cursor */
LCDC_CPOS &= ~(CPOS_CC0 | CPOS_CC1); LCDC_CPOS &= ~(CPOS_CC0 | CPOS_CC1);
/* fixed burst length (see erratum 11) */
LCDC_DMACR = DMACR_BURST | DMACR_HM(8) | DMACR_TM(2);
LCDC_RMCR = RMCR_LCDC_EN; LCDC_RMCR = RMCR_LCDC_EN;
if(fbi->backlight_power) if(fbi->backlight_power)
...@@ -359,6 +356,7 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf ...@@ -359,6 +356,7 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
LCDC_PCR = fbi->pcr; LCDC_PCR = fbi->pcr;
LCDC_PWMR = fbi->pwmr; LCDC_PWMR = fbi->pwmr;
LCDC_LSCR1 = fbi->lscr1; LCDC_LSCR1 = fbi->lscr1;
LCDC_DMACR = fbi->dmacr;
return 0; return 0;
} }
...@@ -509,6 +507,7 @@ static int __init imxfb_init_fbinfo(struct device *dev) ...@@ -509,6 +507,7 @@ static int __init imxfb_init_fbinfo(struct device *dev)
fbi->cmap_inverse = inf->cmap_inverse; fbi->cmap_inverse = inf->cmap_inverse;
fbi->pcr = inf->pcr; fbi->pcr = inf->pcr;
fbi->lscr1 = inf->lscr1; fbi->lscr1 = inf->lscr1;
fbi->dmacr = inf->dmacr;
fbi->pwmr = inf->pwmr; fbi->pwmr = inf->pwmr;
fbi->lcd_power = inf->lcd_power; fbi->lcd_power = inf->lcd_power;
fbi->backlight_power = inf->backlight_power; fbi->backlight_power = inf->backlight_power;
...@@ -642,12 +641,12 @@ static int imxfb_remove(struct device *dev) ...@@ -642,12 +641,12 @@ static int imxfb_remove(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct fb_info *info = dev_get_drvdata(dev); struct fb_info *info = dev_get_drvdata(dev);
struct imxfb_info *fbi = info->par;
struct resource *res; struct resource *res;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
/* disable LCD controller */ imxfb_disable_controller(fbi);
LCDC_RMCR &= ~RMCR_LCDC_EN;
unregister_framebuffer(info); unregister_framebuffer(info);
...@@ -663,8 +662,9 @@ static int imxfb_remove(struct device *dev) ...@@ -663,8 +662,9 @@ static int imxfb_remove(struct device *dev)
void imxfb_shutdown(struct device * dev) void imxfb_shutdown(struct device * dev)
{ {
/* disable LCD Controller */ struct fb_info *info = dev_get_drvdata(dev);
LCDC_RMCR &= ~RMCR_LCDC_EN; struct imxfb_info *fbi = info->par;
imxfb_disable_controller(fbi);
} }
static struct device_driver imxfb_driver = { static struct device_driver imxfb_driver = {
......
...@@ -54,6 +54,7 @@ struct imxfb_info { ...@@ -54,6 +54,7 @@ struct imxfb_info {
u_int pcr; u_int pcr;
u_int pwmr; u_int pwmr;
u_int lscr1; u_int lscr1;
u_int dmacr;
u_int cmap_inverse:1, u_int cmap_inverse:1,
cmap_static:1, cmap_static:1,
unused:30; unused:30;
......
...@@ -25,6 +25,7 @@ struct imxfb_mach_info { ...@@ -25,6 +25,7 @@ struct imxfb_mach_info {
u_int pcr; u_int pcr;
u_int pwmr; u_int pwmr;
u_int lscr1; u_int lscr1;
u_int dmacr;
u_char * fixed_screen_cpu; u_char * fixed_screen_cpu;
dma_addr_t fixed_screen_dma; dma_addr_t fixed_screen_dma;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment