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

Commit c2439398 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mundt
Browse files

sh: add a parameter to LCDC driver's .display_on() callback 



HDMI support for the sh_mobile_lcdc framebuffer driver will require a 'struct
fb_info *' pointer for its .display_on() callback. While at it fix kfr2r09
framebuffer modular build.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent b90884c8

arch/sh/boards/mach-ap325rxa/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ static struct platform_device nand_flash_device = { 
#define PORT_DRVCRA	0xA405018A

#define PORT_DRVCRB	0xA405018C



static void ap320_wvga_power_on(void *board_data)

static void ap320_wvga_power_on(void *board_data, struct fb_info *info)

{

	msleep(100);

arch/sh/boards/mach-kfr2r09/Makefile

+4 −2
Original line number Diff line number Diff line 
obj-y	:= setup.o sdram.o

obj-$(CONFIG_FB_SH_MOBILE_LCDC)	+=  lcd_wqvga.o
 
ifneq ($(CONFIG_FB_SH_MOBILE_LCDC),)

obj-y	+=  lcd_wqvga.o

endif

arch/sh/boards/mach-kfr2r09/lcd_wqvga.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static int kfr2r09_lcd_backlight(int on) 
	return 0;

}



void kfr2r09_lcd_on(void *board_data)

void kfr2r09_lcd_on(void *board_data, struct fb_info *info)

{

	kfr2r09_lcd_backlight(1);

}

arch/sh/include/mach-kfr2r09/mach/kfr2r09.h

+8 −8
Original line number Diff line number Diff line
@@ -3,22 +3,22 @@ 


#include <video/sh_mobile_lcdc.h>



#ifdef CONFIG_FB_SH_MOBILE_LCDC

void kfr2r09_lcd_on(void *board_data);

#if defined(CONFIG_FB_SH_MOBILE_LCDC) || defined(CONFIG_FB_SH_MOBILE_LCDC_MODULE)

void kfr2r09_lcd_on(void *board_data, struct fb_info *info);

void kfr2r09_lcd_off(void *board_data);

int kfr2r09_lcd_setup(void *board_data, void *sys_ops_handle,

		      struct sh_mobile_lcdc_sys_bus_ops *sys_ops);

void kfr2r09_lcd_start(void *board_data, void *sys_ops_handle,

		       struct sh_mobile_lcdc_sys_bus_ops *sys_ops);

#else

static inline void kfr2r09_lcd_on(void *board_data) {}

static inline void kfr2r09_lcd_off(void *board_data) {}

static inline int kfr2r09_lcd_setup(void *board_data, void *sys_ops_handle,

static void kfr2r09_lcd_on(void *board_data) {}

static void kfr2r09_lcd_off(void *board_data) {}

static int kfr2r09_lcd_setup(void *board_data, void *sys_ops_handle,

				struct sh_mobile_lcdc_sys_bus_ops *sys_ops)

{

	return -ENODEV;

}

static inline void kfr2r09_lcd_start(void *board_data, void *sys_ops_handle,

static void kfr2r09_lcd_start(void *board_data, void *sys_ops_handle,

				struct sh_mobile_lcdc_sys_bus_ops *sys_ops)

{

}

drivers/video/sh_mipi_dsi.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void sh_mipi_shutdown(struct platform_device *pdev) 
	sh_mipi_dsi_enable(mipi, false);

}



static void mipi_display_on(void *arg)

static void mipi_display_on(void *arg, struct fb_info *info)

{

	struct sh_mipi *mipi = arg;