diff options
| author | Juergen Beisert <jbe@pengutronix.de> | 2012-01-02 12:43:55 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-01-02 13:32:13 +0100 |
| commit | 4e7151d11c48db519c0c5ce0780617bcdd68667e (patch) | |
| tree | 3b3c8c22f093d79dc66050dc6adfd7da24ba4517 /drivers/video | |
| parent | b5a92c0ff1236aa45605d48eca0a3b6694f672e1 (diff) | |
| download | barebox-4e7151d11c48db519c0c5ce0780617bcdd68667e.tar.gz barebox-4e7151d11c48db519c0c5ce0780617bcdd68667e.tar.xz | |
MACH SAMSUNG/S3C: Separate S3C24XX clock management
There are major differences in the clock tree of the S3C24xx family and the
more recent CPUs of the S3C family. Keep the S3C24XX clock routines separate to
avoid an ifdef hell. But also use generic function names to be able to
share drivers among the S3C family.
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/s3c24xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/s3c24xx.c b/drivers/video/s3c24xx.c index 75677c31a6..f6af773685 100644 --- a/drivers/video/s3c24xx.c +++ b/drivers/video/s3c24xx.c @@ -227,7 +227,7 @@ static int s3cfb_activate_var(struct fb_info *fb_info) /* ensure video output is _off_ */ writel(0x00000000, fbi->base + LCDCON1); - hclk = s3c24xx_get_hclk() / 1000U; /* hclk in kHz */ + hclk = s3c_get_hclk() / 1000U; /* hclk in kHz */ div = hclk / PICOS2KHZ(mode->pixclock); if (div < 3) div = 3; @@ -339,7 +339,7 @@ static void s3cfb_info(struct device_d *hw_dev) addr3 = readl(fbi->base + LCDSADDR3); printf(" Video hardware info:\n"); - printf(" Video clock is running at %u Hz\n", s3c24xx_get_hclk() / ((GET_CLKVAL(con1) + 1) * 2)); + printf(" Video clock is running at %u Hz\n", s3c_get_hclk() / ((GET_CLKVAL(con1) + 1) * 2)); printf(" Video memory bank starts at 0x%08X\n", GET_LCDBANK(addr1) << 22); printf(" Video memory bank offset: 0x%08X\n", GET_LCDBASEU(addr1)); printf(" Video memory end: 0x%08X\n", GET_LCDBASEU(addr2)); |