Commit 6f936474 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: omap1: innovator: pass lcd control address as pdata 



To avoid using the mach/omap1510.h header file, pass the correct
address as platform data.

Acked-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 7727adb9

arch/arm/mach-omap1/board-innovator.c

+3 −0
Original line number Diff line number Diff line
@@ -194,6 +194,9 @@ static struct platform_device innovator1510_smc91x_device = { 
static struct platform_device innovator1510_lcd_device = {

	.name		= "lcd_inn1510",

	.id		= -1,

	.dev	= {

		.platform_data = (void __force *)OMAP1510_FPGA_LCD_PANEL_CONTROL,

	}

};



static struct platform_device innovator1510_spi_device = {

drivers/video/fbdev/omap/lcd_inn1510.c

+5 −2
Original line number Diff line number Diff line
@@ -14,15 +14,17 @@ 


#include "omapfb.h"



static void __iomem *omap1510_fpga_lcd_panel_control;



static int innovator1510_panel_enable(struct lcd_panel *panel)

{

	__raw_writeb(0x7, OMAP1510_FPGA_LCD_PANEL_CONTROL);

	__raw_writeb(0x7, omap1510_fpga_lcd_panel_control);

	return 0;

}



static void innovator1510_panel_disable(struct lcd_panel *panel)

{

	__raw_writeb(0x0, OMAP1510_FPGA_LCD_PANEL_CONTROL);

	__raw_writeb(0x0, omap1510_fpga_lcd_panel_control);

}



static struct lcd_panel innovator1510_panel = {
@@ -48,6 +50,7 @@ static struct lcd_panel innovator1510_panel = { 


static int innovator1510_panel_probe(struct platform_device *pdev)

{

	omap1510_fpga_lcd_panel_control = (void __iomem *)pdev->dev.platform_data;

	omapfb_register_panel(&innovator1510_panel);

	return 0;

}