avr32: Add support for EVKLCD10X addon boards

This patch lets the user enable support for EVKLCD100 and EVKLCD101
(refered to by EVKLCD10X). By enabling EVKLCD10X support the LCD
controller and AC97 controller platform devices are added.

The user can also choose between the EVKLCD100 (QVGA display) and the
EVKLCD101 (VGA display), this is added to automagically select the
correct panel timing and resolution parameters.

Enabling support for EVKLCD10X addon board will cripple the MCI platform
device a bit since they share two GPIO lines (detect and write-protect).
These two lines are disabled when EVKLCD10X is enabled.

The default configurations are based upon ATNGW100, but with added AC97C
and LCDC driver. Virtual terminal is also enabled by default for
EVKLCD10X boards.

Verified on hardware with a NGW100 + EVKLCD100/101.

Signed-off-by: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>

4 files changed, 197 insertions, 1 deletions

diff --git a/arch/avr32/boards/atngw100/Kconfig b/arch/avr32/boards/atngw100/Kconfig
new file mode 100644
index 000000000000..b3f99477bbeb
--- /dev/null
+++ b/arch/avr32/boards/atngw100/Kconfig
@@ -0,0 +1,35 @@
+# NGW100 customization
+
+if BOARD_ATNGW100
+
+config BOARD_ATNGW100_EVKLCD10X
+        bool "Add support for EVKLCD10X addon board"
+        help
+          This enables support for the EVKLCD100 (QVGA) or EVKLCD101 (VGA)
+          addon board for the NGW100. By enabling this the LCD controller and
+          AC97 controller is added as platform devices.
+
+          This choice disables the detect pin and the write-protect pin for the
+          MCI platform device, since it conflicts with the LCD platform device.
+          The MCI pins can be reenabled by editing the "add device function" but
+          this may break the setup for other displays that use these pins.
+
+          Choose 'Y' here if you have a EVKLCD100/101 connected to the NGW100.
+
+choice
+        prompt "LCD panel resolution on EVKLCD10X"
+        depends on BOARD_ATNGW100_EVKLCD10X
+        default BOARD_ATNGW100_EVKLCD10X_VGA
+
+config BOARD_ATNGW100_EVKLCD10X_QVGA
+        bool "QVGA (320x240)"
+
+config BOARD_ATNGW100_EVKLCD10X_VGA
+        bool "VGA (640x480)"
+
+config BOARD_ATNGW100_EVKLCD10X_POW_QVGA
+        bool "Powertip QVGA (320x240)"
+
+endchoice
+
+endif   # BOARD_ATNGW100
diff --git a/arch/avr32/boards/atngw100/Makefile b/arch/avr32/boards/atngw100/Makefile
index c740aa116755..6376f5322e4d 100644
--- a/arch/avr32/boards/atngw100/Makefile
+++ b/arch/avr32/boards/atngw100/Makefile
@@ -1 +1,2 @@
-obj-y                           += setup.o flash.o
+obj-y                                   += setup.o flash.o
+obj-$(CONFIG_BOARD_ATNGW100_EVKLCD10X)  += evklcd10x.o
diff --git a/arch/avr32/boards/atngw100/evklcd10x.c b/arch/avr32/boards/atngw100/evklcd10x.c
new file mode 100644
index 000000000000..8140b22b3461
--- /dev/null
+++ b/arch/avr32/boards/atngw100/evklcd10x.c
@@ -0,0 +1,155 @@
+/*
+ * Board-specific setup code for the ATEVKLCD10X addon board to the ATNGW100
+ * Network Gateway
+ *
+ * Copyright (C) 2008 Atmel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/linkage.h>
+#include <linux/fb.h>
+#include <linux/platform_device.h>
+
+#include <video/atmel_lcdc.h>
+
+#include <asm/setup.h>
+
+#include <mach/at32ap700x.h>
+#include <mach/board.h>
+
+static struct ac97c_platform_data __initdata ac97c0_data = {
+        .dma_rx_periph_id       = 3,
+        .dma_tx_periph_id       = 4,
+        .dma_controller_id      = 0,
+        .reset_pin              = GPIO_PIN_PB(19),
+};
+
+#ifdef CONFIG_BOARD_ATNGW100_EVKLCD10X_VGA
+static struct fb_videomode __initdata tcg057vglad_modes[] = {
+        {
+                .name           = "640x480 @ 60",
+                .refresh        = 60,
+                .xres           = 640,          .yres           = 480,
+                .pixclock       = KHZ2PICOS(25180),
+
+                .left_margin    = 64,           .right_margin   = 31,
+                .upper_margin   = 34,           .lower_margin   = 2,
+                .hsync_len      = 96,           .vsync_len      = 4,
+
+                .sync           = 0,
+                .vmode          = FB_VMODE_NONINTERLACED,
+        },
+};
+
+static struct fb_monspecs __initdata atevklcd10x_default_monspecs = {
+        .manufacturer           = "KYO",
+        .monitor                = "TCG057VGLAD",
+        .modedb                 = tcg057vglad_modes,
+        .modedb_len             = ARRAY_SIZE(tcg057vglad_modes),
+        .hfmin                  = 19948,
+        .hfmax                  = 31478,
+        .vfmin                  = 50,
+        .vfmax                  = 67,
+        .dclkmax                = 28330000,
+};
+
+static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = {
+        .default_bpp            = 16,
+        .default_dmacon         = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
+        .default_lcdcon2        = (ATMEL_LCDC_DISTYPE_TFT
+                                   | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
+                                   | ATMEL_LCDC_MEMOR_BIG),
+        .default_monspecs       = &atevklcd10x_default_monspecs,
+        .guard_time             = 2,
+};
+#elif CONFIG_BOARD_ATNGW100_EVKLCD10X_QVGA
+static struct fb_videomode __initdata tcg057qvlad_modes[] = {
+        {
+                .name           = "320x240 @ 60",
+                .refresh        = 60,
+                .xres           = 320,          .yres           = 240,
+                .pixclock       = KHZ2PICOS(6300),
+
+                .left_margin    = 52,           .right_margin   = 28,
+                .upper_margin   = 7,            .lower_margin   = 2,
+                .hsync_len      = 96,           .vsync_len      = 4,
+
+                .sync           = 0,
+                .vmode          = FB_VMODE_NONINTERLACED,
+        },
+};
+
+static struct fb_monspecs __initdata atevklcd10x_default_monspecs = {
+        .manufacturer           = "KYO",
+        .monitor                = "TCG057QVLAD",
+        .modedb                 = tcg057qvlad_modes,
+        .modedb_len             = ARRAY_SIZE(tcg057qvlad_modes),
+        .hfmin                  = 19948,
+        .hfmax                  = 31478,
+        .vfmin                  = 50,
+        .vfmax                  = 67,
+        .dclkmax                = 7000000,
+};
+
+static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = {
+        .default_bpp            = 16,
+        .default_dmacon         = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
+        .default_lcdcon2        = (ATMEL_LCDC_DISTYPE_TFT
+                                   | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
+                                   | ATMEL_LCDC_MEMOR_BIG),
+        .default_monspecs       = &atevklcd10x_default_monspecs,
+        .guard_time             = 2,
+};
+#elif CONFIG_BOARD_ATNGW100_EVKLCD10X_POW_QVGA
+static struct fb_videomode __initdata ph320240t_modes[] = {
+        {
+                .name           = "320x240 @ 60",
+                .refresh        = 60,
+                .xres           = 320,          .yres           = 240,
+                .pixclock       = KHZ2PICOS(6300),
+
+                .left_margin    = 38,           .right_margin   = 20,
+                .upper_margin   = 15,           .lower_margin   = 5,
+                .hsync_len      = 30,           .vsync_len      = 3,
+
+                .sync           = 0,
+                .vmode          = FB_VMODE_NONINTERLACED,
+        },
+};
+
+static struct fb_monspecs __initdata atevklcd10x_default_monspecs = {
+        .manufacturer           = "POW",
+        .monitor                = "PH320240T",
+        .modedb                 = ph320240t_modes,
+        .modedb_len             = ARRAY_SIZE(ph320240t_modes),
+        .hfmin                  = 14400,
+        .hfmax                  = 21600,
+        .vfmin                  = 50,
+        .vfmax                  = 90,
+        .dclkmax                = 6400000,
+};
+
+static struct atmel_lcdfb_info __initdata atevklcd10x_lcdc_data = {
+        .default_bpp            = 16,
+        .default_dmacon         = ATMEL_LCDC_DMAEN | ATMEL_LCDC_DMA2DEN,
+        .default_lcdcon2        = (ATMEL_LCDC_DISTYPE_TFT
+                                   | ATMEL_LCDC_CLKMOD_ALWAYSACTIVE
+                                   | ATMEL_LCDC_MEMOR_BIG),
+        .default_monspecs       = &atevklcd10x_default_monspecs,
+        .guard_time             = 2,
+};
+#endif
+
+static int __init atevklcd10x_init(void)
+{
+        at32_add_device_ac97c(0, &ac97c0_data);
+
+        at32_add_device_lcdc(0, &atevklcd10x_lcdc_data,
+                        fbmem_start, fbmem_size, 1);
+        return 0;
+}
+postcore_initcall(atevklcd10x_init);
diff --git a/arch/avr32/boards/atngw100/setup.c b/arch/avr32/boards/atngw100/setup.c
index 6c54580a66df..af38ab3e4502 100644
--- a/arch/avr32/boards/atngw100/setup.c
+++ b/arch/avr32/boards/atngw100/setup.c
@@ -56,8 +56,13 @@ static struct spi_board_info spi0_board_info[] __initdata = {
 static struct mci_platform_data __initdata mci0_data = {
         .slot[0] = {
                 .bus_width      = 4,
+#ifndef CONFIG_BOARD_ATNGW100_EVKLCD10X
                 .detect_pin     = GPIO_PIN_PC(25),
                 .wp_pin         = GPIO_PIN_PE(0),
+#else
+                .detect_pin     = GPIO_PIN_NONE,
+                .wp_pin         = GPIO_PIN_NONE,
+#endif
         },
 };