Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8af2c286 authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Tomi Valkeinen
Browse files

video: atmel_lcdfb: fix platform data struct 



Today we mix pdata and drivers data in the struct atmel_lcdfb_info
Fix it and introduce a new struct atmel_lcdfb_pdata for platform data only

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 090fd593

arch/arm/mach-at91/at91sam9261_devices.c

+3 −3
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ void __init at91_add_device_spi(struct spi_board_info *devices, int nr_devices) 


#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)

static u64 lcdc_dmamask = DMA_BIT_MASK(32);

static struct atmel_lcdfb_info lcdc_data;

static struct atmel_lcdfb_pdata lcdc_data;



static struct resource lcdc_resources[] = {

	[0] = {
@@ -498,7 +498,7 @@ static struct platform_device at91_lcdc_device = { 
	.num_resources	= ARRAY_SIZE(lcdc_resources),

};



void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)

void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data)

{

	if (!data) {

		return;
@@ -559,7 +559,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) 
	platform_device_register(&at91_lcdc_device);

}

#else

void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}

void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) {}

#endif

arch/arm/mach-at91/at91sam9263_devices.c

+3 −3
Original line number Diff line number Diff line
@@ -832,7 +832,7 @@ void __init at91_add_device_can(struct at91_can_data *data) {} 


#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)

static u64 lcdc_dmamask = DMA_BIT_MASK(32);

static struct atmel_lcdfb_info lcdc_data;

static struct atmel_lcdfb_pdata lcdc_data;



static struct resource lcdc_resources[] = {

	[0] = {
@@ -859,7 +859,7 @@ static struct platform_device at91_lcdc_device = { 
	.num_resources	= ARRAY_SIZE(lcdc_resources),

};



void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)

void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data)

{

	if (!data)

		return;
@@ -891,7 +891,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) 
	platform_device_register(&at91_lcdc_device);

}

#else

void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}

void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) {}

#endif

arch/arm/mach-at91/at91sam9g45_devices.c

+3 −3
Original line number Diff line number Diff line
@@ -965,7 +965,7 @@ void __init at91_add_device_isi(struct isi_platform_data *data, 


#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)

static u64 lcdc_dmamask = DMA_BIT_MASK(32);

static struct atmel_lcdfb_info lcdc_data;

static struct atmel_lcdfb_pdata lcdc_data;



static struct resource lcdc_resources[] = {

	[0] = {
@@ -991,7 +991,7 @@ static struct platform_device at91_lcdc_device = { 
	.num_resources	= ARRAY_SIZE(lcdc_resources),

};



void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)

void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data)

{

	if (!data)

		return;
@@ -1037,7 +1037,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) 
	platform_device_register(&at91_lcdc_device);

}

#else

void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}

void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) {}

#endif

arch/arm/mach-at91/at91sam9rl_devices.c

+3 −3
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ void __init at91_add_device_ac97(struct ac97c_platform_data *data) {} 


#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)

static u64 lcdc_dmamask = DMA_BIT_MASK(32);

static struct atmel_lcdfb_info lcdc_data;

static struct atmel_lcdfb_pdata lcdc_data;



static struct resource lcdc_resources[] = {

	[0] = {
@@ -525,7 +525,7 @@ static struct platform_device at91_lcdc_device = { 
	.num_resources	= ARRAY_SIZE(lcdc_resources),

};



void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)

void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data)

{

	if (!data) {

		return;
@@ -557,7 +557,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) 
	platform_device_register(&at91_lcdc_device);

}

#else

void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data) {}

void __init at91_add_device_lcdc(struct atmel_lcdfb_pdata *data) {}

#endif

arch/arm/mach-at91/board-sam9261ek.c

+3 −3
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static void at91_lcdc_stn_power_control(int on) 
	}

}



static struct atmel_lcdfb_info __initdata ek_lcdc_data = {

static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = {

	.default_bpp			= 1,

	.default_dmacon			= ATMEL_LCDC_DMAEN,

	.default_lcdcon2		= AT91SAM9261_DEFAULT_STN_LCDCON2,
@@ -453,7 +453,7 @@ static void at91_lcdc_tft_power_control(int on) 
		at91_set_gpio_value(AT91_PIN_PA12, 1);	/* power down */

}



static struct atmel_lcdfb_info __initdata ek_lcdc_data = {

static struct atmel_lcdfb_pdata __initdata ek_lcdc_data = {

	.lcdcon_is_backlight		= true,

	.default_bpp			= 16,

	.default_dmacon			= ATMEL_LCDC_DMAEN,
@@ -465,7 +465,7 @@ static struct atmel_lcdfb_info __initdata ek_lcdc_data = { 
#endif



#else

static struct atmel_lcdfb_info __initdata ek_lcdc_data;

static struct atmel_lcdfb_pdata __initdata ek_lcdc_data;

#endif