Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca489f8e authored by Valentin Longchamp's avatar Valentin Longchamp Committed by Sascha Hauer
Browse files

mx31: add dma and fb devices 



This adds the dma (ipu_dma) and fb devices for the mx31 for which drivers now are
available.

v2: merge the ipu and fb device in the same patch as suggested by Sascha

Signed-off-by: default avatarValentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent e00f0b4a

arch/arm/mach-mx3/devices.c

+48 −0
Original line number Diff line number Diff line
@@ -242,3 +242,51 @@ struct platform_device mxc_i2c_device2 = { 
	.num_resources = ARRAY_SIZE(mxc_i2c2_resources),

	.resource = mxc_i2c2_resources,

};



/* i.MX31 Image Processing Unit */



/* The resource order is important! */

static struct resource mx3_ipu_rsrc[] = {

	{

		.start = IPU_CTRL_BASE_ADDR,

		.end = IPU_CTRL_BASE_ADDR + 0x5F,

		.flags = IORESOURCE_MEM,

	}, {

		.start = IPU_CTRL_BASE_ADDR + 0x88,

		.end = IPU_CTRL_BASE_ADDR + 0xB3,

		.flags = IORESOURCE_MEM,

	}, {

		.start = MXC_INT_IPU_SYN,

		.end = MXC_INT_IPU_SYN,

		.flags = IORESOURCE_IRQ,

	}, {

		.start = MXC_INT_IPU_ERR,

		.end = MXC_INT_IPU_ERR,

		.flags = IORESOURCE_IRQ,

	},

};



struct platform_device mx3_ipu = {

	.name = "ipu-core",

	.id = -1,

	.num_resources = ARRAY_SIZE(mx3_ipu_rsrc),

	.resource = mx3_ipu_rsrc,

};



static struct resource fb_resources[] = {

	{

		.start	= IPU_CTRL_BASE_ADDR + 0xB4,

		.end	= IPU_CTRL_BASE_ADDR + 0x1BF,

		.flags	= IORESOURCE_MEM,

	},

};



struct platform_device mx3_fb = {

	.name		= "mx3_sdc_fb",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(fb_resources),

	.resource	= fb_resources,

	.dev		= {

		.coherent_dma_mask = 0xffffffff,

       },

};

arch/arm/mach-mx3/devices.h

+2 −0
Original line number Diff line number Diff line
@@ -9,3 +9,5 @@ extern struct platform_device mxc_nand_device; 
extern struct platform_device mxc_i2c_device0;

extern struct platform_device mxc_i2c_device1;

extern struct platform_device mxc_i2c_device2;

extern struct platform_device mx3_ipu;

extern struct platform_device mx3_fb;

arch/arm/mach-mx3/mx31moboard.c

+0 −1
Original line number Diff line number Diff line
@@ -101,7 +101,6 @@ static void __init mxc_board_init(void) 
	default:

		printk(KERN_ERR "Illegal mx31moboard_baseboard type %d\n", mx31moboard_baseboard);

	}



}



/*