diff --git a/docs/releases.txt b/docs/releases.txt
index d40cf7f8..5bd6ccbb 100644
--- a/docs/releases.txt
+++ b/docs/releases.txt
@@ -8,6 +8,7 @@ FIX:		Improving STM32LTDC driver
 FEATURE:	Added support for NIOS-II platform
 FEATURE:	Added Altera-MAX10-NEEK board support
 FIX:		Vastly improving keyboard widget default rendering
+FEATURE:	Added ILI9342 driver
 
 
 *** Release 2.4 ***
diff --git a/drivers/gdisp/ILI9342/ILI9342.h b/drivers/gdisp/ILI9342/ILI9342.h
new file mode 100644
index 00000000..0d57b553
--- /dev/null
+++ b/drivers/gdisp/ILI9342/ILI9342.h
@@ -0,0 +1,87 @@
+
+#define LCD_VERTICAL_MAX        		240
+#define LCD_HORIZONTAL_MAX      		320
+
+#define ILI9342_DEVICE_CODE_READ_REG    0x00
+#define ILI9342_SOFT_RESET_REG			0x01
+#define ILI9342_IDENTINFO_R_REG			0x04
+#define ILI9342_STATUS_R_REG			0x09
+#define ILI9342_POWERMODE_R_REG			0x0A
+#define ILI9342_MADCTL_R_REG			0x0B
+#define ILI9342_PIXFORMAT_R_REG			0x0C
+#define ILI9342_IMGFORMAT_R_REG			0x0D
+#define ILI9342_SIGMODE_R_REG			0x0E
+#define ILI9342_SD_RESULT_R_REG			0x0F
+#define ILI9342_SLEEP_ENTER_REG			0x10
+#define ILI9342_SLEEP_OUT_REG			0x11
+#define ILI9342_PARTIALMODE_REG			0x12
+#define ILI9342_NORDISPMODE_REG			0x13
+#define ILI9342_INVERSIONOFF_REG		0x20
+#define ILI9342_INVERSIONON_REG			0x21
+#define ILI9342_GAMMASET_REG			0x26
+#define ILI9342_DISPLAYOFF_REG			0x28
+#define ILI9342_DISPLAYON_REG			0x29
+#define ILI9342_COLADDRSET_REG			0x2A
+#define ILI9342_PAGEADDRSET_REG			0x2B
+#define ILI9342_MEMORYWRITE_REG			0x2C
+#define ILI9342_COLORSET_REG			0x2D
+#define ILI9342_MEMORYREAD_REG			0x2E
+#define ILI9342_PARTIALAREA_REG			0x30
+#define ILI9342_VERTSCROLL_REG			0x33
+#define ILI9342_TEAREFFECTLINEOFF_REG	0x34
+#define ILI9342_TEAREFFECTLINEON_REG	0x35
+#define ILI9342_MEMACCESS_REG			0x36
+#define ILI9342_VERSCRSRART_REG			0x37
+#define ILI9342_IDLEMODEOFF_REG			0x38
+#define ILI9342_IDLEMODEON_REG			0x39
+#define ILI9342_PIXFORMATSET_REG		0x3A
+#define ILI9342_WRITEMEMCONTINUE_REG	0x3C
+#define ILI9342_READMEMCONTINUE_REG		0x3E
+#define ILI9342_SETTEATSCAN_REG			0x44
+#define ILI9342_GETSCANLINE_REG			0x45
+#define ILI9342_WRITEBRIGHT_REG			0x51
+#define ILI9342_READBRIGHT_REG			0x52
+#define ILI9342_WRITECTRL_REG			0x53
+#define ILI9342_READCTRL_REG			0x54
+#define ILI9342_WRITECABC_REG			0x55
+#define ILI9342_READCABC_REG			0x56
+#define ILI9342_WRITECABCMB_REG			0x5E
+#define ILI9342_READCABCMB_REG			0x5F
+#define ILI9342_RGB_ISCTL_REG			0xB0
+#define ILI9342_FRAMECTL_NOR_REG		0xB1
+#define ILI9342_FRAMECTL_IDLE_REG		0xB2
+#define ILI9342_FRAMECTL_PARTIAL_REG	0xB3
+#define ILI9342_INVERCTL_REG			0xB4
+#define ILI9342_BLANKPORCTL_REG			0xB5
+#define ILI9342_FUNCTONCTL_REG			0xB6
+#define ILI9342_ENTRYMODE_REG			0xB7
+#define ILI9342_BLIGHTCTL1_REG			0xB8
+#define ILI9342_BLIGHTCTL2_REG			0xB9
+#define ILI9342_BLIGHTCTL3_REG			0xBA
+#define ILI9342_BLIGHTCTL4_REG			0xBB
+#define ILI9342_BLIGHTCTL5_REG			0xBC
+#define ILI9342_BLIGHTCTL7_REG			0xBE
+#define ILI9342_BLIGHTCTL8_REG			0xBF
+#define ILI9342_POWERCTL1_REG			0xC0
+#define ILI9342_POWERCTL2_REG			0xC1
+#define ILI9342_VCOMCTL1_REG			0xC5
+#define ILI9342_VCOMCTL2_REG			0xC7
+#define ILI9342_POWERCTLA_REG			0xCB
+#define ILI9342_POWERCTLB_REG			0xCF
+#define ILI9342_NVMEMWRITE_REG			0xD0
+#define ILI9342_NVMEMPROTECTKEY_REG		0xD1
+#define ILI9342_NVMEMSTATUS_REG			0xD2
+#define ILI9342_READID4_REG				0xD3
+#define ILI9342_READID1_REG				0xDA
+#define ILI9342_READID2_REG				0xDB
+#define ILI9342_READID3_REG				0xDC
+#define ILI9342_POSGAMMACORRECTION_REG	0xE0
+#define ILI9342_NEGGAMMACORRECTION_REG	0xE1
+#define ILI9342_DIGGAMCTL1_REG			0xE2
+#define ILI9342_DIGGAMCTL2_REG			0xE3
+#define ILI9342_DIVTIMCTL_A_REG			0xE8
+#define ILI9342_DIVTIMCTL_B_REG			0xEA
+#define ILI9342_POWONSEQCTL_REG			0xED
+#define ILI9342_ENABLE_3G_REG			0xF2
+#define ILI9342_INTERFCTL_REG			0xF6
+#define ILI9342_PUMPRATIOCTL_REG		0xF7
diff --git a/drivers/gdisp/ILI9342/gdisp_lld.mk b/drivers/gdisp/ILI9342/gdisp_lld.mk
new file mode 100644
index 00000000..aa1e3c84
--- /dev/null
+++ b/drivers/gdisp/ILI9342/gdisp_lld.mk
@@ -0,0 +1,2 @@
+GFXINC += $(GFXLIB)/drivers/gdisp/ILI9342_PUSH
+GFXSRC += $(GFXLIB)/drivers/gdisp/ILI9342_PUSH/gdisp_lld_ILI9342.c
diff --git a/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c b/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c
new file mode 100644
index 00000000..4560a166
--- /dev/null
+++ b/drivers/gdisp/ILI9342/gdisp_lld_ILI9342.c
@@ -0,0 +1,355 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+#include "gfx.h"
+
+#if GFX_USE_GDISP
+
+#if defined(GDISP_SCREEN_HEIGHT)
+	#warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
+	#undef GISP_SCREEN_HEIGHT
+#endif
+#if defined(GDISP_SCREEN_WIDTH)
+	#warning "GDISP: This low level driver does not support setting a screen size. It is being ignored."
+	#undef GDISP_SCREEN_WIDTH
+#endif
+
+#define GDISP_DRIVER_VMT			GDISPVMT_ILI9342
+#include "drivers/gdisp/ILI9342/gdisp_lld_config.h"
+#include "src/gdisp/gdisp_driver.h"
+
+#include "board_ILI9342.h"
+
+/*===========================================================================*/
+/* Driver local definitions.                                                 */
+/*===========================================================================*/
+
+	#define GDISP_SCREEN_HEIGHT		240
+	#define GDISP_SCREEN_WIDTH		320
+/*
+#ifndef GDISP_SCREEN_HEIGHT
+	#define GDISP_SCREEN_HEIGHT		320
+#endif
+#ifndef GDISP_SCREEN_WIDTH
+	#define GDISP_SCREEN_WIDTH		240
+#endif
+*/
+#ifndef GDISP_INITIAL_CONTRAST
+	#define GDISP_INITIAL_CONTRAST	50
+#endif
+#ifndef GDISP_INITIAL_BACKLIGHT
+	#define GDISP_INITIAL_BACKLIGHT	100
+#endif
+
+#include "drivers/gdisp/ILI9342/ILI9342.h"
+
+/*===========================================================================*/
+/* Driver local functions.                                                   */
+/*===========================================================================*/
+
+// Some common routines and macros
+#define dummy_read(g)				{ volatile uint16_t dummy; dummy = read_data(g); (void) dummy; }
+#define write_reg(g, reg, data)		{ write_index(g, reg); write_data(g, data); }
+
+static void set_viewport(GDisplay *g) {
+	write_index(g, 0x2A);
+	write_data(g, (g->p.x >> 8));
+	write_data(g, (uint8_t) g->p.x);
+	write_data(g, (g->p.x + g->p.cx - 1) >> 8);
+	write_data(g, (uint8_t) (g->p.x + g->p.cx - 1));
+
+	write_index(g, 0x2B);
+	write_data(g, (g->p.y >> 8));
+	write_data(g, (uint8_t) g->p.y);
+	write_data(g, (g->p.y + g->p.cy - 1) >> 8);
+	write_data(g, (uint8_t) (g->p.y + g->p.cy - 1));
+}
+
+/*===========================================================================*/
+/* Driver exported functions.                                                */
+/*===========================================================================*/
+
+LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
+	// No private area for this controller
+	g->priv = 0;
+
+	// Initialise the board interface
+	init_board(g);
+
+	// Hardware reset
+	setpin_reset(g, TRUE);
+	gfxSleepMilliseconds(20);
+	setpin_reset(g, FALSE);
+	gfxSleepMilliseconds(20);
+
+	// Get the bus for the following initialisation commands
+	acquire_bus(g);
+
+	// Software reset
+	write_index(g, 0x01);
+	gfxSleepMilliseconds(5);
+	write_index(g, 0x28);
+	// display off
+	//---------------------------------------------------------
+	// magic?
+	write_index(g, 0xcf);
+	write_data(g, 0x00);
+	write_data(g, 0x83);
+	write_data(g, 0x30);
+
+	write_index(g, 0xed);
+	write_data(g, 0x64);
+	write_data(g, 0x03);
+	write_data(g, 0x12);
+	write_data(g, 0x81);
+	write_index(g, 0xe8);
+	write_data(g, 0x85);
+	write_data(g, 0x01);
+	write_data(g, 0x79);
+	write_index(g, 0xcb);
+	write_data(g, 0x39);
+	write_data(g, 0x2c);
+	write_data(g, 0x00);
+	write_data(g, 0x34);
+	write_data(g, 0x02);
+	write_index(g, 0xf7);
+	write_data(g, 0x20);
+	write_index(g, 0xea);
+	write_data(g, 0x00);
+	write_data(g, 0x00);
+	
+	//------------power control------------------------------
+	write_index(g, 0xc0); //power control
+	write_data(g, 0x26);
+	write_index(g, 0xc1); //power control
+	write_data(g, 0x11);
+	
+	//--------------VCOM
+	write_index(g, 0xc5); //vcom control
+	write_data(g, 0x35);//35
+	write_data(g, 0x3e);//3E
+	write_index(g, 0xc7); //vcom control
+	write_data(g, 0xbe); // 0x94
+	
+	//------------memory access control------------------------
+	write_index(g, 0x36);
+	write_data(g, 0x08); // scan direction (aka orientation and mirroring)
+	write_index(g, 0x3a); // pixel format set
+	write_data(g, 0x55);//16bit /pixel
+	
+	//----------------- frame rate------------------------------
+	write_index(g, 0xb1);
+	// frame rate
+	write_data(g, 0x00);
+	write_data(g, 0x1B); //70
+	
+	//----------------Gamma---------------------------------
+	write_index(g, 0xf2); // 3Gamma Function Disable
+	write_data(g, 0x08);
+	write_index(g, 0x26);
+	write_data(g, 0x01); // gamma set 4 gamma curve 01/02/04/08
+
+	write_index(g, 0xE0); //positive gamma correction
+	write_data(g, 0x1f);
+	write_data(g, 0x1a);
+	write_data(g, 0x18);
+	write_data(g, 0x0a);
+	write_data(g, 0x0f);
+	write_data(g, 0x06);
+	write_data(g, 0x45);
+	write_data(g, 0x87);
+	write_data(g, 0x32);
+	write_data(g, 0x0a);
+	write_data(g, 0x07);
+	write_data(g, 0x02);
+	write_data(g, 0x07);
+	write_data(g, 0x05);
+	write_data(g, 0x00);
+	write_index(g, 0xE1); //negamma correction
+	write_data(g, 0x00);
+	write_data(g, 0x25);
+	write_data(g, 0x27);
+	write_data(g, 0x05);
+	write_data(g, 0x10);
+	write_data(g, 0x09);
+	write_data(g, 0x3a);
+	write_data(g, 0x78);
+	write_data(g, 0x4d);
+	write_data(g, 0x05);
+	write_data(g, 0x18);
+	write_data(g, 0x0d);
+	write_data(g, 0x38);
+	write_data(g, 0x3a);
+	write_data(g, 0x1f);
+	
+	//--------------ddram ---------------------
+	write_index(g, 0x2a);
+	// column set
+	// size = 239
+	write_data(g, 0x00);
+	write_data(g, 0x00);
+	write_data(g, 0x00);
+	write_data(g, 0xEF);
+	write_index(g, 0x2b);
+	// page address set
+	// size = 319
+	write_data(g, 0x00);
+	write_data(g, 0x00);
+	write_data(g, 0x01);
+	write_data(g, 0x3F);
+	// write_index(g, 0x34);
+	//write_index(g, 0x35);
+	// tearing effect off
+	// tearing effect on
+	// write_index(g, 0xb4); // display inversion
+	// write_data(g, 0x00);
+	write_index(g, 0xb7); //entry mode set
+	write_data(g, 0x07);
+	
+	//-----------------display---------------------
+	write_index(g, 0xb6);
+	// display function control
+	write_data(g, 0x0a);
+	write_data(g, 0x82);
+	write_data(g, 0x27);
+	write_data(g, 0x00);
+	write_index(g, 0x11); //sleep out
+	gfxSleepMilliseconds(100);
+	write_index(g, 0x29); // display on
+	gfxSleepMilliseconds(100);
+
+    // Finish Init
+    post_init_board(g);
+
+ 	// Release the bus
+	release_bus(g);
+	
+	/* Turn on the back-light */
+	set_backlight(g, GDISP_INITIAL_BACKLIGHT);
+
+	/* Initialise the GDISP structure */
+	g->g.Width = GDISP_SCREEN_WIDTH;
+	g->g.Height = GDISP_SCREEN_HEIGHT;
+	g->g.Orientation = GDISP_ROTATE_0;
+	g->g.Powermode = powerOn;
+	g->g.Backlight = GDISP_INITIAL_BACKLIGHT;
+	g->g.Contrast = GDISP_INITIAL_CONTRAST;
+	return TRUE;
+}
+
+#if GDISP_HARDWARE_STREAM_WRITE
+	LLDSPEC	void gdisp_lld_write_start(GDisplay *g) {
+		acquire_bus(g);
+		set_viewport(g);
+		write_index(g, 0x2C);
+	}
+	LLDSPEC	void gdisp_lld_write_color(GDisplay *g) {
+		write_pixel(g, gdispColor2Native(g->p.color));
+	}
+	LLDSPEC	void gdisp_lld_write_stop(GDisplay *g) {
+		release_bus(g);
+	}
+#endif
+
+#if GDISP_HARDWARE_STREAM_READ
+	LLDSPEC	void gdisp_lld_read_start(GDisplay *g) {
+		acquire_bus(g);
+		set_viewport(g);
+		write_index(g, 0x2E);
+		setreadmode(g);
+		dummy_read(g);
+	}
+	LLDSPEC	color_t gdisp_lld_read_color(GDisplay *g) {
+		uint16_t	data;
+
+		data = read_data(g);
+		return gdispNative2Color(data);
+	}
+	LLDSPEC	void gdisp_lld_read_stop(GDisplay *g) {
+		setwritemode(g);
+		release_bus(g);
+	}
+#endif
+
+#if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL
+	LLDSPEC void gdisp_lld_control(GDisplay *g) {
+		switch(g->p.x) {
+		case GDISP_CONTROL_POWER:
+			if (g->g.Powermode == (powermode_t)g->p.ptr)
+				return;
+			switch((powermode_t)g->p.ptr) {
+			case powerOff:
+			case powerSleep:
+			case powerDeepSleep:
+				acquire_bus(g);
+				write_reg(g, 0x0010, 0x0001);	/* enter sleep mode */
+				release_bus(g);
+				break;
+			case powerOn:
+				acquire_bus(g);
+				write_reg(g, 0x0010, 0x0000);	/* leave sleep mode */
+				release_bus(g);
+				break;
+			default:
+				return;
+			}
+			g->g.Powermode = (powermode_t)g->p.ptr;
+			return;
+
+		case GDISP_CONTROL_ORIENTATION:
+			if (g->g.Orientation == (orientation_t)g->p.ptr)
+				return;
+			switch((orientation_t)g->p.ptr) {
+			case GDISP_ROTATE_0:
+				acquire_bus(g);
+				write_reg(g, 0x36, 0x08);
+				release_bus(g);
+				g->g.Height = GDISP_SCREEN_HEIGHT;
+				g->g.Width = GDISP_SCREEN_WIDTH;
+				break;
+			case GDISP_ROTATE_90:
+				acquire_bus(g);
+				write_reg(g, 0x36, 0x68);
+				release_bus(g);
+				g->g.Height = GDISP_SCREEN_WIDTH;
+				g->g.Width = GDISP_SCREEN_HEIGHT;
+				break;
+			case GDISP_ROTATE_180:
+				acquire_bus(g);
+				write_reg(g, 0x36, 0xC8);
+				release_bus(g);
+				g->g.Height = GDISP_SCREEN_HEIGHT;
+				g->g.Width = GDISP_SCREEN_WIDTH;
+				break;
+			case GDISP_ROTATE_270:
+				acquire_bus(g);
+				write_reg(g, 0x36, 0xA8);
+				release_bus(g);
+				g->g.Height = GDISP_SCREEN_WIDTH;
+				g->g.Width = GDISP_SCREEN_HEIGHT;
+				break;
+			default:
+				return;
+			}
+			g->g.Orientation = (orientation_t)g->p.ptr;
+			return;
+
+        case GDISP_CONTROL_BACKLIGHT:
+            if ((unsigned)g->p.ptr > 100)
+            	g->p.ptr = (void *)100;
+            set_backlight(g, (unsigned)g->p.ptr);
+            g->g.Backlight = (unsigned)g->p.ptr;
+            return;
+
+		//case GDISP_CONTROL_CONTRAST:
+        default:
+            return;
+		}
+	}
+#endif
+
+#endif /* GFX_USE_GDISP */
diff --git a/drivers/gdisp/ILI9342/gdisp_lld_config.h b/drivers/gdisp/ILI9342/gdisp_lld_config.h
new file mode 100644
index 00000000..70947f0c
--- /dev/null
+++ b/drivers/gdisp/ILI9342/gdisp_lld_config.h
@@ -0,0 +1,25 @@
+/*
+ * This file is subject to the terms of the GFX License. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://ugfx.org/license.html
+ */
+
+#ifndef _GDISP_LLD_CONFIG_H
+#define _GDISP_LLD_CONFIG_H
+
+#if GFX_USE_GDISP
+
+/*===========================================================================*/
+/* Driver hardware support.                                                  */
+/*===========================================================================*/
+
+#define GDISP_HARDWARE_STREAM_WRITE		TRUE
+#define GDISP_HARDWARE_STREAM_READ		FALSE
+#define GDISP_HARDWARE_CONTROL			TRUE
+
+#define GDISP_LLD_PIXELFORMAT			GDISP_PIXELFORMAT_RGB565
+
+#endif	/* GFX_USE_GDISP */
+
+#endif	/* _GDISP_LLD_CONFIG_H */