Commit 915190f7 authored by Nicolas Ferre's avatar Nicolas Ferre Committed by Russell King

[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: default avatarHong Xu <hong.xu@atmel.com>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: default avatarAndrew Victor <linux@maxim.org.za>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d7dbf6ea
...@@ -933,7 +933,7 @@ config FB_S1D13XXX ...@@ -933,7 +933,7 @@ config FB_S1D13XXX
config FB_ATMEL config FB_ATMEL
tristate "AT91/AT32 LCD Controller support" tristate "AT91/AT32 LCD Controller support"
depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 || AVR32) depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9G10 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 || AVR32)
select FB_CFB_FILLRECT select FB_CFB_FILLRECT
select FB_CFB_COPYAREA select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT select FB_CFB_IMAGEBLIT
...@@ -949,7 +949,7 @@ config FB_INTSRAM ...@@ -949,7 +949,7 @@ config FB_INTSRAM
config FB_ATMEL_STN config FB_ATMEL_STN
bool "Use a STN display with AT91/AT32 LCD Controller" bool "Use a STN display with AT91/AT32 LCD Controller"
depends on FB_ATMEL && MACH_AT91SAM9261EK depends on FB_ATMEL && (MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK)
default n default n
help help
Say Y if you want to connect a STN LCD display to the AT91/AT32 LCD Say Y if you want to connect a STN LCD display to the AT91/AT32 LCD
......
...@@ -182,7 +182,8 @@ static unsigned long compute_hozval(unsigned long xres, unsigned long lcdcon2) ...@@ -182,7 +182,8 @@ static unsigned long compute_hozval(unsigned long xres, unsigned long lcdcon2)
{ {
unsigned long value; unsigned long value;
if (!(cpu_is_at91sam9261() || cpu_is_at32ap7000())) if (!(cpu_is_at91sam9261() || cpu_is_at91sam9g10()
|| cpu_is_at32ap7000()))
return xres; return xres;
value = xres; value = xres;
...@@ -821,7 +822,8 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev) ...@@ -821,7 +822,8 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
info->fix = atmel_lcdfb_fix; info->fix = atmel_lcdfb_fix;
/* Enable LCDC Clocks */ /* Enable LCDC Clocks */
if (cpu_is_at91sam9261() || cpu_is_at32ap7000()) { if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()
|| cpu_is_at32ap7000()) {
sinfo->bus_clk = clk_get(dev, "hck1"); sinfo->bus_clk = clk_get(dev, "hck1");
if (IS_ERR(sinfo->bus_clk)) { if (IS_ERR(sinfo->bus_clk)) {
ret = PTR_ERR(sinfo->bus_clk); ret = PTR_ERR(sinfo->bus_clk);
......
...@@ -110,7 +110,7 @@ config BACKLIGHT_CLASS_DEVICE ...@@ -110,7 +110,7 @@ config BACKLIGHT_CLASS_DEVICE
config BACKLIGHT_ATMEL_LCDC config BACKLIGHT_ATMEL_LCDC
bool "Atmel LCDC Contrast-as-Backlight control" bool "Atmel LCDC Contrast-as-Backlight control"
depends on BACKLIGHT_CLASS_DEVICE && FB_ATMEL depends on BACKLIGHT_CLASS_DEVICE && FB_ATMEL
default y if MACH_SAM9261EK || MACH_SAM9263EK default y if MACH_SAM9261EK || MACH_SAM9G10EK || MACH_SAM9263EK
help help
This provides a backlight control internal to the Atmel LCDC This provides a backlight control internal to the Atmel LCDC
driver. If the LCD "contrast control" on your board is wired driver. If the LCD "contrast control" on your board is wired
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment