Commit e4813551 authored by Holger Schurig's avatar Holger Schurig Committed by Sascha Hauer
Browse files

arm/imx21: Framebuffer support for i.MX21 



This patch mimicks what Martin wrote on the mailing list:

* move arch/arm/mach-imx/include/mach/imxfb.h into
  arch/arm/mach-mxc/include/mach/imxfb.h
* changes Kconfig so that CONFIG_FB_IMX is selectable
* adds a platform device (copied from some pengutronix
  patches)

Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent aa3b0a6f

arch/arm/mach-mx2/devices.c

+33 −0
Original line number Diff line number Diff line
@@ -228,6 +228,39 @@ struct platform_device mxc_nand_device = { 
	.resource = mxc_nand_resources,

};



#ifdef CONFIG_FB_IMX

/*

 * lcdc:

 * - i.MX1: the basic controller

 * - i.MX21: to be checked

 * - i.MX27: like i.MX1, with slightly variations

 */

static struct resource mxc_fb[] = {

	{

		.start = LCDC_BASE_ADDR,

		.end   = LCDC_BASE_ADDR + 0xFFF,

		.flags = IORESOURCE_MEM,

	},

	{

		.start = MXC_INT_LCDC,

		.end   = MXC_INT_LCDC,

		.flags = IORESOURCE_IRQ,

	}

};



/* mxc lcd driver */

struct platform_device mxc_fb_device = {

	.name = "imx-fb",

	.id = 0,

	.num_resources = ARRAY_SIZE(mxc_fb),

	.resource = mxc_fb,

	.dev = {

		.coherent_dma_mask = 0xFFFFFFFF,

	},

};



#endif



/* GPIO port description */

static struct mxc_gpio_port imx_gpio_ports[] = {

	[0] = {

arch/arm/mach-mx2/devices.h

+1 −1
Original line number Diff line number Diff line 


extern struct platform_device mxc_gpt1;

extern struct platform_device mxc_gpt2;

extern struct platform_device mxc_gpt3;
@@ -14,3 +13,4 @@ extern struct platform_device mxc_uart_device4; 
extern struct platform_device mxc_uart_device5;

extern struct platform_device mxc_w1_master_device;

extern struct platform_device mxc_nand_device;

extern struct platform_device mxc_fb_device;

drivers/video/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ config FB_SA1100 


config FB_IMX

	tristate "Motorola i.MX LCD support"

	depends on FB && ARM && ARCH_IMX

	depends on FB && (ARCH_IMX || ARCH_MX2)

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT