diff options
| author |   Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-04-24 13:18:48 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-04-24 13:18:48 +0000 |
| commit | f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1 (patch) | |
| tree | 5074abce8a7cffd69519194c8b5b627de1099dca /drivers/video/via/hw.h | |
| parent | Merge branch 'viafb-cleanup' into viafb-next (diff) | |
| parent | viafb: add X server compatibility mode (diff) | |
| download | linux-dev-f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1.tar.xz linux-dev-f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1.zip | |
Merge branch 'viafb-pll' into viafb-next
Conflicts:
drivers/video/via/viamode.c
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/via/hw.h')
| -rw-r--r-- | drivers/video/via/hw.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/video/via/hw.h b/drivers/video/via/hw.h index 090d167863a4..c7239eb83bae 100644 --- a/drivers/video/via/hw.h +++ b/drivers/video/via/hw.h @@ -732,20 +732,13 @@ struct _lcd_scaling_factor { struct _lcd_ver_scaling_factor lcd_ver_scaling_factor; }; -struct pll_config { - u16 multiplier; +struct pll_limit { + u16 multiplier_min; + u16 multiplier_max; u8 divisor; u8 rshift; }; -struct pll_map { - u32 clk; - struct pll_config cle266_pll; - struct pll_config k800_pll; - struct pll_config cx700_pll; - struct pll_config vx855_pll; -}; - struct rgbLUT { u8 red; u8 green; @@ -935,7 +928,6 @@ void viafb_lock_crt(void); void viafb_unlock_crt(void); void viafb_load_fetch_count_reg(int h_addr, int bpp_byte, int set_iga); void viafb_write_regx(struct io_reg RegTable[], int ItemNum); -u32 viafb_get_clk_value(int clk); void viafb_load_FIFO_reg(int set_iga, int hor_active, int ver_active); void viafb_set_dpa_gfx(int output_interface, struct GFX_DPA_SETTING\ *p_gfx_dpa_setting); |