aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2009-07-21 06:31:29 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-07-23 05:34:20 -0400
commit915190f7d4f08e413e5fde6b0abcd5375aeacdf4 (patch)
tree0638b3a83a53e915c10f74a6f1e23218b9fc3626
parentd7dbf6ea40a2859adaca2dfdbbea83f3d6c73c2f (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>
-rw-r--r--drivers/video/Kconfig4
-rw-r--r--drivers/video/atmel_lcdfb.c6
-rw-r--r--drivers/video/backlight/Kconfig2
3 files changed, 7 insertions, 5 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 36281823fe54..f632c6682aa6 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -933,7 +933,7 @@ config FB_S1D13XXX
933 933
934config FB_ATMEL 934config FB_ATMEL
935 tristate "AT91/AT32 LCD Controller support" 935 tristate "AT91/AT32 LCD Controller support"
936 depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 || AVR32) 936 depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9G10 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 || AVR32)
937 select FB_CFB_FILLRECT 937 select FB_CFB_FILLRECT
938 select FB_CFB_COPYAREA 938 select FB_CFB_COPYAREA
939 select FB_CFB_IMAGEBLIT 939 select FB_CFB_IMAGEBLIT
@@ -949,7 +949,7 @@ config FB_INTSRAM
949 949
950config FB_ATMEL_STN 950config FB_ATMEL_STN
951 bool "Use a STN display with AT91/AT32 LCD Controller" 951 bool "Use a STN display with AT91/AT32 LCD Controller"
952 depends on FB_ATMEL && MACH_AT91SAM9261EK 952 depends on FB_ATMEL && (MACH_AT91SAM9261EK || MACH_AT91SAM9G10EK)
953 default n 953 default n
954 help 954 help
955 Say Y if you want to connect a STN LCD display to the AT91/AT32 LCD 955 Say Y if you want to connect a STN LCD display to the AT91/AT32 LCD
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);
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index f9d19be05540..90861cd93165 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -110,7 +110,7 @@ config BACKLIGHT_CLASS_DEVICE
110config BACKLIGHT_ATMEL_LCDC 110config BACKLIGHT_ATMEL_LCDC
111 bool "Atmel LCDC Contrast-as-Backlight control" 111 bool "Atmel LCDC Contrast-as-Backlight control"
112 depends on BACKLIGHT_CLASS_DEVICE && FB_ATMEL 112 depends on BACKLIGHT_CLASS_DEVICE && FB_ATMEL
113 default y if MACH_SAM9261EK || MACH_SAM9263EK 113 default y if MACH_SAM9261EK || MACH_SAM9G10EK || MACH_SAM9263EK
114 help 114 help
115 This provides a backlight control internal to the Atmel LCDC 115 This provides a backlight control internal to the Atmel LCDC
116 driver. If the LCD "contrast control" on your board is wired 116 driver. If the LCD "contrast control" on your board is wired