diff --git a/arch/arm/configs/stamp9261_defconfig b/arch/arm/configs/stamp9261_defconfig
new file mode 100644
index 0000000..6c1a802
--- /dev/null
+++ b/arch/arm/configs/stamp9261_defconfig
@@ -0,0 +1,130 @@
+CONFIG_EXPERIMENTAL=y
+# CONFIG_LOCALVERSION_AUTO is not set
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_TREE_PREEMPT_RCU=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_LBDAF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_IOSCHED_DEADLINE is not set
+CONFIG_ARCH_AT91=y
+CONFIG_ARCH_AT91SAM9261=y
+CONFIG_MACH_STAMP9261=y
+CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_PREEMPT=y
+CONFIG_AEABI=y
+CONFIG_KEXEC=y
+CONFIG_CPU_IDLE=y
+CONFIG_FPE_NWFPE=y
+CONFIG_PM=y
+# CONFIG_SUSPEND is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_IPV6 is not set
+# CONFIG_WIRELESS is not set
+CONFIG_MTD=y
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_UBI=y
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=8192
+# CONFIG_MISC_DEVICES is not set
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_NETDEVICES=y
+CONFIG_PHYLIB=y
+CONFIG_NET_ETHERNET=y
+CONFIG_DM9000=y
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_WLAN is not set
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_KEYBOARD_ATKBD is not set
+CONFIG_KEYBOARD_GPIO=y
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_ADS7846=y
+# CONFIG_SERIO is not set
+CONFIG_SERIAL_ATMEL=y
+CONFIG_SERIAL_ATMEL_CONSOLE=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_GPIO=y
+CONFIG_SPI=y
+CONFIG_SPI_ATMEL=y
+CONFIG_SPI_SPIDEV=y
+CONFIG_GPIO_SYSFS=y
+CONFIG_W1=y
+CONFIG_W1_MASTER_GPIO=y
+CONFIG_W1_SLAVE_SMEM=y
+# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+CONFIG_AT91SAM9X_WATCHDOG=y
+CONFIG_FB=y
+CONFIG_FB_ATMEL=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+# CONFIG_LCD_CLASS_DEVICE is not set
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_ATMEL_LCDC=y
+# CONFIG_BACKLIGHT_GENERIC is not set
+CONFIG_USB=y
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+CONFIG_USB_MON=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=m
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
+CONFIG_USB_FILE_STORAGE=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_MMC=y
+CONFIG_MMC_AT91=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_AT91SAM9=y
+CONFIG_EXT2_FS=y
+CONFIG_EXT3_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_15=y
+CONFIG_NLS_UTF8=y
+# CONFIG_ARM_UNWIND is not set
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 939bccd..c3576b7 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -264,6 +264,9 @@ config MACH_AT91SAM9261EK
 	  Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit.
 	  <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820>
 
+config MACH_STAMP9261
+	bool "taskit Stamp9261/Panel-Card"
+
 endif
 
 # ----------------------------------------------------------
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index ca2ac00..f59d0b0 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -50,6 +50,7 @@ obj-$(CONFIG_MACH_CPU9260)	+= board-cpu9krea.o
 # AT91SAM9261 board-specific support
 obj-$(CONFIG_MACH_AT91SAM9261EK) += board-sam9261ek.o
 obj-$(CONFIG_MACH_AT91SAM9G10EK) += board-sam9261ek.o
+obj-$(CONFIG_MACH_STAMP9261)     += board-stamp9261.o
 
 # AT91SAM9263 board-specific support
 obj-$(CONFIG_MACH_AT91SAM9263EK) += board-sam9263ek.o
diff --git a/arch/arm/mach-at91/board-stamp9261.c b/arch/arm/mach-at91/board-stamp9261.c
new file mode 100644
index 0000000..f65bab0
--- /dev/null
+++ b/arch/arm/mach-at91/board-stamp9261.c
@@ -0,0 +1,564 @@
+/*
+ * linux/arch/arm/mach-at91/board-stamp9261.c
+ *
+ *  Copyright (C) 2011 taskit
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <asm/delay.h>
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+#include <asm/setup.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/irq.h>
+#include <asm/mach/map.h>
+
+#include <mach/at91_rtt.h>
+#include <mach/at91sam9_smc.h>
+#include <mach/board.h>
+#include <mach/gpio.h>
+#include <mach/hardware.h>
+
+#include <linux/dm9000.h>
+#include <linux/fb.h>
+#include <linux/gpio_keys.h>
+#include <linux/init.h>
+#include <linux/input.h>
+#include <linux/mm.h>
+#include <linux/module.h>
+#include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
+#include <linux/spi/ads7846.h>
+#include <linux/types.h>
+
+#include <video/atmel_lcdc.h>
+
+#include "sam9_smc.h"
+#include "generic.h"
+
+
+static char display[14];
+module_param_string(display, display, sizeof(display), S_IRUGO);
+
+static void __init stamp9261_map_io(void)
+{
+	/* Initialize processor: 18.432 MHz crystal */
+	at91sam9261_initialize(18432000);
+
+	/* DGBU on ttyS0. (RX & TX only) */
+	at91_register_uart(0, 0, 0);
+
+	/* USART1 on ttyS2. (RX & TX, RTS, CTS ) */
+	at91_register_uart(AT91SAM9261_ID_US1, 2, ATMEL_UART_RTS | ATMEL_UART_CTS);
+
+	/* set serial console to ttyS0 (ie, DBGU) */
+	at91_set_serial_console(0);
+}
+
+static void __init stamp9261_init_irq(void)
+{
+	at91sam9261_init_interrupts(NULL);
+}
+
+
+/*
+ * DM9000 ethernet device
+ */
+#if defined(CONFIG_DM9000)
+static struct resource dm9000_resource[] = {
+	[0] = {
+		.start	= AT91_CHIPSELECT_2,
+		.end	= AT91_CHIPSELECT_2 + 3,
+		.flags	= IORESOURCE_MEM
+	},
+	[1] = {
+		.start	= AT91_CHIPSELECT_2 + 0x44,
+		.end	= AT91_CHIPSELECT_2 + 0xFF,
+		.flags	= IORESOURCE_MEM
+	},
+	[2] = {
+		.start	= AT91_PIN_PC11,
+		.end	= AT91_PIN_PC11,
+		.flags	= IORESOURCE_IRQ
+	}
+};
+
+static struct dm9000_plat_data dm9000_platdata = {
+	.flags		= DM9000_PLATF_16BITONLY,
+};
+
+static struct platform_device dm9000_device = {
+	.name		= "dm9000",
+	.id		= 0,
+	.num_resources	= ARRAY_SIZE(dm9000_resource),
+	.resource	= dm9000_resource,
+	.dev		= {
+		.platform_data	= &dm9000_platdata,
+	}
+};
+
+/*
+ * SMC timings for the DM9000.
+ * Note: These timings were calculated for MASTER_CLOCK = 100000000 according to the DM9000 timings.
+ */
+static struct sam9_smc_config __initdata dm9000_smc_config = {
+	.ncs_read_setup		= 0,
+	.nrd_setup		= 2,
+	.ncs_write_setup	= 0,
+	.nwe_setup		= 2,
+
+	.ncs_read_pulse		= 8,
+	.nrd_pulse		= 4,
+	.ncs_write_pulse	= 8,
+	.nwe_pulse		= 4,
+
+	.read_cycle		= 16,
+	.write_cycle		= 16,
+
+	.mode			= AT91_SMC_READMODE | AT91_SMC_WRITEMODE | AT91_SMC_EXNWMODE_DISABLE | AT91_SMC_BAT_WRITE | AT91_SMC_DBW_16,
+	.tdf_cycles		= 1,
+};
+
+static void __init stamp9261_add_device_dm9000(void)
+{
+	/* Configure chip-select 2 (DM9000) */
+	sam9_smc_configure(2, &dm9000_smc_config);
+
+	/* Configure Interrupt pin as input, no pull-up */
+	at91_set_gpio_input(AT91_PIN_PC11, 0);
+
+	platform_device_register(&dm9000_device);
+}
+#else
+static void __init stamp9261_add_device_dm9000(void) {}
+#endif /* CONFIG_DM9000 */
+
+/*
+ * USB Host Port
+ */
+static struct at91_usbh_data __initdata stamp9261_usbh_data = {
+	.ports		= 2,
+};
+
+/*
+ * USB Device Port
+ */
+static struct at91_udc_data __initdata stamp9261_udc_data = {
+	.vbus_pin	= AT91_PIN_PC2,
+	.pullup_pin	= 0,		/* pull-up driven by UDC */
+};
+
+/*
+ * MCI (SD/MMC)
+ */
+static struct at91_mmc_data __initdata stamp9261_mmc_data = {
+	.wire4		= 1,
+};
+
+/* NOR flash */
+#define STAMP9261_FLASH_BASE	AT91_CHIPSELECT_0
+#define STAMP9261_FLASH_SIZE	0x4000000
+
+static struct physmap_flash_data stamp9261_flash_data = {
+	.width		= 2,
+};
+
+static struct resource stamp9261_flash_resource = {
+	.start		= STAMP9261_FLASH_BASE,
+	.end		= STAMP9261_FLASH_BASE + STAMP9261_FLASH_SIZE - 1,
+	.flags		= IORESOURCE_MEM,
+};
+
+static struct platform_device stamp9261_flash = {
+	.name		= "physmap-flash",
+	.id		= 0,
+	.dev		= {
+				.platform_data	= &stamp9261_flash_data,
+			},
+	.resource	= &stamp9261_flash_resource,
+	.num_resources	= 1,
+};
+
+#if defined(CONFIG_RTC_DRV_AT91SAM926X) || defined(CONFIG_RTC_DRV_AT91SAM926X_MODULE)
+
+static struct at91_rtt_data rtt_data={0};
+
+static struct platform_device at91sam926x_rtc_device = {
+	.name		= "at91_rtt",
+	.id		= -1,
+        .dev		= {
+		.platform_data	= &rtt_data,
+	},
+	.num_resources	= 0,
+};
+
+void __init at91_add_device_rtc(void)
+{
+	platform_device_register(&at91sam926x_rtc_device);
+}
+#else
+void __init at91_add_device_rtc(void) {}
+#endif
+
+/*
+ * LCD Controller
+ */
+#if defined(CONFIG_FB_ATMEL) || defined(CONFIG_FB_ATMEL_MODULE)
+
+#define AT91SAM9261_DEFAULT_LCDCON2 	(ATMEL_LCDC_MEMOR_LITTLE \
+					| ATMEL_LCDC_DISTYPE_TFT    \
+					| ATMEL_LCDC_CLKMOD_ALWAYSACTIVE \
+					| ATMEL_LCDC_INVCLK_INVERTED)
+
+static void at91_lcdc_power_control(int on)
+{
+	int i;
+	if (on) {
+		for(i = 0; i < 10; i++) {
+			at91_set_gpio_value(AT91_PIN_PC10, 0);	/* power up */
+			at91_set_gpio_value(AT91_PIN_PC10, 1);	/* power down */
+			if(i < 4)
+				udelay(1);
+		}
+		at91_set_gpio_value(AT91_PIN_PC10, 0);	/* power up */
+	} else
+		at91_set_gpio_value(AT91_PIN_PC10, 1);	/* power down */
+}
+
+static struct fb_videomode at91_tft_vga_modes_et035005dm6[] = {
+	{
+		.name           = "ET035005DM6 @ 60",
+		.refresh	= 60,
+		.xres		= 320,
+		.yres		= 240,
+		.pixclock	= KHZ2PICOS(6400),
+
+		.left_margin	= 38,
+		.right_margin	= 20,
+		.upper_margin	= 15,
+		.lower_margin	= 5,
+		.hsync_len	= 30,
+		.vsync_len	= 5,
+
+		.sync		= 0,
+		.vmode		= FB_VMODE_NONINTERLACED,
+	},
+};
+
+static struct fb_videomode at91_tft_vga_modes_et057009dhu[] = {
+	{
+		.name           = "ET057009DHU @ 60",
+		.refresh	= 60,
+		.xres		= 640,
+		.yres		= 480,
+		.pixclock	= KHZ2PICOS(25175),
+
+		.left_margin	= 144,
+		.right_margin	= 16,
+		.upper_margin	= 35,
+		.lower_margin	= 10,
+		.hsync_len	= 30,
+		.vsync_len	= 5,
+
+		.sync		= 0,
+		.vmode		= FB_VMODE_NONINTERLACED,
+	},
+};
+
+static struct fb_videomode at91_tft_vga_modes_et070000dm6[] = {
+	{
+		.name           = "ET070000DM6 @ 40",
+		.refresh	= 40,
+		.xres		= 800,
+		.yres		= 480,
+		.pixclock	= KHZ2PICOS(28000),
+
+		.left_margin	= 60,
+		.right_margin	= 60,
+		.upper_margin	= 3,
+		.lower_margin	= 0,
+		.hsync_len	= 48,
+		.vsync_len	= 3,
+		.sync		= 0,
+		.vmode		= FB_VMODE_NONINTERLACED,
+	},
+};
+
+static struct fb_monspecs at91fb_default_monspecs = {
+	.hfmin		= 15000,
+	.hfmax		= 64000,
+	.vfmin		= 50,
+	.vfmax		= 150,
+};
+
+static struct atmel_lcdfb_info __initdata stamp9261_lcdc_data = {
+	.default_bpp			= 24,
+	.default_dmacon			= ATMEL_LCDC_DMAEN,
+	.default_lcdcon2		= AT91SAM9261_DEFAULT_LCDCON2,
+	.default_monspecs		= &at91fb_default_monspecs,
+	.lcdcon_is_backlight		= 1,
+	.lcdcon_pol_negative		= 1,
+	.atmel_lcdfb_power_control	= at91_lcdc_power_control,
+	.guard_time			= 1,
+	.lcd_wiring_mode		= ATMEL_LCDC_WIRING_RGB555,
+};
+
+#else
+static struct atmel_lcdfb_info __initdata stamp9261_lcdc_data;
+#endif
+
+
+#define TOUCHSCREEN_IRQ AT91_PIN_PA25
+
+static int stamp9261_pendown_state(void)
+{
+	return !at91_get_gpio_value(TOUCHSCREEN_IRQ); /* Touchscreen PENIRQ */
+}
+
+static struct ads7846_platform_data ads7843_info = {
+	.model                  = 7843,
+	.x_min                  = 0,
+	.x_max                  = 4095,
+	.y_min                  = 0,
+	.y_max                  = 4095,
+	.vref_delay_usecs       = 100,
+	.x_plate_ohms           = 1000,
+	.y_plate_ohms           = 1000,
+	.pressure_max           = 0,
+	.debounce_max           = 1,
+	.debounce_rep           = 5,
+	.debounce_tol           = 8,
+	.get_pendown_state      = stamp9261_pendown_state,
+};
+
+static struct ads7846_platform_data ads7846_info = {
+	.model                  = 7846,
+	.x_min                  = 0,
+	.x_max                  = 4095,
+	.y_min                  = 0,
+	.y_max                  = 4095,
+	.vref_delay_usecs       = 100,
+	.settle_delay_usecs     = 100,
+	.penirq_recheck_delay_usecs = 2000,
+	.x_plate_ohms           = 800,
+	.y_plate_ohms           = 450,
+	.pressure_max           = 1000,
+	.debounce_max           = 1,
+	.debounce_rep           = 3,
+	.debounce_tol           = 30,
+	.get_pendown_state      = stamp9261_pendown_state,
+};
+
+static struct spi_board_info stamp9261_spi_devices[] = {
+	{ /* ADS784x spi - cs1 */
+		.modalias = "ads7846",
+		.chip_select  = 1,
+		.max_speed_hz = 500000,
+		.bus_num = 1,
+		.irq = TOUCHSCREEN_IRQ,
+		.platform_data = &ads7846_info,
+	},
+	/* insert custom spi definitions here, ads7846 has to be the first entry */
+};
+
+static struct platform_device panelcard_bl_device = {
+	.name = "panelcard-bl",
+	.id = -1,
+};
+
+static struct gpio_keys_button panelcard_buttons[] = {
+	{
+		.gpio		= AT91_PIN_PA17,
+		.code		= KEY_LEFT,
+		.desc		= "Left",
+		.active_low	= 1,
+	},
+	{
+		.gpio		= AT91_PIN_PA18,
+		.code		= KEY_UP,
+		.desc		= "Up",
+		.active_low	= 1,
+	},
+	{
+		.gpio		= AT91_PIN_PA19,
+		.code		= KEY_ENTER,
+		.desc		= "Enter",
+		.active_low	= 1,
+	},
+	{
+		.gpio		= AT91_PIN_PA20,
+		.code		= KEY_DOWN,
+		.desc		= "Down",
+		.active_low	= 1,
+	},
+	{
+		.gpio		= AT91_PIN_PA21,
+		.code		= KEY_RIGHT,
+		.desc		= "Right",
+		.active_low	= 1,
+	}
+};
+
+static struct gpio_keys_platform_data panelcard_button_data = {
+	.buttons	= panelcard_buttons,
+	.nbuttons	= ARRAY_SIZE(panelcard_buttons),
+};
+
+static struct platform_device panelcard_button_device = {
+	.name		= "gpio-keys",
+	.id		= -1,
+	.num_resources	= 0,
+	.dev		= {
+		.platform_data	= &panelcard_button_data,
+	}
+};
+
+static void __init panelcard_add_device_buttons(void)
+{
+	at91_set_gpio_input(AT91_PIN_PA17, 1);
+	at91_set_deglitch(AT91_PIN_PA17, 1);
+	at91_set_gpio_input(AT91_PIN_PA18, 1);
+	at91_set_deglitch(AT91_PIN_PA18, 1);
+	at91_set_gpio_input(AT91_PIN_PA19, 1);
+	at91_set_deglitch(AT91_PIN_PA19, 1);
+	at91_set_gpio_input(AT91_PIN_PA20, 1);
+	at91_set_deglitch(AT91_PIN_PA20, 1);
+	at91_set_gpio_input(AT91_PIN_PA21, 1);
+	at91_set_deglitch(AT91_PIN_PA21, 1);
+
+	platform_device_register(&panelcard_button_device);
+}
+
+static __initdata int stamp9261_has_touchscreen = 0;
+
+static void __init stamp9261_init_et035005dm6(void)
+{
+	stamp9261_has_touchscreen = 1;
+
+	stamp9261_spi_devices[0].platform_data = &ads7843_info;
+	stamp9261_lcdc_data.lcd_wiring_mode	= 0;
+	stamp9261_lcdc_data.lcdcon_is_backlight	= 0,
+	at91fb_default_monspecs.modedb		= at91_tft_vga_modes_et035005dm6;
+	at91fb_default_monspecs.modedb_len	= ARRAY_SIZE(at91_tft_vga_modes_et035005dm6);
+
+	at91_add_device_lcdc(&stamp9261_lcdc_data);
+	platform_device_register(&panelcard_bl_device);
+}
+
+static void __init stamp9261_init_et057011dh6(void)
+{
+	stamp9261_has_touchscreen = 1;
+
+	at91fb_default_monspecs.modedb		= at91_tft_vga_modes_et035005dm6;
+	at91fb_default_monspecs.modedb_len	= ARRAY_SIZE(at91_tft_vga_modes_et035005dm6);
+
+	at91_add_device_lcdc(&stamp9261_lcdc_data);
+	panelcard_add_device_buttons();
+}
+
+static void __init stamp9261_init_et057009dhu(void)
+{
+	stamp9261_has_touchscreen = 1;
+
+	at91fb_default_monspecs.modedb		= at91_tft_vga_modes_et057009dhu;
+	at91fb_default_monspecs.modedb_len	= ARRAY_SIZE(at91_tft_vga_modes_et057009dhu);
+
+	at91_add_device_lcdc(&stamp9261_lcdc_data);
+	at91_set_gpio_output(AT91_PIN_PB0, 0);
+	at91_set_gpio_output(AT91_PIN_PB1, 1);
+	panelcard_add_device_buttons();
+}
+
+static void __init stamp9261_init_et070000dm6(void)
+{
+	stamp9261_has_touchscreen = 1;
+
+	at91fb_default_monspecs.modedb		= at91_tft_vga_modes_et070000dm6;
+	at91fb_default_monspecs.modedb_len	= ARRAY_SIZE(at91_tft_vga_modes_et070000dm6);
+
+	at91_add_device_lcdc(&stamp9261_lcdc_data);
+	at91_set_gpio_output(AT91_PIN_PB0, 0);
+	at91_set_gpio_output(AT91_PIN_PB1, 1);
+	panelcard_add_device_buttons();
+}
+
+
+static const struct {
+	char *name;
+	void (*init_function)(void);
+} displays[] = {
+	{ "et035005dm6", stamp9261_init_et035005dm6 },
+	{ "et057011dh6", stamp9261_init_et057011dh6 },
+	{ "et057009dhu", stamp9261_init_et057009dhu },
+	{ "et070000dm6", stamp9261_init_et070000dm6 },
+	{ "at070tn83",   stamp9261_init_et070000dm6 },
+};
+
+static void stamp9261_add_device_lcd(void)
+{
+	int i;
+
+	for(i = 0; i < ARRAY_SIZE(displays); i++) {
+		if(strncmp(display, displays[i].name, 14) == 0) {
+			printk(KERN_INFO "stamp9261: Using display %s\n", display);
+			at91fb_default_monspecs.monitor[0] = '\0';
+			strncat(at91fb_default_monspecs.monitor, display, sizeof(at91fb_default_monspecs.monitor));
+			displays[i].init_function();
+			break;
+		}
+	}
+	if(i == ARRAY_SIZE(displays))
+		printk(KERN_INFO "stamp9261: No known display defined");
+}
+
+static void __init stamp9261_board_init(void)
+{
+	/* Serial */
+	at91_add_device_serial();
+	/* USB Host */
+	at91_add_device_usbh(&stamp9261_usbh_data);
+	/* USB Device */
+	at91_add_device_udc(&stamp9261_udc_data);
+	/* DM9000 ethernet */
+	stamp9261_add_device_dm9000();
+	/* NOR Flash */
+	platform_device_register(&stamp9261_flash);
+	/* MMC */
+	at91_add_device_mmc(0, &stamp9261_mmc_data);
+	/* RTC */
+	at91_add_device_rtc();
+	/* I2C */
+	at91_add_device_i2c(NULL, 0);
+	/* LCD */
+	stamp9261_add_device_lcd();
+	/* SPI */
+	if(stamp9261_has_touchscreen)
+		at91_add_device_spi(stamp9261_spi_devices, ARRAY_SIZE(stamp9261_spi_devices));
+	else
+		at91_add_device_spi(&stamp9261_spi_devices[1], ARRAY_SIZE(stamp9261_spi_devices) - 1);
+}
+
+MACHINE_START(TAS9261, "taskit Stamp9261")
+	/* Maintainer: taskit GmbH */
+	.phys_io	= AT91_BASE_SYS,
+	.io_pg_offst	= (AT91_VA_BASE_SYS >> 18) & 0xfffc,
+	.boot_params	= AT91_SDRAM_BASE + 0x100,
+	.timer		= &at91sam926x_timer,
+	.map_io		= stamp9261_map_io,
+	.init_irq	= stamp9261_init_irq,
+	.init_machine	= stamp9261_board_init,
+MACHINE_END
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 8dce251..53a50d4 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -68,7 +68,7 @@ static void atmel_lcdfb_update_dma2d(struct atmel_lcdfb_info *sinfo,
 }
 #endif
 
-static const u32 contrast_ctr = ATMEL_LCDC_PS_DIV8
+static u32 contrast_ctr = ATMEL_LCDC_PS_DIV8
 		| ATMEL_LCDC_POL_POSITIVE
 		| ATMEL_LCDC_ENA_PWMENABLE;
 
@@ -163,6 +163,10 @@ static void exit_backlight(struct atmel_lcdfb_info *sinfo)
 
 static void init_contrast(struct atmel_lcdfb_info *sinfo)
 {
+	/* contrast pwm can be 'inverted' */
+	if (sinfo->lcdcon_pol_negative)
+			contrast_ctr &= ~(ATMEL_LCDC_POL_POSITIVE);
+
 	/* have some default contrast/backlight settings */
 	lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, contrast_ctr);
 	lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_VAL, ATMEL_LCDC_CVAL_DEFAULT);
@@ -434,7 +438,8 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
 		var->transp.length = 8;
 		/* fall through */
 	case 24:
-		if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {
+		if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB ||
+		    sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB555) {
 			/* RGB:888 mode */
 			var->red.offset = 16;
 			var->blue.offset = 0;
@@ -710,11 +715,39 @@ static int atmel_lcdfb_pan_display(struct fb_var_screeninfo *var,
 	return 0;
 }
 
+static int atmel_lcdfb_blank(int blank_mode, struct fb_info *info)
+{
+	struct atmel_lcdfb_info *sinfo = info->par;
+
+	switch (blank_mode) {
+	case FB_BLANK_UNBLANK:
+	case FB_BLANK_NORMAL:
+		atmel_lcdfb_start(sinfo);
+		if (sinfo->atmel_lcdfb_power_control)
+			sinfo->atmel_lcdfb_power_control(1);
+		break;
+	case FB_BLANK_VSYNC_SUSPEND:
+	case FB_BLANK_HSYNC_SUSPEND:
+		break;
+	case FB_BLANK_POWERDOWN:
+		if (sinfo->atmel_lcdfb_power_control)
+			sinfo->atmel_lcdfb_power_control(0);
+		atmel_lcdfb_stop(sinfo);
+		break;
+	default:
+		return -EINVAL;
+	}
+
+	/* let fbcon do a soft blank for us */
+	return ((blank_mode == FB_BLANK_NORMAL) ? 1 : 0);
+}
+
 static struct fb_ops atmel_lcdfb_ops = {
 	.owner		= THIS_MODULE,
 	.fb_check_var	= atmel_lcdfb_check_var,
 	.fb_set_par	= atmel_lcdfb_set_par,
 	.fb_setcolreg	= atmel_lcdfb_setcolreg,
+	.fb_blank	= atmel_lcdfb_blank,
 	.fb_pan_display	= atmel_lcdfb_pan_display,
 	.fb_fillrect	= cfb_fillrect,
 	.fb_copyarea	= cfb_copyarea,
@@ -816,6 +849,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
 		sinfo->guard_time = pdata_sinfo->guard_time;
 		sinfo->smem_len = pdata_sinfo->smem_len;
 		sinfo->lcdcon_is_backlight = pdata_sinfo->lcdcon_is_backlight;
+		sinfo->lcdcon_pol_negative = pdata_sinfo->lcdcon_pol_negative;
 		sinfo->lcd_wiring_mode = pdata_sinfo->lcd_wiring_mode;
 	} else {
 		dev_err(dev, "cannot get default configuration\n");
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index e54a337..5757eb8 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -150,6 +150,14 @@ config BACKLIGHT_ATMEL_PWM
 	  To compile this driver as a module, choose M here: the module will be
 	  called atmel-pwm-bl.
 
+config BACKLIGHT_PANELCARD
+	tristate "taskit Panel-Card 35 Backlight Driver"
+	depends on MACH_STAMP9261
+	default y
+	help
+	  If you have a taskit Panel-Card 35, say Y to enable the
+	  backlight driver.
+
 config BACKLIGHT_EP93XX
 	tristate "Cirrus EP93xx Backlight Driver"
 	depends on FB_EP93XX
diff --git a/drivers/video/backlight/Makefile b/drivers/video/backlight/Makefile
index 44c0f81..e1c8a8f 100644
--- a/drivers/video/backlight/Makefile
+++ b/drivers/video/backlight/Makefile
@@ -15,6 +15,7 @@ obj-$(CONFIG_LCD_S6E63M0)	+= s6e63m0.o
 
 obj-$(CONFIG_BACKLIGHT_CLASS_DEVICE) += backlight.o
 obj-$(CONFIG_BACKLIGHT_ATMEL_PWM)    += atmel-pwm-bl.o
+obj-$(CONFIG_BACKLIGHT_PANELCARD)    += panelcard_bl.o
 obj-$(CONFIG_BACKLIGHT_EP93XX)	+= ep93xx_bl.o
 obj-$(CONFIG_BACKLIGHT_GENERIC)	+= generic_bl.o
 obj-$(CONFIG_BACKLIGHT_HP700)	+= jornada720_bl.o
diff --git a/drivers/video/backlight/panelcard_bl.c b/drivers/video/backlight/panelcard_bl.c
new file mode 100644
index 0000000..ea9f947
--- /dev/null
+++ b/drivers/video/backlight/panelcard_bl.c
@@ -0,0 +1,149 @@
+/*
+ * Backlight driver for taskit's Panel-Card 35
+ *
+ * Copyright (C) 2011 taskit GmbH
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/err.h>
+#include <linux/backlight.h>
+#include <mach/gpio.h>
+
+#include <linux/platform_device.h>
+
+static int current_intensity = 0;
+static int panelcardbl_suspended = 0;
+
+#define LOW 0
+#define HIGH 1
+#define TRISTATE 2
+
+static int brightness[][2]={
+	{HIGH    , HIGH},
+	{TRISTATE, HIGH},
+	{LOW     , HIGH},
+	{HIGH    , TRISTATE},
+	{TRISTATE, TRISTATE},
+	{LOW     , TRISTATE}
+};
+
+static void panelcardbl_set_pin(unsigned pin, int value)
+{
+	switch (value) {
+	case HIGH:
+		at91_set_gpio_value(pin, 1);
+		at91_set_multi_drive(pin, 0);
+		break;
+	case LOW:
+		at91_set_gpio_value(pin, 0);
+		break;
+	case TRISTATE:
+		at91_set_gpio_value(pin, 1);
+		at91_set_multi_drive(pin, 1);
+		break;
+	}
+}
+
+static void panelcardbl_set_intensity(struct backlight_device *dev)
+{
+	if(panelcardbl_suspended || dev->props.power != 0 || dev->props.fb_blank != 0) {
+		at91_set_gpio_value(AT91_PIN_PC1, 0);
+		at91_set_gpio_value(AT91_PIN_PC4, 1);
+		at91_set_gpio_value(AT91_PIN_PC5, 1);
+	} else {
+		at91_set_gpio_value(AT91_PIN_PC1, 1);
+		panelcardbl_set_pin(AT91_PIN_PC4, brightness[dev->props.brightness][0]);
+		panelcardbl_set_pin(AT91_PIN_PC5, brightness[dev->props.brightness][1]);
+		current_intensity=dev->props.brightness;
+	}
+}
+
+static int panelcardbl_update_status(struct backlight_device *dev)
+{
+	panelcardbl_set_intensity(dev);
+	return 0;
+}
+
+static int panelcardbl_get_brightness(struct backlight_device *dev)
+{
+	return current_intensity;
+}
+
+static struct backlight_device *panelcard_backlight_device;
+static struct backlight_ops panelcard_backlight_ops={
+	.update_status	= panelcardbl_update_status,
+	.get_brightness	= panelcardbl_get_brightness,
+};
+
+#ifdef CONFIG_PM
+static int panelcardbl_suspend(struct platform_device *dev, pm_message_t state)
+{
+	panelcardbl_suspended = 1;
+	panelcardbl_set_intensity(panelcard_backlight_device);
+	return 0;
+}
+
+static int panelcardbl_resume(struct platform_device *dev)
+{
+	panelcardbl_suspended = 0;
+	panelcardbl_set_intensity(panelcard_backlight_device);
+	return 0;
+}
+#else
+#define panelcardbl_suspend	NULL
+#define panelcardbl_resume	NULL
+#endif
+
+
+static int panelcardbl_probe(struct platform_device *dev)
+{
+	panelcard_backlight_device = backlight_device_register("panelcard-bl",
+		&dev->dev, NULL, &panelcard_backlight_ops, NULL);
+	if (IS_ERR(panelcard_backlight_device))
+		return PTR_ERR (panelcard_backlight_device);
+
+	at91_set_gpio_output(AT91_PIN_PC1, 0);
+	at91_set_gpio_output(AT91_PIN_PC4, 1);
+	at91_set_gpio_output(AT91_PIN_PC5, 1);
+
+	panelcard_backlight_device->props.brightness = current_intensity = ARRAY_SIZE(brightness)-1;
+	panelcard_backlight_device->props.max_brightness = ARRAY_SIZE(brightness)-1;
+
+	panelcardbl_set_intensity(panelcard_backlight_device);
+
+	return 0;
+}
+
+static int panelcardbl_remove(struct platform_device *dev)
+{
+	backlight_device_unregister(panelcard_backlight_device);
+
+	return 0;
+}
+
+static struct platform_driver panelcardbl_driver = {
+	.probe		= panelcardbl_probe,
+	.remove		= panelcardbl_remove,
+	.suspend	= panelcardbl_suspend,
+	.resume		= panelcardbl_resume,
+	.driver		= {
+		.name	= "panelcard-bl",
+	},
+};
+
+
+static int __init panelcardbl_init(void)
+{
+	return platform_driver_register(&panelcardbl_driver);
+}
+
+static void __exit panelcardbl_exit(void)
+{
+	platform_driver_unregister(&panelcardbl_driver);
+}
+
+module_init(panelcardbl_init);
+module_exit(panelcardbl_exit);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Christian Glindkamp <christian.glindkamp@taskit.de>");
diff --git a/include/video/atmel_lcdc.h b/include/video/atmel_lcdc.h
index 0c864db..28447f1 100644
--- a/include/video/atmel_lcdc.h
+++ b/include/video/atmel_lcdc.h
@@ -52,6 +52,7 @@ struct atmel_lcdfb_info {
 	u8			bl_power;
 #endif
 	bool			lcdcon_is_backlight;
+	bool			lcdcon_pol_negative;
 	u8			saved_lcdcon;
 
 	u8			default_bpp;