|
@@ -28,7 +28,7 @@ static unsigned long pll_recalc_rate(struct clk_hw *hw,
|
|
|
unsigned long parent_rate)
|
|
|
{
|
|
|
struct pll_clock *pll_clock = to_pll_clock(hw);
|
|
|
- int mul = 1 << (ctrl_inb((unsigned long)pll_clock->pllcr) & 3);
|
|
|
+ int mul = 1 << (readb(pll_clock->pllcr) & 3);
|
|
|
|
|
|
return parent_rate * mul;
|
|
|
}
|
|
@@ -65,13 +65,13 @@ static int pll_set_rate(struct clk_hw *hw, unsigned long rate,
|
|
|
|
|
|
pll = ((rate / parent_rate) / 2) & 0x03;
|
|
|
spin_lock_irqsave(&clklock, flags);
|
|
|
- val = ctrl_inb((unsigned long)pll_clock->sckcr);
|
|
|
+ val = readb(pll_clock->sckcr);
|
|
|
val |= 0x08;
|
|
|
- ctrl_outb(val, (unsigned long)pll_clock->sckcr);
|
|
|
- val = ctrl_inb((unsigned long)pll_clock->pllcr);
|
|
|
+ writeb(val, pll_clock->sckcr);
|
|
|
+ val = readb(pll_clock->pllcr);
|
|
|
val &= ~0x03;
|
|
|
val |= pll;
|
|
|
- ctrl_outb(val, (unsigned long)pll_clock->pllcr);
|
|
|
+ writeb(val, pll_clock->pllcr);
|
|
|
spin_unlock_irqrestore(&clklock, flags);
|
|
|
return 0;
|
|
|
}
|