Skip to content

Commit

Permalink
arm/imx21: Framebuffer support for i.MX21
Browse files Browse the repository at this point in the history
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: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
  • Loading branch information
Holger Schurig authored and Sascha Hauer committed Mar 13, 2009
1 parent aa3b0a6 commit e481355
Show file tree
Hide file tree
Showing 4 changed files with 35 additions and 2 deletions.
33 changes: 33 additions & 0 deletions arch/arm/mach-mx2/devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -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] = {
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-mx2/devices.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

extern struct platform_device mxc_gpt1;
extern struct platform_device mxc_gpt2;
extern struct platform_device mxc_gpt3;
Expand All @@ -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;
File renamed without changes.
2 changes: 1 addition & 1 deletion drivers/video/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e481355

Please sign in to comment.