Skip to content

Commit

Permalink
viafb: prepare for PLL separation
Browse files Browse the repository at this point in the history 
This patch splits some functionality to extra functions.

Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
  • Loading branch information
Florian Tobias Schandinat authored and Florian Tobias Schandinat committed Mar 23, 2011
1 parent 1606f87 commit 0f77d4a
Showing 1 changed file with 84 additions and 43 deletions.
127 changes: 84 additions & 43 deletions drivers/video/via/hw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1430,6 +1430,70 @@ static u32 vx855_encode_pll(struct pll_config pll)
| pll.multiplier;
}

static inline void cle266_set_primary_pll_encoded(u32 data)
{
via_write_reg_mask(VIASR, 0x40, 0x02, 0x02); /* enable reset */
via_write_reg(VIASR, 0x46, data & 0xFF);
via_write_reg(VIASR, 0x47, (data >> 8) & 0xFF);
via_write_reg_mask(VIASR, 0x40, 0x00, 0x02); /* disable reset */
}

static inline void k800_set_primary_pll_encoded(u32 data)
{
via_write_reg_mask(VIASR, 0x40, 0x02, 0x02); /* enable reset */
via_write_reg(VIASR, 0x44, data & 0xFF);
via_write_reg(VIASR, 0x45, (data >> 8) & 0xFF);
via_write_reg(VIASR, 0x46, (data >> 16) & 0xFF);
via_write_reg_mask(VIASR, 0x40, 0x00, 0x02); /* disable reset */
}

static inline void cle266_set_secondary_pll_encoded(u32 data)
{
via_write_reg_mask(VIASR, 0x40, 0x04, 0x04); /* enable reset */
via_write_reg(VIASR, 0x44, data & 0xFF);
via_write_reg(VIASR, 0x45, (data >> 8) & 0xFF);
via_write_reg_mask(VIASR, 0x40, 0x00, 0x04); /* disable reset */
}

static inline void k800_set_secondary_pll_encoded(u32 data)
{
via_write_reg_mask(VIASR, 0x40, 0x04, 0x04); /* enable reset */
via_write_reg(VIASR, 0x4A, data & 0xFF);
via_write_reg(VIASR, 0x4B, (data >> 8) & 0xFF);
via_write_reg(VIASR, 0x4C, (data >> 16) & 0xFF);
via_write_reg_mask(VIASR, 0x40, 0x00, 0x04); /* disable reset */
}

static void cle266_set_primary_pll(struct pll_config config)
{
cle266_set_primary_pll_encoded(cle266_encode_pll(config));
}

static void k800_set_primary_pll(struct pll_config config)
{
k800_set_primary_pll_encoded(k800_encode_pll(config));
}

static void vx855_set_primary_pll(struct pll_config config)
{
k800_set_primary_pll_encoded(vx855_encode_pll(config));
}

static void cle266_set_secondary_pll(struct pll_config config)
{
cle266_set_secondary_pll_encoded(cle266_encode_pll(config));
}

static void k800_set_secondary_pll(struct pll_config config)
{
k800_set_secondary_pll_encoded(k800_encode_pll(config));
}

static void vx855_set_secondary_pll(struct pll_config config)
{
k800_set_secondary_pll_encoded(vx855_encode_pll(config));
}

static inline u32 get_pll_internal_frequency(u32 ref_freq,
struct pll_config pll)
{
Expand Down Expand Up @@ -1474,60 +1538,53 @@ static struct pll_config get_pll_config(struct pll_limit *limits, int size,
return best;
}

static u32 viafb_get_clk_value(int clk)
static struct pll_config get_best_pll_config(int clk)
{
u32 value = 0;
struct pll_config config;

switch (viaparinfo->chip_info->gfx_chip_name) {
case UNICHROME_CLE266:
case UNICHROME_K400:
value = cle266_encode_pll(get_pll_config(cle266_pll_limits,
ARRAY_SIZE(cle266_pll_limits), clk));
config = get_pll_config(cle266_pll_limits,
ARRAY_SIZE(cle266_pll_limits), clk);
break;
case UNICHROME_K800:
case UNICHROME_PM800:
case UNICHROME_CN700:
value = k800_encode_pll(get_pll_config(k800_pll_limits,
ARRAY_SIZE(k800_pll_limits), clk));
config = get_pll_config(k800_pll_limits,
ARRAY_SIZE(k800_pll_limits), clk);
break;
case UNICHROME_CX700:
case UNICHROME_CN750:
case UNICHROME_K8M890:
case UNICHROME_P4M890:
case UNICHROME_P4M900:
case UNICHROME_VX800:
value = k800_encode_pll(get_pll_config(cx700_pll_limits,
ARRAY_SIZE(cx700_pll_limits), clk));
config = get_pll_config(cx700_pll_limits,
ARRAY_SIZE(cx700_pll_limits), clk);
break;
case UNICHROME_VX855:
case UNICHROME_VX900:
value = vx855_encode_pll(get_pll_config(vx855_pll_limits,
ARRAY_SIZE(vx855_pll_limits), clk));
config = get_pll_config(vx855_pll_limits,
ARRAY_SIZE(vx855_pll_limits), clk);
break;
}

return value;
return config;
}

/* Set VCLK*/
void viafb_set_vclock(u32 clk, int set_iga)
{
u32 value = viafb_get_clk_value(clk);

DEBUG_MSG(KERN_INFO "PLL=0x%x", value);

/* H.W. Reset : ON */
viafb_write_reg_mask(CR17, VIACR, 0x00, BIT7);
struct pll_config config = get_best_pll_config(clk);

if (set_iga == IGA1) {
/* Change D,N FOR VCLK */
switch (viaparinfo->chip_info->gfx_chip_name) {
case UNICHROME_CLE266:
case UNICHROME_K400:
via_write_reg(VIASR, SR46, (value & 0x00FF));
via_write_reg(VIASR, SR47, (value & 0xFF00) >> 8);
cle266_set_primary_pll(config);
break;

case UNICHROME_K800:
case UNICHROME_PM800:
case UNICHROME_CN700:
Expand All @@ -1537,11 +1594,11 @@ void viafb_set_vclock(u32 clk, int set_iga)
case UNICHROME_P4M890:
case UNICHROME_P4M900:
case UNICHROME_VX800:
k800_set_primary_pll(config);
break;
case UNICHROME_VX855:
case UNICHROME_VX900:
via_write_reg(VIASR, SR44, (value & 0x0000FF));
via_write_reg(VIASR, SR45, (value & 0x00FF00) >> 8);
via_write_reg(VIASR, SR46, (value & 0xFF0000) >> 16);
vx855_set_primary_pll(config);
break;
}
}
Expand All @@ -1551,10 +1608,8 @@ void viafb_set_vclock(u32 clk, int set_iga)
switch (viaparinfo->chip_info->gfx_chip_name) {
case UNICHROME_CLE266:
case UNICHROME_K400:
via_write_reg(VIASR, SR44, (value & 0x00FF));
via_write_reg(VIASR, SR45, (value & 0xFF00) >> 8);
cle266_set_secondary_pll(config);
break;

case UNICHROME_K800:
case UNICHROME_PM800:
case UNICHROME_CN700:
Expand All @@ -1564,29 +1619,15 @@ void viafb_set_vclock(u32 clk, int set_iga)
case UNICHROME_P4M890:
case UNICHROME_P4M900:
case UNICHROME_VX800:
k800_set_secondary_pll(config);
break;
case UNICHROME_VX855:
case UNICHROME_VX900:
via_write_reg(VIASR, SR4A, (value & 0x0000FF));
via_write_reg(VIASR, SR4B, (value & 0x00FF00) >> 8);
via_write_reg(VIASR, SR4C, (value & 0xFF0000) >> 16);
vx855_set_secondary_pll(config);
break;
}
}

/* H.W. Reset : OFF */
viafb_write_reg_mask(CR17, VIACR, 0x80, BIT7);

/* Reset PLL */
if (set_iga == IGA1) {
viafb_write_reg_mask(SR40, VIASR, 0x02, BIT1);
viafb_write_reg_mask(SR40, VIASR, 0x00, BIT1);
}

if (set_iga == IGA2) {
viafb_write_reg_mask(SR40, VIASR, 0x04, BIT2);
viafb_write_reg_mask(SR40, VIASR, 0x00, BIT2);
}

/* Fire! */
via_write_misc_reg_mask(0x0C, 0x0C); /* select external clock */
}
Expand Down

0 comments on commit 0f77d4a

Please sign in to comment.