|
@@ -594,7 +594,7 @@ static int __devinit radeon_probe_pll_params(struct radeonfb_info *rinfo)
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
/*
|
|
- * Retreive PLL infos by different means (BIOS, Open Firmware, register probing...)
|
|
|
|
|
|
+ * Retrieve PLL infos by different means (BIOS, Open Firmware, register probing...)
|
|
*/
|
|
*/
|
|
static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
|
|
static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
|
|
{
|
|
{
|
|
@@ -660,17 +660,17 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
|
|
|
|
|
|
#ifdef CONFIG_PPC_OF
|
|
#ifdef CONFIG_PPC_OF
|
|
/*
|
|
/*
|
|
- * Retreive PLL infos from Open Firmware first
|
|
|
|
|
|
+ * Retrieve PLL infos from Open Firmware first
|
|
*/
|
|
*/
|
|
if (!force_measure_pll && radeon_read_xtal_OF(rinfo) == 0) {
|
|
if (!force_measure_pll && radeon_read_xtal_OF(rinfo) == 0) {
|
|
- printk(KERN_INFO "radeonfb: Retreived PLL infos from Open Firmware\n");
|
|
|
|
|
|
+ printk(KERN_INFO "radeonfb: Retrieved PLL infos from Open Firmware\n");
|
|
goto found;
|
|
goto found;
|
|
}
|
|
}
|
|
#endif /* CONFIG_PPC_OF */
|
|
#endif /* CONFIG_PPC_OF */
|
|
|
|
|
|
/*
|
|
/*
|
|
* Check out if we have an X86 which gave us some PLL informations
|
|
* Check out if we have an X86 which gave us some PLL informations
|
|
- * and if yes, retreive them
|
|
|
|
|
|
+ * and if yes, retrieve them
|
|
*/
|
|
*/
|
|
if (!force_measure_pll && rinfo->bios_seg) {
|
|
if (!force_measure_pll && rinfo->bios_seg) {
|
|
u16 pll_info_block = BIOS_IN16(rinfo->fp_bios_start + 0x30);
|
|
u16 pll_info_block = BIOS_IN16(rinfo->fp_bios_start + 0x30);
|
|
@@ -682,7 +682,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
|
|
rinfo->pll.ppll_min = BIOS_IN32(pll_info_block + 0x12);
|
|
rinfo->pll.ppll_min = BIOS_IN32(pll_info_block + 0x12);
|
|
rinfo->pll.ppll_max = BIOS_IN32(pll_info_block + 0x16);
|
|
rinfo->pll.ppll_max = BIOS_IN32(pll_info_block + 0x16);
|
|
|
|
|
|
- printk(KERN_INFO "radeonfb: Retreived PLL infos from BIOS\n");
|
|
|
|
|
|
+ printk(KERN_INFO "radeonfb: Retrieved PLL infos from BIOS\n");
|
|
goto found;
|
|
goto found;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -691,7 +691,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
|
|
* probe them
|
|
* probe them
|
|
*/
|
|
*/
|
|
if (radeon_probe_pll_params(rinfo) == 0) {
|
|
if (radeon_probe_pll_params(rinfo) == 0) {
|
|
- printk(KERN_INFO "radeonfb: Retreived PLL infos from registers\n");
|
|
|
|
|
|
+ printk(KERN_INFO "radeonfb: Retrieved PLL infos from registers\n");
|
|
goto found;
|
|
goto found;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -702,7 +702,7 @@ static void __devinit radeon_get_pllinfo(struct radeonfb_info *rinfo)
|
|
|
|
|
|
found:
|
|
found:
|
|
/*
|
|
/*
|
|
- * Some methods fail to retreive SCLK and MCLK values, we apply default
|
|
|
|
|
|
+ * Some methods fail to retrieve SCLK and MCLK values, we apply default
|
|
* settings in this case (200Mhz). If that really happne often, we could
|
|
* settings in this case (200Mhz). If that really happne often, we could
|
|
* fetch from registers instead...
|
|
* fetch from registers instead...
|
|
*/
|
|
*/
|
|
@@ -2393,7 +2393,7 @@ static int radeonfb_pci_register (struct pci_dev *pdev,
|
|
rinfo->mapped_vram/1024);
|
|
rinfo->mapped_vram/1024);
|
|
|
|
|
|
/*
|
|
/*
|
|
- * Map the BIOS ROM if any and retreive PLL parameters from
|
|
|
|
|
|
+ * Map the BIOS ROM if any and retrieve PLL parameters from
|
|
* the BIOS. We skip that on mobility chips as the real panel
|
|
* the BIOS. We skip that on mobility chips as the real panel
|
|
* values we need aren't in the ROM but in the BIOS image in
|
|
* values we need aren't in the ROM but in the BIOS image in
|
|
* memory. This is definitely not the best meacnism though,
|
|
* memory. This is definitely not the best meacnism though,
|