diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2009-07-21 06:31:29 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-23 05:34:20 -0400 |
commit | 915190f7d4f08e413e5fde6b0abcd5375aeacdf4 (patch) | |
tree | 0638b3a83a53e915c10f74a6f1e23218b9fc3626 /drivers/video/atmel_lcdfb.c | |
parent | d7dbf6ea40a2859adaca2dfdbbea83f3d6c73c2f (diff) |
[ARM] 5614/1: at91: atmel_lcdfb: add at91sam9g10 support to atmel LCD driver
Modify atmel LCD driver: atmel_lcdfb for at91sam9g10. This add a clock
management equivalent to at91sam9261.
Signed-off-by: Hong Xu <hong.xu@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Andrew Victor <linux@maxim.org.za>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/video/atmel_lcdfb.c')
-rw-r--r-- | drivers/video/atmel_lcdfb.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 5afd64482f55..adc5bf01254c 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c | |||
@@ -182,7 +182,8 @@ static unsigned long compute_hozval(unsigned long xres, unsigned long lcdcon2) | |||
182 | { | 182 | { |
183 | unsigned long value; | 183 | unsigned long value; |
184 | 184 | ||
185 | if (!(cpu_is_at91sam9261() || cpu_is_at32ap7000())) | 185 | if (!(cpu_is_at91sam9261() || cpu_is_at91sam9g10() |
186 | || cpu_is_at32ap7000())) | ||
186 | return xres; | 187 | return xres; |
187 | 188 | ||
188 | value = xres; | 189 | value = xres; |
@@ -821,7 +822,8 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev) | |||
821 | info->fix = atmel_lcdfb_fix; | 822 | info->fix = atmel_lcdfb_fix; |
822 | 823 | ||
823 | /* Enable LCDC Clocks */ | 824 | /* Enable LCDC Clocks */ |
824 | if (cpu_is_at91sam9261() || cpu_is_at32ap7000()) { | 825 | if (cpu_is_at91sam9261() || cpu_is_at91sam9g10() |
826 | || cpu_is_at32ap7000()) { | ||
825 | sinfo->bus_clk = clk_get(dev, "hck1"); | 827 | sinfo->bus_clk = clk_get(dev, "hck1"); |
826 | if (IS_ERR(sinfo->bus_clk)) { | 828 | if (IS_ERR(sinfo->bus_clk)) { |
827 | ret = PTR_ERR(sinfo->bus_clk); | 829 | ret = PTR_ERR(sinfo->bus_clk); |