Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

viafb: rename display_timing to via_display_timing

Browse source 
The struct display_timing is specific to the via subsystem. The naming leads to
collisions with the new struct display_timing, which is supposed to be a shared
struct between different subsystems.
To clean this up, prepend the existing struct with the subsystem it is specific
to.

Signed-off-by: Steffen Trumtrar <s.trumtrar@pengutronix.de>
This commit is contained in:
Steffen Trumtrar 2012-11-22 13:11:32 +01:00
parent 7d1f9aeff1
commit ea4f3111ef
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/video/via/hw.c
View file

@ -1467,10 +1467,10 @@ void viafb_set_vclock(u32 clk, int set_iga)
via_write_misc_reg_mask(0x0C, 0x0C); /* select external clock */ via_write_misc_reg_mask(0x0C, 0x0C); /* select external clock */
} }
struct display_timing var_to_timing(const struct fb_var_screeninfo *var, struct via_display_timing var_to_timing(const struct fb_var_screeninfo *var,
u16 cxres, u16 cyres) u16 cxres, u16 cyres)
{ {
struct display_timing timing; struct via_display_timing timing;
u16 dx = (var->xres - cxres) / 2, dy = (var->yres - cyres) / 2; u16 dx = (var->xres - cxres) / 2, dy = (var->yres - cyres) / 2;
timing.hor_addr = cxres; timing.hor_addr = cxres;
@ -1491,7 +1491,7 @@ struct display_timing var_to_timing(const struct fb_var_screeninfo *var,
void viafb_fill_crtc_timing(const struct fb_var_screeninfo *var, void viafb_fill_crtc_timing(const struct fb_var_screeninfo *var,
u16 cxres, u16 cyres, int iga) u16 cxres, u16 cyres, int iga)
{ {
struct display_timing crt_reg = var_to_timing(var, struct via_display_timing crt_reg = var_to_timing(var,
cxres ? cxres : var->xres, cyres ? cyres : var->yres); cxres ? cxres : var->xres, cyres ? cyres : var->yres);
if (iga == IGA1) if (iga == IGA1)

2
drivers/video/via/hw.h
View file

@ -637,7 +637,7 @@ extern int viafb_LCD_ON;
extern int viafb_DVI_ON; extern int viafb_DVI_ON;
extern int viafb_hotplug; extern int viafb_hotplug;
struct display_timing var_to_timing(const struct fb_var_screeninfo *var, struct via_display_timing var_to_timing(const struct fb_var_screeninfo *var,
u16 cxres, u16 cyres); u16 cxres, u16 cyres);
void viafb_fill_crtc_timing(const struct fb_var_screeninfo *var, void viafb_fill_crtc_timing(const struct fb_var_screeninfo *var,
u16 cxres, u16 cyres, int iga); u16 cxres, u16 cyres, int iga);

2
drivers/video/via/lcd.c
View file

@ -549,7 +549,7 @@ void viafb_lcd_set_mode(const struct fb_var_screeninfo *var, u16 cxres,
int panel_hres = plvds_setting_info->lcd_panel_hres; int panel_hres = plvds_setting_info->lcd_panel_hres;
int panel_vres = plvds_setting_info->lcd_panel_vres; int panel_vres = plvds_setting_info->lcd_panel_vres;
u32 clock; u32 clock;
struct display_timing timing; struct via_display_timing timing;
struct fb_var_screeninfo panel_var; struct fb_var_screeninfo panel_var;
const struct fb_videomode *mode_crt_table, *panel_crt_table; const struct fb_videomode *mode_crt_table, *panel_crt_table;

2
drivers/video/via/share.h
View file

@ -319,7 +319,7 @@ struct crt_mode_table {
int refresh_rate; int refresh_rate;
int h_sync_polarity; int h_sync_polarity;
int v_sync_polarity; int v_sync_polarity;
struct display_timing crtc; struct via_display_timing crtc;
}; };
struct io_reg { struct io_reg {

8
drivers/video/via/via_modesetting.c
View file

@ -30,9 +30,9 @@
#include "debug.h" #include "debug.h"
void via_set_primary_timing(const struct display_timing *timing) void via_set_primary_timing(const struct via_display_timing *timing)
{ {
struct display_timing raw; struct via_display_timing raw;
raw.hor_total = timing->hor_total / 8 - 5; raw.hor_total = timing->hor_total / 8 - 5;
raw.hor_addr = timing->hor_addr / 8 - 1; raw.hor_addr = timing->hor_addr / 8 - 1;
@ -88,9 +88,9 @@ void via_set_primary_timing(const struct display_timing *timing)
via_write_reg_mask(VIACR, 0x17, 0x80, 0x80); via_write_reg_mask(VIACR, 0x17, 0x80, 0x80);
} }
void via_set_secondary_timing(const struct display_timing *timing) void via_set_secondary_timing(const struct via_display_timing *timing)
{ {
struct display_timing raw; struct via_display_timing raw;
raw.hor_total = timing->hor_total - 1; raw.hor_total = timing->hor_total - 1;
raw.hor_addr = timing->hor_addr - 1; raw.hor_addr = timing->hor_addr - 1;

6
drivers/video/via/via_modesetting.h
View file

@ -33,7 +33,7 @@
#define VIA_PITCH_MAX 0x3FF8 #define VIA_PITCH_MAX 0x3FF8
struct display_timing { struct via_display_timing {
u16 hor_total; u16 hor_total;
u16 hor_addr; u16 hor_addr;
u16 hor_blank_start; u16 hor_blank_start;
@ -49,8 +49,8 @@ struct display_timing {
}; };
void via_set_primary_timing(const struct display_timing *timing); void via_set_primary_timing(const struct via_display_timing *timing);
void via_set_secondary_timing(const struct display_timing *timing); void via_set_secondary_timing(const struct via_display_timing *timing);
void via_set_primary_address(u32 addr); void via_set_primary_address(u32 addr);
void via_set_secondary_address(u32 addr); void via_set_secondary_address(u32 addr);
void via_set_primary_pitch(u32 pitch); void via_set_primary_pitch(u32 pitch);