AM335x LCD controller driver with syscons support

Limitations:
- Raster mode only
- 24 and 32 bpp only

4 files changed, 1518 insertions, 0 deletions

diff --git a/sys/arm/ti/am335x/am335x_lcd.c b/sys/arm/ti/am335x/am335x_lcd.c
new file mode 100644
index 0000000..5cd875c
--- /dev/null
+++ b/sys/arm/ti/am335x/am335x_lcd.c
@@ -0,0 +1,667 @@
+/*-
+ * Copyright 2013 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/clock.h>
+#include <sys/time.h>
+#include <sys/bus.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
+#include <sys/resource.h>
+#include <sys/rman.h>
+#include <sys/sysctl.h>
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#include <machine/bus.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/openfirm.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <arm/ti/ti_prcm.h>
+#include <arm/ti/ti_scm.h>
+
+#include "am335x_lcd.h"
+#include "am335x_pwm.h"
+
+#define	LCD_PID			0x00
+#define	LCD_CTRL		0x04
+#define		CTRL_DIV_MASK		0xff
+#define		CTRL_DIV_SHIFT		8
+#define		CTRL_AUTO_UFLOW_RESTART	(1 << 1)
+#define		CTRL_RASTER_MODE	1
+#define		CTRL_LIDD_MODE		0
+#define	LCD_LIDD_CTRL		0x0C
+#define	LCD_LIDD_CS0_CONF	0x10
+#define	LCD_LIDD_CS0_ADDR	0x14
+#define	LCD_LIDD_CS0_DATA	0x18
+#define	LCD_LIDD_CS1_CONF	0x1C
+#define	LCD_LIDD_CS1_ADDR	0x20
+#define	LCD_LIDD_CS1_DATA	0x24
+#define	LCD_RASTER_CTRL		0x28
+#define		RASTER_CTRL_TFT24_UNPACKED	(1 << 26)
+#define		RASTER_CTRL_TFT24		(1 << 25)
+#define		RASTER_CTRL_STN565		(1 << 24)
+#define		RASTER_CTRL_TFTPMAP		(1 << 23)
+#define		RASTER_CTRL_NIBMODE		(1 << 22)
+#define		RASTER_CTRL_PALMODE_SHIFT	20
+#define		PALETTE_PALETTE_AND_DATA	0x00
+#define		PALETTE_PALETTE_ONLY		0x01
+#define		PALETTE_DATA_ONLY		0x02
+#define		RASTER_CTRL_REQDLY_SHIFT	12
+#define		RASTER_CTRL_MONO8B		(1 << 9)
+#define		RASTER_CTRL_RBORDER		(1 << 8)
+#define		RASTER_CTRL_LCDTFT		(1 << 7)
+#define		RASTER_CTRL_LCDBW		(1 << 1)
+#define		RASTER_CTRL_LCDEN		(1 << 0)
+#define	LCD_RASTER_TIMING_0	0x2C
+#define		RASTER_TIMING_0_HBP_SHIFT	24
+#define		RASTER_TIMING_0_HFP_SHIFT	16
+#define		RASTER_TIMING_0_HSW_SHIFT	10
+#define		RASTER_TIMING_0_PPLLSB_SHIFT	4
+#define		RASTER_TIMING_0_PPLMSB_SHIFT	3
+#define	LCD_RASTER_TIMING_1	0x30
+#define		RASTER_TIMING_1_VBP_SHIFT	24
+#define		RASTER_TIMING_1_VFP_SHIFT	16
+#define		RASTER_TIMING_1_VSW_SHIFT	10
+#define		RASTER_TIMING_1_LPP_SHIFT	0
+#define	LCD_RASTER_TIMING_2	0x34
+#define		RASTER_TIMING_2_HSWHI_SHIFT	27
+#define		RASTER_TIMING_2_LPP_B10_SHIFT	26
+#define		RASTER_TIMING_2_PHSVS		(1 << 25)
+#define		RASTER_TIMING_2_PHSVS_RISE	(1 << 24)
+#define		RASTER_TIMING_2_PHSVS_FALL	(0 << 24)
+#define		RASTER_TIMING_2_IOE		(1 << 23)
+#define		RASTER_TIMING_2_IPC		(1 << 22)
+#define		RASTER_TIMING_2_IHS		(1 << 21)
+#define		RASTER_TIMING_2_IVS		(1 << 20)
+#define		RASTER_TIMING_2_ACBI_SHIFT	16
+#define		RASTER_TIMING_2_ACB_SHIFT	8
+#define		RASTER_TIMING_2_HBPHI_SHIFT	4
+#define		RASTER_TIMING_2_HFPHI_SHIFT	0
+#define	LCD_RASTER_SUBPANEL	0x38
+#define	LCD_RASTER_SUBPANEL2	0x3C
+#define	LCD_LCDDMA_CTRL		0x40
+#define		LCDDMA_CTRL_DMA_MASTER_PRIO_SHIFT		16
+#define		LCDDMA_CTRL_TH_FIFO_RDY_SHIFT	8
+#define		LCDDMA_CTRL_BURST_SIZE_SHIFT	4
+#define		LCDDMA_CTRL_BYTES_SWAP		(1 << 3)
+#define		LCDDMA_CTRL_BE			(1 << 1)
+#define		LCDDMA_CTRL_FB0_ONLY		0
+#define		LCDDMA_CTRL_FB0_FB1		(1 << 0)
+#define	LCD_LCDDMA_FB0_BASE	0x44
+#define	LCD_LCDDMA_FB0_CEILING	0x48
+#define	LCD_LCDDMA_FB1_BASE	0x4C
+#define	LCD_LCDDMA_FB1_CEILING	0x50
+#define	LCD_SYSCONFIG		0x54
+#define		SYSCONFIG_STANDBY_FORCE		(0 << 4)
+#define		SYSCONFIG_STANDBY_NONE		(1 << 4)
+#define		SYSCONFIG_STANDBY_SMART		(2 << 4)
+#define		SYSCONFIG_IDLE_FORCE		(0 << 2)
+#define		SYSCONFIG_IDLE_NONE		(1 << 2)
+#define		SYSCONFIG_IDLE_SMART		(2 << 2)
+#define	LCD_IRQSTATUS_RAW	0x58
+#define	LCD_IRQSTATUS		0x5C
+#define	LCD_IRQENABLE_SET	0x60
+#define	LCD_IRQENABLE_CLEAR	0x64
+#define		IRQ_EOF1		(1 << 9)
+#define		IRQ_EOF0		(1 << 8)
+#define		IRQ_PL			(1 << 6)
+#define		IRQ_FUF			(1 << 5)
+#define		IRQ_ACB			(1 << 3)
+#define		IRQ_SYNC_LOST		(1 << 2)
+#define		IRQ_RASTER_DONE		(1 << 1)
+#define		IRQ_FRAME_DONE		(1 << 0)
+#define	LCD_CLKC_ENABLE		0x6C
+#define		CLKC_ENABLE_DMA		(1 << 2)
+#define		CLKC_ENABLE_LDID	(1 << 1)
+#define		CLKC_ENABLE_CORE	(1 << 0)
+#define	LCD_CLKC_RESET		0x70
+#define		CLKC_RESET_MAIN		(1 << 3)
+#define		CLKC_RESET_DMA		(1 << 2)
+#define		CLKC_RESET_LDID		(1 << 1)
+#define		CLKC_RESET_CORE		(1 << 0)
+
+#define	LCD_LOCK(_sc)		mtx_lock(&(_sc)->sc_mtx)
+#define	LCD_UNLOCK(_sc)		mtx_unlock(&(_sc)->sc_mtx)
+#define	LCD_LOCK_INIT(_sc)	mtx_init(&(_sc)->sc_mtx, \
+    device_get_nameunit(_sc->sc_dev), "am335x_lcd", MTX_DEF)
+#define	LCD_LOCK_DESTROY(_sc)	mtx_destroy(&(_sc)->sc_mtx);
+
+#define	LCD_READ4(_sc, reg)	bus_read_4((_sc)->sc_mem_res, reg);
+#define	LCD_WRITE4(_sc, reg, value)	\
+    bus_write_4((_sc)->sc_mem_res, reg, value);
+
+
+/* Backlight is controlled by eCAS interface on PWM unit 0 */
+#define	PWM_UNIT	0
+#define	PWM_PERIOD	100
+
+struct am335x_lcd_softc {
+	device_t		sc_dev;
+	struct resource		*sc_mem_res;
+	struct resource		*sc_irq_res;
+	void			*sc_intr_hl;
+	struct mtx		sc_mtx;
+	int			sc_backlight;
+	struct sysctl_oid	*sc_oid;
+
+	/* Framebuffer */
+	bus_dma_tag_t		sc_dma_tag;
+	bus_dmamap_t		sc_dma_map;
+	size_t			sc_fb_size;
+	bus_addr_t		sc_fb_phys;
+	uint8_t			*sc_fb_base;
+};
+
+static void
+am335x_fb_dmamap_cb(void *arg, bus_dma_segment_t *segs, int nseg, int err)
+{
+	bus_addr_t *addr;
+
+	if (err)
+		return;
+
+	addr = (bus_addr_t*)arg;
+	*addr = segs[0].ds_addr;
+}
+
+static uint32_t
+am335x_lcd_calc_divisor(uint32_t reference, uint32_t freq)
+{
+	uint32_t div;
+	/* Raster mode case: divisors are in range from 2 to 255 */
+	for (div = 2; div < 255; div++)
+		if (reference/div <= freq)
+			return (div);
+
+	return (255);
+}
+
+static int
+am335x_lcd_sysctl_backlight(SYSCTL_HANDLER_ARGS)
+{
+	struct am335x_lcd_softc *sc = (struct am335x_lcd_softc*)arg1;
+	int error;
+	int backlight;
+       
+	backlight = sc->sc_backlight;;
+	error = sysctl_handle_int(oidp, &backlight, 0, req);
+
+	if (error != 0 || req->newptr == NULL)
+		return (error);
+
+	if (backlight < 0)
+		backlight = 0;
+	if (backlight > 100)
+		backlight = 100;
+
+	LCD_LOCK(sc);
+	error = am335x_pwm_config_ecas(PWM_UNIT, PWM_PERIOD,
+	    backlight*PWM_PERIOD/100);
+	if (error == 0)
+		sc->sc_backlight = backlight;
+	LCD_UNLOCK(sc);
+
+	return (error);
+}
+
+static int
+am335x_read_panel_property(device_t dev, const char *name, uint32_t *val)
+{
+	phandle_t node;
+	pcell_t cell;
+
+	node = ofw_bus_get_node(dev);
+	if ((OF_getprop(node, name, &cell, sizeof(cell))) <= 0) {
+		device_printf(dev, "missing '%s' attribute in LCD panel info\n",
+		    name);
+		return (ENXIO);
+	}
+
+	*val = fdt32_to_cpu(cell);
+
+	return (0);
+}
+
+static int
+am335x_read_panel_info(device_t dev, struct panel_info *panel)
+{
+	int error;
+
+	error = 0;
+	if ((error = am335x_read_panel_property(dev,
+	    "panel_width", &panel->panel_width)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "panel_height", &panel->panel_height)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "panel_hfp", &panel->panel_hfp)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "panel_hbp", &panel->panel_hbp)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "panel_hsw", &panel->panel_hsw)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "panel_vfp", &panel->panel_vfp)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "panel_vbp", &panel->panel_vbp)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "panel_vsw", &panel->panel_vsw)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "panel_pxl_clk", &panel->panel_pxl_clk)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "panel_invert_pxl_clk", &panel->panel_invert_pxl_clk)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "ac_bias", &panel->ac_bias)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "ac_bias_intrpt", &panel->ac_bias_intrpt)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "dma_burst_sz", &panel->dma_burst_sz)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "bpp", &panel->bpp)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "fdd", &panel->fdd)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "invert_line_clock", &panel->invert_line_clock)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "invert_frm_clock", &panel->invert_frm_clock)))
+		goto out;
+
+	if ((error = am335x_read_panel_property(dev,
+	    "sync_edge", &panel->sync_edge)))
+		goto out;
+
+	error = am335x_read_panel_property(dev,
+	    "sync_ctrl", &panel->sync_ctrl);
+
+out:
+	return (error);
+}
+
+static void
+am335x_lcd_intr(void *arg)
+{
+	struct am335x_lcd_softc *sc = arg;
+	uint32_t reg; 
+
+	reg = LCD_READ4(sc, LCD_IRQSTATUS);
+	LCD_WRITE4(sc, LCD_IRQSTATUS, reg);
+
+	if (reg & IRQ_SYNC_LOST) {
+		reg = LCD_READ4(sc, LCD_RASTER_CTRL);
+		reg &= ~RASTER_CTRL_LCDEN;
+		LCD_WRITE4(sc, LCD_RASTER_CTRL, reg); 
+
+		reg = LCD_READ4(sc, LCD_RASTER_CTRL);
+		reg |= RASTER_CTRL_LCDEN;
+		LCD_WRITE4(sc, LCD_RASTER_CTRL, reg); 
+		return;
+	}
+
+	if (reg & IRQ_PL) {
+		reg = LCD_READ4(sc, LCD_RASTER_CTRL);
+		reg &= ~RASTER_CTRL_LCDEN;
+		LCD_WRITE4(sc, LCD_RASTER_CTRL, reg); 
+
+		reg = LCD_READ4(sc, LCD_RASTER_CTRL);
+		reg |= RASTER_CTRL_LCDEN;
+		LCD_WRITE4(sc, LCD_RASTER_CTRL, reg); 
+		return;
+	}
+
+	if (reg & IRQ_EOF0) {
+		LCD_WRITE4(sc, LCD_LCDDMA_FB0_BASE, sc->sc_fb_phys); 
+		LCD_WRITE4(sc, LCD_LCDDMA_FB0_CEILING, sc->sc_fb_phys + sc->sc_fb_size - 1); 
+		reg &= ~IRQ_EOF0;
+	}
+
+	if (reg & IRQ_EOF1) {
+		LCD_WRITE4(sc, LCD_LCDDMA_FB1_BASE, sc->sc_fb_phys); 
+		LCD_WRITE4(sc, LCD_LCDDMA_FB1_CEILING, sc->sc_fb_phys + sc->sc_fb_size - 1); 
+		reg &= ~IRQ_EOF1;
+	}
+
+	if (reg & IRQ_FUF) {
+		/* TODO: Handle FUF */
+	}
+
+	if (reg & IRQ_ACB) {
+		/* TODO: Handle ACB */
+	}
+}
+
+static int
+am335x_lcd_probe(device_t dev)
+{
+	if (!ofw_bus_is_compatible(dev, "ti,am335x-lcd"))
+		return (ENXIO);
+
+	device_set_desc(dev, "AM335x LCD controller");
+
+	return (0);
+}
+
+static int
+am335x_lcd_attach(device_t dev)
+{
+	struct am335x_lcd_softc *sc;
+	int rid;
+	int div;
+	struct panel_info panel;
+	uint32_t reg, timing0, timing1, timing2;
+	struct sysctl_ctx_list *ctx;
+	struct sysctl_oid *tree;
+	uint32_t burst_log;
+	int err;
+	size_t dma_size;
+
+	sc = device_get_softc(dev);
+	sc->sc_dev = dev;
+
+	if (am335x_read_panel_info(dev, &panel))
+		return (ENXIO);
+
+	int ref_freq = 0;
+	ti_prcm_clk_enable(LCDC_CLK);
+	if (ti_prcm_clk_get_source_freq(LCDC_CLK, &ref_freq)) {
+		device_printf(dev, "Can't get reference frequency\n");
+		return (ENXIO);
+	}
+
+	rid = 0;
+	sc->sc_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
+	    RF_ACTIVE);
+	if (!sc->sc_mem_res) {
+		device_printf(dev, "cannot allocate memory window\n");
+		return (ENXIO);
+	}
+
+	rid = 0;
+	sc->sc_irq_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid,
+	    RF_ACTIVE);
+	if (!sc->sc_irq_res) {
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, sc->sc_mem_res);
+		device_printf(dev, "cannot allocate interrupt\n");
+		return (ENXIO);
+	}
+
+	if (bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE,
+			NULL, am335x_lcd_intr, sc,
+			&sc->sc_intr_hl) != 0) {
+		bus_release_resource(dev, SYS_RES_IRQ, rid,
+		    sc->sc_irq_res);
+		bus_release_resource(dev, SYS_RES_MEMORY, rid,
+		    sc->sc_mem_res);
+		device_printf(dev, "Unable to setup the irq handler.\n");
+		return (ENXIO);
+	}
+
+	LCD_LOCK_INIT(sc);
+
+	/* Panle initialization */
+	dma_size = round_page(panel.panel_width*panel.panel_height*panel.bpp/8);
+
+	/*
+	 * Now allocate framebuffer memory
+	 */
+	err = bus_dma_tag_create(
+	    bus_get_dma_tag(dev),
+	    4, 0,		/* alignment, boundary */
+	    BUS_SPACE_MAXADDR_32BIT,	/* lowaddr */
+	    BUS_SPACE_MAXADDR,		/* highaddr */
+	    NULL, NULL,			/* filter, filterarg */
+	    dma_size, 1,			/* maxsize, nsegments */
+	    dma_size, 0,			/* maxsegsize, flags */
+	    NULL, NULL,			/* lockfunc, lockarg */
+	    &sc->sc_dma_tag);
+	if (err)
+		goto fail;
+
+	err = bus_dmamem_alloc(sc->sc_dma_tag, (void **)&sc->sc_fb_base,
+	    0, &sc->sc_dma_map);
+
+	if (err) {
+		device_printf(dev, "cannot allocate framebuffer\n");
+		goto fail;
+	}
+
+	err = bus_dmamap_load(sc->sc_dma_tag, sc->sc_dma_map, sc->sc_fb_base,
+	    dma_size, am335x_fb_dmamap_cb, &sc->sc_fb_phys, BUS_DMA_NOWAIT);
+
+	if (err) {
+		device_printf(dev, "cannot load DMA map\n");
+		goto fail;
+	}
+
+	/* Make sure it's blank */
+	memset(sc->sc_fb_base, 0x00, dma_size);
+
+	/* Calculate actual FB Size */
+	sc->sc_fb_size = panel.panel_width*panel.panel_height*panel.bpp/8;
+
+	/* Only raster mode is supported */
+	reg = CTRL_RASTER_MODE;
+	div = am335x_lcd_calc_divisor(ref_freq, panel.panel_pxl_clk);
+	reg |= (div << CTRL_DIV_SHIFT);
+	LCD_WRITE4(sc, LCD_CTRL, reg); 
+
+	/* Set timing */
+	timing0 = timing1 = timing2 = 0;
+
+	/* Horizontal back porch */
+	timing0 |= (panel.panel_hbp & 0xff) << RASTER_TIMING_0_HBP_SHIFT;
+	timing2 |= ((panel.panel_hbp >> 8) & 3) << RASTER_TIMING_2_HBPHI_SHIFT;
+	/* Horizontal front porch */
+	timing0 |= (panel.panel_hfp & 0xff) << RASTER_TIMING_0_HFP_SHIFT;
+	timing2 |= ((panel.panel_hfp >> 8) & 3) << RASTER_TIMING_2_HFPHI_SHIFT;
+	/* Horizontal sync width */
+	timing0 |= (panel.panel_hsw & 0x3f) << RASTER_TIMING_0_HSW_SHIFT;
+	timing2 |= ((panel.panel_hsw >> 6) & 0xf) << RASTER_TIMING_2_HSWHI_SHIFT;
+
+	/* Vertical back porch, front porch, sync width */
+	timing1 |= (panel.panel_vbp & 0xff) << RASTER_TIMING_1_VBP_SHIFT;
+	timing1 |= (panel.panel_vfp & 0xff) << RASTER_TIMING_1_VFP_SHIFT;
+	timing1 |= (panel.panel_vsw & 0x3f) << RASTER_TIMING_1_VSW_SHIFT;
+
+	/* Pixels per line */
+	timing0 |= (((panel.panel_width - 1) >> 10) & 1)
+	    << RASTER_TIMING_0_PPLMSB_SHIFT;
+	timing0 |= (((panel.panel_width - 1) >> 4) & 0x3f)
+	    << RASTER_TIMING_0_PPLLSB_SHIFT;
+
+	/* Lines per panel */
+	timing1 |= ((panel.panel_height - 1) & 0x3ff) 
+	    << RASTER_TIMING_1_LPP_SHIFT;
+	timing2 |= (((panel.panel_height - 1) >> 10 ) & 1) 
+	    << RASTER_TIMING_2_LPP_B10_SHIFT;
+
+	/* clock signal settings */
+	if (panel.sync_ctrl)
+		timing2 |= RASTER_TIMING_2_PHSVS;
+	if (panel.sync_edge)
+		timing2 |= RASTER_TIMING_2_PHSVS_RISE;
+	else
+		timing2 |= RASTER_TIMING_2_PHSVS_FALL;
+	if (panel.invert_line_clock)
+		timing2 |= RASTER_TIMING_2_IHS;
+	if (panel.invert_frm_clock)
+		timing2 |= RASTER_TIMING_2_IVS;
+	if (panel.panel_invert_pxl_clk)
+		timing2 |= RASTER_TIMING_2_IPC;
+
+	/* AC bias */
+	timing2 |= (panel.ac_bias << RASTER_TIMING_2_ACB_SHIFT);
+	timing2 |= (panel.ac_bias_intrpt << RASTER_TIMING_2_ACBI_SHIFT);
+
+	LCD_WRITE4(sc, LCD_RASTER_TIMING_0, timing0); 
+	LCD_WRITE4(sc, LCD_RASTER_TIMING_1, timing1); 
+	LCD_WRITE4(sc, LCD_RASTER_TIMING_2, timing2); 
+
+	/* DMA settings */
+	reg = LCDDMA_CTRL_FB0_FB1;
+	/* Find power of 2 for current burst size */
+	switch (panel.dma_burst_sz) {
+	case 1:
+		burst_log = 0;
+		break;
+	case 2:
+		burst_log = 1;
+		break;
+	case 4:
+		burst_log = 2;
+		break;
+	case 8:
+		burst_log = 3;
+		break;
+	case 16:
+	default:
+		burst_log = 4;
+		break;
+	}
+	reg |= (burst_log << LCDDMA_CTRL_BURST_SIZE_SHIFT);
+	/* XXX: FIFO TH */
+	reg |= (0 << LCDDMA_CTRL_TH_FIFO_RDY_SHIFT);
+	LCD_WRITE4(sc, LCD_LCDDMA_CTRL, reg); 
+
+	LCD_WRITE4(sc, LCD_LCDDMA_FB0_BASE, sc->sc_fb_phys); 
+	LCD_WRITE4(sc, LCD_LCDDMA_FB0_CEILING, sc->sc_fb_phys + sc->sc_fb_size - 1); 
+	LCD_WRITE4(sc, LCD_LCDDMA_FB1_BASE, sc->sc_fb_phys); 
+	LCD_WRITE4(sc, LCD_LCDDMA_FB1_CEILING, sc->sc_fb_phys + sc->sc_fb_size - 1); 
+
+	/* Enable LCD */
+	reg = RASTER_CTRL_LCDTFT;
+	reg |= (panel.fdd << RASTER_CTRL_REQDLY_SHIFT);
+	reg |= (PALETTE_DATA_ONLY << RASTER_CTRL_PALMODE_SHIFT);
+	if (panel.bpp >= 24)
+		reg |= RASTER_CTRL_TFT24;
+	if (panel.bpp == 32)
+		reg |= RASTER_CTRL_TFT24_UNPACKED;
+	LCD_WRITE4(sc, LCD_RASTER_CTRL, reg); 
+
+	LCD_WRITE4(sc, LCD_CLKC_ENABLE,
+	    CLKC_ENABLE_DMA | CLKC_ENABLE_LDID | CLKC_ENABLE_CORE);
+
+	LCD_WRITE4(sc, LCD_CLKC_RESET, CLKC_RESET_MAIN);
+	DELAY(100);
+	LCD_WRITE4(sc, LCD_CLKC_RESET, 0);
+
+	reg = IRQ_EOF1 | IRQ_EOF0 | IRQ_FUF | IRQ_PL |
+	    IRQ_ACB | IRQ_SYNC_LOST |  IRQ_RASTER_DONE |
+	    IRQ_FRAME_DONE;
+	LCD_WRITE4(sc, LCD_IRQENABLE_SET, reg);
+
+	reg = LCD_READ4(sc, LCD_RASTER_CTRL);
+ 	reg |= RASTER_CTRL_LCDEN;
+	LCD_WRITE4(sc, LCD_RASTER_CTRL, reg); 
+
+	LCD_WRITE4(sc, LCD_SYSCONFIG,
+	    SYSCONFIG_STANDBY_SMART | SYSCONFIG_IDLE_SMART); 
+
+	/* Init backlight interface */
+	ctx = device_get_sysctl_ctx(sc->sc_dev);
+	tree = device_get_sysctl_tree(sc->sc_dev);
+	sc->sc_oid = SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
+	    "backlight", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
+	    am335x_lcd_sysctl_backlight, "I", "LCD backlight");
+	sc->sc_backlight = 0;
+	/* Check if eCAS interface is available at this point */
+	if (am335x_pwm_config_ecas(PWM_UNIT,
+	    PWM_PERIOD, PWM_PERIOD) == 0)
+		sc->sc_backlight = 100;
+
+	am335x_lcd_syscons_setup((vm_offset_t)sc->sc_fb_base, sc->sc_fb_phys, &panel);
+
+	return (0);
+
+fail:
+	return (err);
+}
+
+static int
+am335x_lcd_detach(device_t dev)
+{
+	/* Do not let unload driver */
+	return (EBUSY);
+}
+
+static device_method_t am335x_lcd_methods[] = {
+	DEVMETHOD(device_probe,		am335x_lcd_probe),
+	DEVMETHOD(device_attach,	am335x_lcd_attach),
+	DEVMETHOD(device_detach,	am335x_lcd_detach),
+
+	DEVMETHOD_END
+};
+
+static driver_t am335x_lcd_driver = {
+	"am335x_lcd",
+	am335x_lcd_methods,
+	sizeof(struct am335x_lcd_softc),
+};
+
+static devclass_t am335x_lcd_devclass;
+
+DRIVER_MODULE(am335x_lcd, simplebus, am335x_lcd_driver, am335x_lcd_devclass, 0, 0);
+MODULE_VERSION(am335x_lcd, 1);
+MODULE_DEPEND(am335x_lcd, simplebus, 1, 1, 1);
diff --git a/sys/arm/ti/am335x/am335x_lcd.h b/sys/arm/ti/am335x/am335x_lcd.h
new file mode 100644
index 0000000..afc8901
--- /dev/null
+++ b/sys/arm/ti/am335x/am335x_lcd.h
@@ -0,0 +1,56 @@
+/*-
+ * Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+#ifndef __AM335X_LCD_H__
+#define __AM335X_LCD_H__
+
+struct panel_info {
+	uint32_t panel_width;
+	uint32_t panel_height;
+	uint32_t panel_hfp;
+	uint32_t panel_hbp;
+	uint32_t panel_hsw;
+	uint32_t panel_vfp;
+	uint32_t panel_vbp;
+	uint32_t panel_vsw;
+	uint32_t ac_bias;
+	uint32_t ac_bias_intrpt;
+	uint32_t dma_burst_sz;
+	uint32_t bpp;
+	uint32_t fdd;
+	uint32_t invert_line_clock;
+	uint32_t invert_frm_clock;
+	uint32_t sync_edge;
+	uint32_t sync_ctrl;
+	uint32_t panel_pxl_clk;
+	uint32_t panel_invert_pxl_clk;	
+};
+
+int am335x_lcd_syscons_setup(vm_offset_t vaddr, vm_paddr_t paddr,
+    struct panel_info *panel);
+
+#endif /* __AM335X_LCD_H__ */
diff --git a/sys/arm/ti/am335x/am335x_lcd_syscons.c b/sys/arm/ti/am335x/am335x_lcd_syscons.c
new file mode 100644
index 0000000..7684c25
--- /dev/null
+++ b/sys/arm/ti/am335x/am335x_lcd_syscons.c
@@ -0,0 +1,793 @@
+/*-
+ * Copyright (c) 2013 Oleksandr Tymoshenko <gonzo@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/conf.h>
+#include <sys/endian.h>
+#include <sys/kernel.h>
+#include <sys/lock.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/resource.h>
+#include <sys/rman.h>
+#include <sys/fbio.h>
+#include <sys/consio.h>
+
+#include <sys/kdb.h>
+
+#include <machine/bus.h>
+#include <machine/cpu.h>
+#include <machine/cpufunc.h>
+#include <machine/resource.h>
+#include <machine/frame.h>
+#include <machine/intr.h>
+
+#include <dev/fdt/fdt_common.h>
+#include <dev/ofw/ofw_bus.h>
+#include <dev/ofw/ofw_bus_subr.h>
+
+#include <dev/fb/fbreg.h>
+#include <dev/syscons/syscons.h>
+
+#include "am335x_lcd.h"
+
+struct video_adapter_softc {
+	/* Videoadpater part */
+	video_adapter_t	va;
+	int		console;
+
+	intptr_t	fb_addr;
+	intptr_t	fb_paddr;
+	unsigned int	fb_size;
+
+	unsigned int	height;
+	unsigned int	width;
+	unsigned int	depth;
+	unsigned int	stride;
+
+	unsigned int	xmargin;
+	unsigned int	ymargin;
+
+	unsigned char	*font;
+	int		initialized;
+};
+
+struct argb {
+	uint8_t		a;
+	uint8_t		r;
+	uint8_t		g;
+	uint8_t		b;
+};
+
+static struct argb am335x_syscons_palette[16] = {
+	{0x00, 0x00, 0x00, 0x00},
+	{0x00, 0x00, 0x00, 0xaa},
+	{0x00, 0x00, 0xaa, 0x00},
+	{0x00, 0x00, 0xaa, 0xaa},
+	{0x00, 0xaa, 0x00, 0x00},
+	{0x00, 0xaa, 0x00, 0xaa},
+	{0x00, 0xaa, 0x55, 0x00},
+	{0x00, 0xaa, 0xaa, 0xaa},
+	{0x00, 0x55, 0x55, 0x55},
+	{0x00, 0x55, 0x55, 0xff},
+	{0x00, 0x55, 0xff, 0x55},
+	{0x00, 0x55, 0xff, 0xff},
+	{0x00, 0xff, 0x55, 0x55},
+	{0x00, 0xff, 0x55, 0xff},
+	{0x00, 0xff, 0xff, 0x55},
+	{0x00, 0xff, 0xff, 0xff}
+};
+
+/* mouse pointer from dev/syscons/scgfbrndr.c */
+static u_char mouse_pointer[16] = {
+        0x00, 0x40, 0x60, 0x70, 0x78, 0x7c, 0x7e, 0x68,
+        0x0c, 0x0c, 0x06, 0x06, 0x00, 0x00, 0x00, 0x00
+};
+
+#define	AM335X_FONT_HEIGHT	16
+
+#define FB_WIDTH		640
+#define FB_HEIGHT		480
+#define FB_DEPTH		24
+
+static struct video_adapter_softc va_softc;
+
+static int am335x_syscons_configure(int flags);
+
+/*
+ * Video driver routines and glue.
+ */
+static vi_probe_t		am335x_syscons_probe;
+static vi_init_t		am335x_syscons_init;
+static vi_get_info_t		am335x_syscons_get_info;
+static vi_query_mode_t		am335x_syscons_query_mode;
+static vi_set_mode_t		am335x_syscons_set_mode;
+static vi_save_font_t		am335x_syscons_save_font;
+static vi_load_font_t		am335x_syscons_load_font;
+static vi_show_font_t		am335x_syscons_show_font;
+static vi_save_palette_t	am335x_syscons_save_palette;
+static vi_load_palette_t	am335x_syscons_load_palette;
+static vi_set_border_t		am335x_syscons_set_border;
+static vi_save_state_t		am335x_syscons_save_state;
+static vi_load_state_t		am335x_syscons_load_state;
+static vi_set_win_org_t		am335x_syscons_set_win_org;
+static vi_read_hw_cursor_t	am335x_syscons_read_hw_cursor;
+static vi_set_hw_cursor_t	am335x_syscons_set_hw_cursor;
+static vi_set_hw_cursor_shape_t	am335x_syscons_set_hw_cursor_shape;
+static vi_blank_display_t	am335x_syscons_blank_display;
+static vi_mmap_t		am335x_syscons_mmap;
+static vi_ioctl_t		am335x_syscons_ioctl;
+static vi_clear_t		am335x_syscons_clear;
+static vi_fill_rect_t		am335x_syscons_fill_rect;
+static vi_bitblt_t		am335x_syscons_bitblt;
+static vi_diag_t		am335x_syscons_diag;
+static vi_save_cursor_palette_t	am335x_syscons_save_cursor_palette;
+static vi_load_cursor_palette_t	am335x_syscons_load_cursor_palette;
+static vi_copy_t		am335x_syscons_copy;
+static vi_putp_t		am335x_syscons_putp;
+static vi_putc_t		am335x_syscons_putc;
+static vi_puts_t		am335x_syscons_puts;
+static vi_putm_t		am335x_syscons_putm;
+
+static video_switch_t am335x_sysconsvidsw = {
+	.probe			= am335x_syscons_probe,
+	.init			= am335x_syscons_init,
+	.get_info		= am335x_syscons_get_info,
+	.query_mode		= am335x_syscons_query_mode,
+	.set_mode		= am335x_syscons_set_mode,
+	.save_font		= am335x_syscons_save_font,
+	.load_font		= am335x_syscons_load_font,
+	.show_font		= am335x_syscons_show_font,
+	.save_palette		= am335x_syscons_save_palette,
+	.load_palette		= am335x_syscons_load_palette,
+	.set_border		= am335x_syscons_set_border,
+	.save_state		= am335x_syscons_save_state,
+	.load_state		= am335x_syscons_load_state,
+	.set_win_org		= am335x_syscons_set_win_org,
+	.read_hw_cursor		= am335x_syscons_read_hw_cursor,
+	.set_hw_cursor		= am335x_syscons_set_hw_cursor,
+	.set_hw_cursor_shape	= am335x_syscons_set_hw_cursor_shape,
+	.blank_display		= am335x_syscons_blank_display,
+	.mmap			= am335x_syscons_mmap,
+	.ioctl			= am335x_syscons_ioctl,
+	.clear			= am335x_syscons_clear,
+	.fill_rect		= am335x_syscons_fill_rect,
+	.bitblt			= am335x_syscons_bitblt,
+	.diag			= am335x_syscons_diag,
+	.save_cursor_palette	= am335x_syscons_save_cursor_palette,
+	.load_cursor_palette	= am335x_syscons_load_cursor_palette,
+	.copy			= am335x_syscons_copy,
+	.putp			= am335x_syscons_putp,
+	.putc			= am335x_syscons_putc,
+	.puts			= am335x_syscons_puts,
+	.putm			= am335x_syscons_putm,
+};
+
+VIDEO_DRIVER(am335x_syscons, am335x_sysconsvidsw, am335x_syscons_configure);
+
+static vr_init_t am335x_rend_init;
+static vr_clear_t am335x_rend_clear;
+static vr_draw_border_t am335x_rend_draw_border;
+static vr_draw_t am335x_rend_draw;
+static vr_set_cursor_t am335x_rend_set_cursor;
+static vr_draw_cursor_t am335x_rend_draw_cursor;
+static vr_blink_cursor_t am335x_rend_blink_cursor;
+static vr_set_mouse_t am335x_rend_set_mouse;
+static vr_draw_mouse_t am335x_rend_draw_mouse;
+
+/*
+ * We use our own renderer; this is because we must emulate a hardware
+ * cursor.
+ */
+static sc_rndr_sw_t am335x_rend = {
+	am335x_rend_init,
+	am335x_rend_clear,
+	am335x_rend_draw_border,
+	am335x_rend_draw,
+	am335x_rend_set_cursor,
+	am335x_rend_draw_cursor,
+	am335x_rend_blink_cursor,
+	am335x_rend_set_mouse,
+	am335x_rend_draw_mouse
+};
+
+RENDERER(am335x_syscons, 0, am335x_rend, gfb_set);
+RENDERER_MODULE(am335x_syscons, gfb_set);
+
+static void
+am335x_rend_init(scr_stat* scp)
+{
+}
+
+static void
+am335x_rend_clear(scr_stat* scp, int c, int attr)
+{
+}
+
+static void
+am335x_rend_draw_border(scr_stat* scp, int color)
+{
+}
+
+static void
+am335x_rend_draw(scr_stat* scp, int from, int count, int flip)
+{
+	video_adapter_t* adp = scp->sc->adp;
+	int i, c, a;
+
+	if (!flip) {
+		/* Normal printing */
+		vidd_puts(adp, from, (uint16_t*)sc_vtb_pointer(&scp->vtb, from), count);
+	} else {	
+		/* This is for selections and such: invert the color attribute */
+		for (i = count; i-- > 0; ++from) {
+			c = sc_vtb_getc(&scp->vtb, from);
+			a = sc_vtb_geta(&scp->vtb, from) >> 8;
+			vidd_putc(adp, from, c, (a >> 4) | ((a & 0xf) << 4));
+		}
+	}
+}
+
+static void
+am335x_rend_set_cursor(scr_stat* scp, int base, int height, int blink)
+{
+}
+
+static void
+am335x_rend_draw_cursor(scr_stat* scp, int off, int blink, int on, int flip)
+{
+	video_adapter_t* adp = scp->sc->adp;
+	struct video_adapter_softc *sc;
+	int row, col;
+	uint8_t *addr;
+	int i, j, bytes;
+
+	sc = (struct video_adapter_softc *)adp;
+
+	if (scp->curs_attr.height <= 0)
+		return;
+
+	if (sc->fb_addr == 0)
+		return;
+
+	if (off >= adp->va_info.vi_width * adp->va_info.vi_height)
+		return;
+
+	/* calculate the coordinates in the video buffer */
+	row = (off / adp->va_info.vi_width) * adp->va_info.vi_cheight;
+	col = (off % adp->va_info.vi_width) * adp->va_info.vi_cwidth;
+
+	addr = (uint8_t *)sc->fb_addr
+	    + (row + sc->ymargin)*(sc->stride)
+	    + (sc->depth/8) * (col + sc->xmargin);
+
+	bytes = sc->depth/8;
+
+	/* our cursor consists of simply inverting the char under it */
+	for (i = 0; i < adp->va_info.vi_cheight; i++) {
+		for (j = 0; j < adp->va_info.vi_cwidth; j++) {
+			switch (sc->depth) {
+			case 32:
+			case 24:
+				addr[bytes*j + 2] ^= 0xff;
+				/* FALLTHROUGH */
+			case 16:
+				addr[bytes*j + 1] ^= 0xff;
+				addr[bytes*j] ^= 0xff;
+				break;
+			default:
+				break;
+			}
+		}
+
+		addr += sc->stride;
+	}
+}
+
+static void
+am335x_rend_blink_cursor(scr_stat* scp, int at, int flip)
+{
+}
+
+static void
+am335x_rend_set_mouse(scr_stat* scp)
+{
+}
+
+static void
+am335x_rend_draw_mouse(scr_stat* scp, int x, int y, int on)
+{
+	vidd_putm(scp->sc->adp, x, y, mouse_pointer, 0xffffffff, 16, 8);
+}
+
+static uint16_t am335x_syscons_static_window[ROW*COL];
+extern u_char dflt_font_16[];
+
+/*
+ * Update videoadapter settings after changing resolution
+ */
+static void
+am335x_syscons_update_margins(video_adapter_t *adp)
+{
+	struct video_adapter_softc *sc;
+	video_info_t *vi;
+
+	sc = (struct video_adapter_softc *)adp;
+	vi = &adp->va_info;
+
+	sc->xmargin = (sc->width - (vi->vi_width * vi->vi_cwidth)) / 2;
+	sc->ymargin = (sc->height - (vi->vi_height * vi->vi_cheight))/2;
+}
+
+static phandle_t
+am335x_syscons_find_panel_node(phandle_t start)
+{
+	phandle_t child;
+	phandle_t result;
+
+	for (child = OF_child(start); child != 0; child = OF_peer(child)) {
+		if (fdt_is_compatible(child, "ti,am335x-lcd"))
+			return (child);
+		if ((result = am335x_syscons_find_panel_node(child)))
+			return (result);
+	}
+
+	return (0);
+}
+
+static int
+am335x_syscons_configure(int flags)
+{
+	struct video_adapter_softc *va_sc;
+
+	va_sc = &va_softc;
+	phandle_t display, root;
+	pcell_t cell;
+
+	if (va_sc->initialized)
+		return (0);
+
+	va_sc->width = 0;
+	va_sc->height = 0;
+
+	/*
+	 * It seems there is no way to let syscons framework know
+	 * that framebuffer resolution has changed. So just try
+	 * to fetch data from FDT and go with defaults if failed
+	 */
+	root = OF_finddevice("/");
+	if ((root != 0) && 
+	    (display = am335x_syscons_find_panel_node(root))) {
+		if ((OF_getprop(display, "panel_width", 
+		    &cell, sizeof(cell))) > 0)
+			va_sc->width = (int)fdt32_to_cpu(cell);
+
+		if ((OF_getprop(display, "panel_height", 
+		    &cell, sizeof(cell))) > 0)
+			va_sc->height = (int)fdt32_to_cpu(cell);
+	}
+
+	if (va_sc->width == 0)
+		va_sc->width = FB_WIDTH;
+	if (va_sc->height == 0)
+		va_sc->height = FB_HEIGHT;
+
+	am335x_syscons_init(0, &va_sc->va, 0);
+
+	va_sc->initialized = 1;
+
+	return (0);
+}
+
+static int
+am335x_syscons_probe(int unit, video_adapter_t **adp, void *arg, int flags)
+{
+
+	return (0);
+}
+
+static int
+am335x_syscons_init(int unit, video_adapter_t *adp, int flags)
+{
+	struct video_adapter_softc *sc;
+	video_info_t *vi;
+
+	sc = (struct video_adapter_softc *)adp;
+	vi = &adp->va_info;
+
+	vid_init_struct(adp, "am335x_syscons", -1, unit);
+
+	sc->font = dflt_font_16;
+	vi->vi_cheight = AM335X_FONT_HEIGHT;
+	vi->vi_cwidth = 8;
+
+	vi->vi_width = sc->width/8;
+	vi->vi_height = sc->height/vi->vi_cheight;
+
+	/*
+	 * Clamp width/height to syscons maximums
+	 */
+	if (vi->vi_width > COL)
+		vi->vi_width = COL;
+	if (vi->vi_height > ROW)
+		vi->vi_height = ROW;
+
+	sc->xmargin = (sc->width - (vi->vi_width * vi->vi_cwidth)) / 2;
+	sc->ymargin = (sc->height - (vi->vi_height * vi->vi_cheight))/2;
+
+
+	adp->va_window = (vm_offset_t) am335x_syscons_static_window;
+	adp->va_flags |= V_ADP_FONT /* | V_ADP_COLOR | V_ADP_MODECHANGE */;
+
+	vid_register(&sc->va);
+
+	return (0);
+}
+
+static int
+am335x_syscons_get_info(video_adapter_t *adp, int mode, video_info_t *info)
+{
+	bcopy(&adp->va_info, info, sizeof(*info));
+	return (0);
+}
+
+static int
+am335x_syscons_query_mode(video_adapter_t *adp, video_info_t *info)
+{
+	return (0);
+}
+
+static int
+am335x_syscons_set_mode(video_adapter_t *adp, int mode)
+{
+	return (0);
+}
+
+static int
+am335x_syscons_save_font(video_adapter_t *adp, int page, int size, int width,
+    u_char *data, int c, int count)
+{
+	return (0);
+}
+
+static int
+am335x_syscons_load_font(video_adapter_t *adp, int page, int size, int width,
+    u_char *data, int c, int count)
+{
+	struct video_adapter_softc *sc = (struct video_adapter_softc *)adp;
+
+	sc->font = data;
+
+	return (0);
+}
+
+static int
+am335x_syscons_show_font(video_adapter_t *adp, int page)
+{
+	return (0);
+}
+
+static int
+am335x_syscons_save_palette(video_adapter_t *adp, u_char *palette)
+{
+	return (0);
+}
+
+static int
+am335x_syscons_load_palette(video_adapter_t *adp, u_char *palette)
+{
+	return (0);
+}
+
+static int
+am335x_syscons_set_border(video_adapter_t *adp, int border)
+{
+	return (am335x_syscons_blank_display(adp, border));
+}
+
+static int
+am335x_syscons_save_state(video_adapter_t *adp, void *p, size_t size)
+{
+	return (0);
+}
+
+static int
+am335x_syscons_load_state(video_adapter_t *adp, void *p)
+{
+	return (0);
+}
+
+static int
+am335x_syscons_set_win_org(video_adapter_t *adp, off_t offset)
+{
+	return (0);
+}
+
+static int
+am335x_syscons_read_hw_cursor(video_adapter_t *adp, int *col, int *row)
+{
+	*col = *row = 0;
+
+	return (0);
+}
+
+static int
+am335x_syscons_set_hw_cursor(video_adapter_t *adp, int col, int row)
+{
+	return (0);
+}
+
+static int
+am335x_syscons_set_hw_cursor_shape(video_adapter_t *adp, int base, int height,
+    int celsize, int blink)
+{
+	return (0);
+}
+
+static int
+am335x_syscons_blank_display(video_adapter_t *adp, int mode)
+{
+
+	struct video_adapter_softc *sc;
+
+	sc = (struct video_adapter_softc *)adp;
+	if (sc && sc->fb_addr)
+		memset((void*)sc->fb_addr, 0, sc->fb_size);
+
+	return (0);
+}
+
+static int
+am335x_syscons_mmap(video_adapter_t *adp, vm_ooffset_t offset, vm_paddr_t *paddr,
+    int prot, vm_memattr_t *memattr)
+{
+	struct video_adapter_softc *sc;
+
+	sc = (struct video_adapter_softc *)adp;
+
+	/*
+	 * This might be a legacy VGA mem request: if so, just point it at the
+	 * framebuffer, since it shouldn't be touched
+	 */
+	if (offset < sc->stride*sc->height) {
+		*paddr = sc->fb_paddr + offset;
+		return (0);
+	}
+
+	return (EINVAL);
+}
+
+static int
+am335x_syscons_ioctl(video_adapter_t *adp, u_long cmd, caddr_t data)
+{
+	struct video_adapter_softc *sc;
+	struct fbtype *fb;
+
+	sc = (struct video_adapter_softc *)adp;
+
+	switch (cmd) {
+	case FBIOGTYPE:
+		fb = (struct fbtype *)data;
+		fb->fb_type = FBTYPE_PCIMISC;
+		fb->fb_height = sc->height;
+		fb->fb_width = sc->width;
+		fb->fb_depth = sc->depth;
+		if (sc->depth <= 1 || sc->depth > 8)
+			fb->fb_cmsize = 0;
+		else
+			fb->fb_cmsize = 1 << sc->depth;
+		fb->fb_size = sc->fb_size;
+		break;
+	default:
+		return (fb_commonioctl(adp, cmd, data));
+	}
+
+	return (0);
+}
+
+static int
+am335x_syscons_clear(video_adapter_t *adp)
+{
+
+	return (am335x_syscons_blank_display(adp, 0));
+}
+
+static int
+am335x_syscons_fill_rect(video_adapter_t *adp, int val, int x, int y, int cx, int cy)
+{
+
+	return (0);
+}
+
+static int
+am335x_syscons_bitblt(video_adapter_t *adp, ...)
+{
+
+	return (0);
+}
+
+static int
+am335x_syscons_diag(video_adapter_t *adp, int level)
+{
+
+	return (0);
+}
+
+static int
+am335x_syscons_save_cursor_palette(video_adapter_t *adp, u_char *palette)
+{
+
+	return (0);
+}
+
+static int
+am335x_syscons_load_cursor_palette(video_adapter_t *adp, u_char *palette)
+{
+
+	return (0);
+}
+
+static int
+am335x_syscons_copy(video_adapter_t *adp, vm_offset_t src, vm_offset_t dst, int n)
+{
+
+	return (0);
+}
+
+static int
+am335x_syscons_putp(video_adapter_t *adp, vm_offset_t off, uint32_t p, uint32_t a,
+    int size, int bpp, int bit_ltor, int byte_ltor)
+{
+
+	return (0);
+}
+
+static int
+am335x_syscons_putc(video_adapter_t *adp, vm_offset_t off, uint8_t c, uint8_t a)
+{
+	struct video_adapter_softc *sc;
+	int row;
+	int col;
+	int i, j, k;
+	uint8_t *addr;
+	u_char *p;
+	uint8_t fg, bg, color;
+	uint16_t rgb;
+
+	sc = (struct video_adapter_softc *)adp;
+
+	if (sc->fb_addr == 0)
+		return (0);
+
+	row = (off / adp->va_info.vi_width) * adp->va_info.vi_cheight;
+	col = (off % adp->va_info.vi_width) * adp->va_info.vi_cwidth;
+	p = sc->font + c*AM335X_FONT_HEIGHT;
+	addr = (uint8_t *)sc->fb_addr
+	    + (row + sc->ymargin)*(sc->stride)
+	    + (sc->depth/8) * (col + sc->xmargin);
+
+	fg = a & 0xf ;
+	bg = (a >> 4) & 0xf;
+
+	for (i = 0; i < AM335X_FONT_HEIGHT; i++) {
+		for (j = 0, k = 7; j < 8; j++, k--) {
+			if ((p[i] & (1 << k)) == 0)
+				color = bg;
+			else
+				color = fg;
+
+			switch (sc->depth) {
+			case 32:
+				addr[4*j+0] = am335x_syscons_palette[color].r;
+				addr[4*j+1] = am335x_syscons_palette[color].g;
+				addr[4*j+2] = am335x_syscons_palette[color].b;
+				addr[4*j+3] = am335x_syscons_palette[color].a;
+				break;
+			case 24:
+				addr[3*j] = am335x_syscons_palette[color].r;
+				addr[3*j+1] = am335x_syscons_palette[color].g;
+				addr[3*j+2] = am335x_syscons_palette[color].b;
+				break;
+			case 16:
+				rgb = (am335x_syscons_palette[color].r >> 3) << 11;
+				rgb |= (am335x_syscons_palette[color].g >> 2) << 5;
+				rgb |= (am335x_syscons_palette[color].b >> 3);
+				addr[2*j] = rgb & 0xff;
+				addr[2*j + 1] = (rgb >> 8) & 0xff;
+			default:
+				/* Not supported yet */
+				break;
+			}
+		}
+
+		addr += (sc->stride);
+	}
+
+        return (0);
+}
+
+static int
+am335x_syscons_puts(video_adapter_t *adp, vm_offset_t off, u_int16_t *s, int len)
+{
+	int i;
+
+	for (i = 0; i < len; i++) 
+		am335x_syscons_putc(adp, off + i, s[i] & 0xff, (s[i] & 0xff00) >> 8);
+
+	return (0);
+}
+
+static int
+am335x_syscons_putm(video_adapter_t *adp, int x, int y, uint8_t *pixel_image,
+    uint32_t pixel_mask, int size, int width)
+{
+
+	return (0);
+}
+
+/* Initialization function */
+int am335x_lcd_syscons_setup(vm_offset_t vaddr, vm_paddr_t paddr,
+    struct panel_info *panel)
+{
+	struct video_adapter_softc *va_sc = &va_softc;
+
+	va_sc->fb_addr = vaddr;
+	va_sc->fb_paddr = paddr;
+	va_sc->depth = panel->bpp;
+	va_sc->stride = panel->bpp*panel->panel_width/8;
+
+	va_sc->width = panel->panel_width;
+	va_sc->height = panel->panel_height;
+	va_sc->fb_size = va_sc->width * va_sc->height
+	    * va_sc->depth/8;
+	am335x_syscons_update_margins(&va_sc->va);
+
+	return (0);
+}
+
+/*
+ * Define a stub keyboard driver in case one hasn't been
+ * compiled into the kernel
+ */
+#include <sys/kbio.h>
+#include <dev/kbd/kbdreg.h>
+
+static int dummy_kbd_configure(int flags);
+
+keyboard_switch_t am335x_dummysw;
+
+static int
+dummy_kbd_configure(int flags)
+{
+
+	return (0);
+}
+KEYBOARD_DRIVER(am335x_dummy, am335x_dummysw, dummy_kbd_configure);
diff --git a/sys/arm/ti/am335x/files.am335x b/sys/arm/ti/am335x/files.am335x
index a5b0c7e..a275341 100644
--- a/sys/arm/ti/am335x/files.am335x
+++ b/sys/arm/ti/am335x/files.am335x
@@ -4,6 +4,8 @@ arm/ti/aintc.c				standard
 arm/ti/am335x/am335x_prcm.c		standard
 arm/ti/am335x/am335x_dmtimer.c		standard
 arm/ti/am335x/am335x_scm_padconf.c	standard
+arm/ti/am335x/am335x_lcd.c		optional	sc	
+arm/ti/am335x/am335x_lcd_syscons.c	optional	sc
 arm/ti/am335x/am335x_pwm.c		standard	
 arm/ti/ti_edma3.c			standard
 arm/ti/ti_mmchs.c			optional	mmc