diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2011-09-11 16:59:04 -0400 |
---|---|---|
committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2012-03-12 17:40:49 -0400 |
commit | 018882aa66f5110478edc14e6c3fecc2b46ca0c0 (patch) | |
tree | af28c376103c290cc17f4dab05af92f46365e076 /arch/sh | |
parent | aa7b5b0b2db6d33a8104e411cb74c15a4983b286 (diff) |
fbdev: sh_mobile_lcdc: Remove board configuration board_data field
The field is unused, remove it. Update board code accordingly.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/boards/mach-ap325rxa/setup.c | 8 | ||||
-rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 4 | ||||
-rw-r--r-- | arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 10 | ||||
-rw-r--r-- | arch/sh/boards/mach-migor/lcd_qvga.c | 3 | ||||
-rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 2 | ||||
-rw-r--r-- | arch/sh/include/mach-kfr2r09/mach/kfr2r09.h | 16 | ||||
-rw-r--r-- | arch/sh/include/mach-migor/mach/migor.h | 2 |
7 files changed, 20 insertions, 25 deletions
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c index ebd0f818a25f..edc1d1bbfa70 100644 --- a/arch/sh/boards/mach-ap325rxa/setup.c +++ b/arch/sh/boards/mach-ap325rxa/setup.c | |||
@@ -157,7 +157,7 @@ static struct platform_device nand_flash_device = { | |||
157 | #define PORT_DRVCRA 0xA405018A | 157 | #define PORT_DRVCRA 0xA405018A |
158 | #define PORT_DRVCRB 0xA405018C | 158 | #define PORT_DRVCRB 0xA405018C |
159 | 159 | ||
160 | static int ap320_wvga_set_brightness(void *board_data, int brightness) | 160 | static int ap320_wvga_set_brightness(int brightness) |
161 | { | 161 | { |
162 | if (brightness) { | 162 | if (brightness) { |
163 | gpio_set_value(GPIO_PTS3, 0); | 163 | gpio_set_value(GPIO_PTS3, 0); |
@@ -170,12 +170,12 @@ static int ap320_wvga_set_brightness(void *board_data, int brightness) | |||
170 | return 0; | 170 | return 0; |
171 | } | 171 | } |
172 | 172 | ||
173 | static int ap320_wvga_get_brightness(void *board_data) | 173 | static int ap320_wvga_get_brightness(void) |
174 | { | 174 | { |
175 | return gpio_get_value(GPIO_PTS3); | 175 | return gpio_get_value(GPIO_PTS3); |
176 | } | 176 | } |
177 | 177 | ||
178 | static void ap320_wvga_power_on(void *board_data, struct fb_info *info) | 178 | static void ap320_wvga_power_on(void) |
179 | { | 179 | { |
180 | msleep(100); | 180 | msleep(100); |
181 | 181 | ||
@@ -183,7 +183,7 @@ static void ap320_wvga_power_on(void *board_data, struct fb_info *info) | |||
183 | __raw_writew(FPGA_LCDREG_VAL, FPGA_LCDREG); | 183 | __raw_writew(FPGA_LCDREG_VAL, FPGA_LCDREG); |
184 | } | 184 | } |
185 | 185 | ||
186 | static void ap320_wvga_power_off(void *board_data) | 186 | static void ap320_wvga_power_off(void) |
187 | { | 187 | { |
188 | /* ASD AP-320/325 LCD OFF */ | 188 | /* ASD AP-320/325 LCD OFF */ |
189 | __raw_writew(0, FPGA_LCDREG); | 189 | __raw_writew(0, FPGA_LCDREG); |
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index cde7c0085ced..7ed3061e01da 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c | |||
@@ -310,14 +310,14 @@ static const struct fb_videomode ecovec_dvi_modes[] = { | |||
310 | }, | 310 | }, |
311 | }; | 311 | }; |
312 | 312 | ||
313 | static int ecovec24_set_brightness(void *board_data, int brightness) | 313 | static int ecovec24_set_brightness(int brightness) |
314 | { | 314 | { |
315 | gpio_set_value(GPIO_PTR1, brightness); | 315 | gpio_set_value(GPIO_PTR1, brightness); |
316 | 316 | ||
317 | return 0; | 317 | return 0; |
318 | } | 318 | } |
319 | 319 | ||
320 | static int ecovec24_get_brightness(void *board_data) | 320 | static int ecovec24_get_brightness(void) |
321 | { | 321 | { |
322 | return gpio_get_value(GPIO_PTR1); | 322 | return gpio_get_value(GPIO_PTR1); |
323 | } | 323 | } |
diff --git a/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c b/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c index 25e145fb7087..c148b36ecb65 100644 --- a/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c +++ b/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | |||
@@ -251,8 +251,7 @@ static void display_on(void *sohandle, | |||
251 | write_memory_start(sohandle, so); | 251 | write_memory_start(sohandle, so); |
252 | } | 252 | } |
253 | 253 | ||
254 | int kfr2r09_lcd_setup(void *board_data, void *sohandle, | 254 | int kfr2r09_lcd_setup(void *sohandle, struct sh_mobile_lcdc_sys_bus_ops *so) |
255 | struct sh_mobile_lcdc_sys_bus_ops *so) | ||
256 | { | 255 | { |
257 | /* power on */ | 256 | /* power on */ |
258 | gpio_set_value(GPIO_PTF4, 0); /* PROTECT/ -> L */ | 257 | gpio_set_value(GPIO_PTF4, 0); /* PROTECT/ -> L */ |
@@ -273,8 +272,7 @@ int kfr2r09_lcd_setup(void *board_data, void *sohandle, | |||
273 | return 0; | 272 | return 0; |
274 | } | 273 | } |
275 | 274 | ||
276 | void kfr2r09_lcd_start(void *board_data, void *sohandle, | 275 | void kfr2r09_lcd_start(void *sohandle, struct sh_mobile_lcdc_sys_bus_ops *so) |
277 | struct sh_mobile_lcdc_sys_bus_ops *so) | ||
278 | { | 276 | { |
279 | write_memory_start(sohandle, so); | 277 | write_memory_start(sohandle, so); |
280 | } | 278 | } |
@@ -327,12 +325,12 @@ static int kfr2r09_lcd_backlight(int on) | |||
327 | return 0; | 325 | return 0; |
328 | } | 326 | } |
329 | 327 | ||
330 | void kfr2r09_lcd_on(void *board_data, struct fb_info *info) | 328 | void kfr2r09_lcd_on(void) |
331 | { | 329 | { |
332 | kfr2r09_lcd_backlight(1); | 330 | kfr2r09_lcd_backlight(1); |
333 | } | 331 | } |
334 | 332 | ||
335 | void kfr2r09_lcd_off(void *board_data) | 333 | void kfr2r09_lcd_off(void) |
336 | { | 334 | { |
337 | kfr2r09_lcd_backlight(0); | 335 | kfr2r09_lcd_backlight(0); |
338 | } | 336 | } |
diff --git a/arch/sh/boards/mach-migor/lcd_qvga.c b/arch/sh/boards/mach-migor/lcd_qvga.c index de9014a8a93e..8bccd345b69c 100644 --- a/arch/sh/boards/mach-migor/lcd_qvga.c +++ b/arch/sh/boards/mach-migor/lcd_qvga.c | |||
@@ -113,8 +113,7 @@ static const unsigned short magic3_data[] = { | |||
113 | 0x0010, 0x16B0, 0x0011, 0x0111, 0x0007, 0x0061, | 113 | 0x0010, 0x16B0, 0x0011, 0x0111, 0x0007, 0x0061, |
114 | }; | 114 | }; |
115 | 115 | ||
116 | int migor_lcd_qvga_setup(void *board_data, void *sohandle, | 116 | int migor_lcd_qvga_setup(void *sohandle, struct sh_mobile_lcdc_sys_bus_ops *so) |
117 | struct sh_mobile_lcdc_sys_bus_ops *so) | ||
118 | { | 117 | { |
119 | unsigned long xres = 320; | 118 | unsigned long xres = 320; |
120 | unsigned long yres = 240; | 119 | unsigned long yres = 240; |
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 2b07fc016950..5e25dbe726e2 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c | |||
@@ -186,8 +186,6 @@ static struct sh_mobile_lcdc_info lcdc_info = { | |||
186 | .width = 152, | 186 | .width = 152, |
187 | .height = 91, | 187 | .height = 91, |
188 | }, | 188 | }, |
189 | .board_cfg = { | ||
190 | }, | ||
191 | } | 189 | } |
192 | }; | 190 | }; |
193 | 191 | ||
diff --git a/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h b/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h index 07e635b0e04c..ba3d93d333f8 100644 --- a/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h +++ b/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h | |||
@@ -4,21 +4,21 @@ | |||
4 | #include <video/sh_mobile_lcdc.h> | 4 | #include <video/sh_mobile_lcdc.h> |
5 | 5 | ||
6 | #if defined(CONFIG_FB_SH_MOBILE_LCDC) || defined(CONFIG_FB_SH_MOBILE_LCDC_MODULE) | 6 | #if defined(CONFIG_FB_SH_MOBILE_LCDC) || defined(CONFIG_FB_SH_MOBILE_LCDC_MODULE) |
7 | void kfr2r09_lcd_on(void *board_data, struct fb_info *info); | 7 | void kfr2r09_lcd_on(void); |
8 | void kfr2r09_lcd_off(void *board_data); | 8 | void kfr2r09_lcd_off(void); |
9 | int kfr2r09_lcd_setup(void *board_data, void *sys_ops_handle, | 9 | int kfr2r09_lcd_setup(void *sys_ops_handle, |
10 | struct sh_mobile_lcdc_sys_bus_ops *sys_ops); | 10 | struct sh_mobile_lcdc_sys_bus_ops *sys_ops); |
11 | void kfr2r09_lcd_start(void *board_data, void *sys_ops_handle, | 11 | void kfr2r09_lcd_start(void *sys_ops_handle, |
12 | struct sh_mobile_lcdc_sys_bus_ops *sys_ops); | 12 | struct sh_mobile_lcdc_sys_bus_ops *sys_ops); |
13 | #else | 13 | #else |
14 | static void kfr2r09_lcd_on(void *board_data) {} | 14 | static void kfr2r09_lcd_on(void) {} |
15 | static void kfr2r09_lcd_off(void *board_data) {} | 15 | static void kfr2r09_lcd_off(void) {} |
16 | static int kfr2r09_lcd_setup(void *board_data, void *sys_ops_handle, | 16 | static int kfr2r09_lcd_setup(void *sys_ops_handle, |
17 | struct sh_mobile_lcdc_sys_bus_ops *sys_ops) | 17 | struct sh_mobile_lcdc_sys_bus_ops *sys_ops) |
18 | { | 18 | { |
19 | return -ENODEV; | 19 | return -ENODEV; |
20 | } | 20 | } |
21 | static void kfr2r09_lcd_start(void *board_data, void *sys_ops_handle, | 21 | static void kfr2r09_lcd_start(void *sys_ops_handle, |
22 | struct sh_mobile_lcdc_sys_bus_ops *sys_ops) | 22 | struct sh_mobile_lcdc_sys_bus_ops *sys_ops) |
23 | { | 23 | { |
24 | } | 24 | } |
diff --git a/arch/sh/include/mach-migor/mach/migor.h b/arch/sh/include/mach-migor/mach/migor.h index 42fccf93412e..7de7bb74c290 100644 --- a/arch/sh/include/mach-migor/mach/migor.h +++ b/arch/sh/include/mach-migor/mach/migor.h | |||
@@ -9,7 +9,7 @@ | |||
9 | 9 | ||
10 | #include <video/sh_mobile_lcdc.h> | 10 | #include <video/sh_mobile_lcdc.h> |
11 | 11 | ||
12 | int migor_lcd_qvga_setup(void *board_data, void *sys_ops_handle, | 12 | int migor_lcd_qvga_setup(void *sys_ops_handle, |
13 | struct sh_mobile_lcdc_sys_bus_ops *sys_ops); | 13 | struct sh_mobile_lcdc_sys_bus_ops *sys_ops); |
14 | 14 | ||
15 | #endif /* __ASM_SH_MIGOR_H */ | 15 | #endif /* __ASM_SH_MIGOR_H */ |