video: atmel_lcdfb: pass the pdata as params

plagnioj · tomba · commit ce3b64f5f1ba · 2013-09-27T09:26:20.000+03:00
so we can use have list gpio as example (probe via DT)

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD &lt;plagnioj@jcrosoft.com&gt;
Signed-off-by: Tomi Valkeinen &lt;tomi.valkeinen@ti.com&gt;
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
@@ -389,7 +389,7 @@ static struct fb_monspecs at91fb_default_stn_monspecs = {
 					| ATMEL_LCDC_IFWIDTH_4 \
 					| ATMEL_LCDC_SCANMOD_SINGLE)
 
-static void at91_lcdc_stn_power_control(int on)
+static void at91_lcdc_stn_power_control(struct atmel_lcdfb_pdata *pdata, int on)
 {
 	/* backlight */
 	if (on) {	/* power up */
@@ -445,7 +445,7 @@ static struct fb_monspecs at91fb_default_tft_monspecs = {
 					| ATMEL_LCDC_DISTYPE_TFT    \
 					| ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
 
-static void at91_lcdc_tft_power_control(int on)
+static void at91_lcdc_tft_power_control(struct atmel_lcdfb_pdata *pdata, int on)
 {
 	if (on)
 		at91_set_gpio_value(AT91_PIN_PA12, 0);	/* power up */
diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
@@ -275,7 +275,7 @@ static struct fb_monspecs at91fb_default_monspecs = {
 					| ATMEL_LCDC_DISTYPE_TFT \
 					| ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
 
-static void at91_lcdc_power_control(int on)
+static void at91_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on)
 {
 	at91_set_gpio_value(AT91_PIN_PA30, on);
 }
diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c
@@ -170,7 +170,7 @@ static struct fb_monspecs at91fb_default_monspecs = {
 					| ATMEL_LCDC_DISTYPE_TFT \
 					| ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)
 
-static void at91_lcdc_power_control(int on)
+static void at91_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on)
 {
 	if (on)
 		at91_set_gpio_value(AT91_PIN_PC1, 0);	/* power up */
diff --git a/arch/avr32/boards/atngw100/evklcd10x.c b/arch/avr32/boards/atngw100/evklcd10x.c
@@ -145,7 +145,7 @@ static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = {
 };
 #endif
 
-static void atevklcd10x_lcdc_power_control(int on)
+static void atevklcd10x_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on)
 {
 	gpio_set_value(GPIO_PIN_PB(15), on);
 }
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
@@ -293,7 +293,7 @@ static inline void atmel_lcdfb_power_control(struct atmel_lcdfb_info *sinfo, int
 	struct atmel_lcdfb_pdata *pdata = &sinfo->pdata;
 
 	if (pdata->atmel_lcdfb_power_control)
-		pdata->atmel_lcdfb_power_control(on);
+		pdata->atmel_lcdfb_power_control(pdata, on);
 }
 
 static struct fb_fix_screeninfo atmel_lcdfb_fix __initdata = {
diff --git a/include/video/atmel_lcdc.h b/include/video/atmel_lcdc.h
@@ -41,8 +41,10 @@ struct atmel_lcdfb_pdata {
 	u8			lcd_wiring_mode;
 	unsigned int		default_lcdcon2;
 	unsigned int		default_dmacon;
-	void (*atmel_lcdfb_power_control)(int on);
+	void (*atmel_lcdfb_power_control)(struct atmel_lcdfb_pdata *pdata, int on);
 	struct fb_monspecs	*default_monspecs;
+
+	struct list_head	pwr_gpios;
 };
 
 #define ATMEL_LCDC_DMABADDR1	0x00

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ static struct fb_monspecs at91fb_default_monspecs = {`
`275`	`275`	`\| ATMEL_LCDC_DISTYPE_TFT \`
`276`	`276`	`\| ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)`
`277`	`277`
`278`		`-static void at91_lcdc_power_control(int on)`
	`278`	`+static void at91_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on)`
`279`	`279`	`{`
`280`	`280`	`at91_set_gpio_value(AT91_PIN_PA30, on);`
`281`	`281`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ static struct fb_monspecs at91fb_default_monspecs = {`
`170`	`170`	`\| ATMEL_LCDC_DISTYPE_TFT \`
`171`	`171`	`\| ATMEL_LCDC_CLKMOD_ALWAYSACTIVE)`
`172`	`172`
`173`		`-static void at91_lcdc_power_control(int on)`
	`173`	`+static void at91_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on)`
`174`	`174`	`{`
`175`	`175`	`if (on)`
`176`	`176`	`at91_set_gpio_value(AT91_PIN_PC1, 0); /* power up */`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ static struct atmel_lcdfb_pdata __initdata atevklcd10x_lcdc_data = {`
`145`	`145`	`};`
`146`	`146`	`#endif`
`147`	`147`
`148`		`-static void atevklcd10x_lcdc_power_control(int on)`
	`148`	`+static void atevklcd10x_lcdc_power_control(struct atmel_lcdfb_pdata *pdata, int on)`
`149`	`149`	`{`
`150`	`150`	`gpio_set_value(GPIO_PIN_PB(15), on);`
`151`	`151`	`}`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ static inline void atmel_lcdfb_power_control(struct atmel_lcdfb_info *sinfo, int`
`293`	`293`	`struct atmel_lcdfb_pdata *pdata = &sinfo->pdata;`
`294`	`294`
`295`	`295`	`if (pdata->atmel_lcdfb_power_control)`
`296`		`- pdata->atmel_lcdfb_power_control(on);`
	`296`	`+ pdata->atmel_lcdfb_power_control(pdata, on);`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`static struct fb_fix_screeninfo atmel_lcdfb_fix __initdata = {`