summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSammy <r62914@freescale.com>2009-07-28 15:05:28 +0800
committerJustin Waters <justin.waters@timesys.com>2009-10-13 11:04:39 -0400
commit4875afb4a10af2a474109a65793f4d943e80bcf8 (patch)
tree9385e914cb3a250591e4225300273898993d1198 /drivers
parentcbd6cc1a15b3a588440c5cb4393242832c17b14e (diff)
ENGR00114570 Change local variable name "perclk3" in mx2fb.c
Change local variable name "perclk3" to "perclk" in mx2fb.c to not to confuse user. In fact, perclk7 is used for LCDC on MX25. Signed-off-by: Sammy He <r62914@freescale.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/mxc/mx2fb.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/video/mxc/mx2fb.c b/drivers/video/mxc/mx2fb.c
index 3cda6d573cca..bdf7d19e19f1 100644
--- a/drivers/video/mxc/mx2fb.c
+++ b/drivers/video/mxc/mx2fb.c
@@ -1012,7 +1012,7 @@ void mx2_gw_set(struct fb_gwinfo *gwinfo)
static void _update_lcdc(struct fb_info *info)
{
unsigned long base;
- unsigned long perclk3, pcd, pcr;
+ unsigned long perclk, pcd, pcr;
struct fb_var_screeninfo *var = &info->var;
struct mx2fb_info *mx2fbi = (struct mx2fb_info *)info->par;
@@ -1038,15 +1038,14 @@ static void _update_lcdc(struct fb_info *info)
__raw_writel(info->var.xres_virtual >> 1, LCDC_REG(LCDC_LVPWR));
/* To setup LCDC pixel clock */
- perclk3 = clk_round_rate(lcdc_clk, 134000000);
- if (clk_set_rate(lcdc_clk, perclk3)) {
- printk(KERN_INFO "mx2fb: Unable to set clock to %lu\n",
- perclk3);
- perclk3 = clk_get_rate(lcdc_clk);
+ perclk = clk_round_rate(lcdc_clk, 134000000);
+ if (clk_set_rate(lcdc_clk, perclk)) {
+ printk(KERN_INFO "mx2fb: Unable to set clock to %lu\n", perclk);
+ perclk = clk_get_rate(lcdc_clk);
}
/* Calculate pixel clock divider, and round to the nearest integer */
- pcd = (perclk3 * 8 / (PICOS2KHZ(var->pixclock) * 1000UL) + 4) / 8;
+ pcd = (perclk * 8 / (PICOS2KHZ(var->pixclock) * 1000UL) + 4) / 8;
if (--pcd > 0x3F)
pcd = 0x3F;