diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-15 19:58:56 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-15 19:58:56 +0100 |
| commit | 467a6756263bf3fc48110307cf68e111e5b4c841 (patch) | |
| tree | 2f48e8f0532d7173166d31ce43d640b93d8f59bb /arch/arm/mach-pxa/speed-pxa27x.c | |
| parent | 29bf8c9a78483c331a77c66607e1be10045b2861 (diff) | |
| parent | 1aba5d366ccc1016c3c5ca8b10b10eca26c75db9 (diff) | |
| download | barebox-467a6756263bf3fc48110307cf68e111e5b4c841.tar.gz barebox-467a6756263bf3fc48110307cf68e111e5b4c841.tar.xz | |
Merge branch 'master' into next
Conflicts:
arch/arm/boards/usb-a926x/init.c
arch/arm/mach-pxa/include/mach/clock.h
arch/arm/mach-pxa/speed-pxa27x.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-pxa/speed-pxa27x.c')
| -rw-r--r-- | arch/arm/mach-pxa/speed-pxa27x.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/speed-pxa27x.c b/arch/arm/mach-pxa/speed-pxa27x.c index 0a612a66a2..534eb1dcc7 100644 --- a/arch/arm/mach-pxa/speed-pxa27x.c +++ b/arch/arm/mach-pxa/speed-pxa27x.c @@ -23,3 +23,27 @@ unsigned long pxa_get_mmcclk(void) { return 19500000; } + +/* + * Return the current LCD clock frequency in units of 10kHz as + */ +static unsigned int pxa_get_lcdclk_10khz(void) +{ + unsigned long ccsr; + unsigned int l, L, k, K; + + ccsr = CCSR; + + l = ccsr & 0x1f; + k = (l <= 7) ? 1 : (l <= 16) ? 2 : 4; + + L = l * BASE_CLK; + K = L / k; + + return (K / 10000); +} + +unsigned long pxa_get_lcdclk(void) +{ + return pxa_get_lcdclk_10khz() * 10000; +} |