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

Commit c21d2319 authored by Linus Walleij's avatar Linus Walleij
Browse files

mach-u300: retire AVE device 



We need to face the fact that there will never be a mainlined
driver for the U300 advanced video encoder, so let's just
drop the declaration of this device.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 711e2deb

arch/arm/mach-u300/core.c

+0 −54
Original line number Diff line number Diff line
@@ -342,51 +342,6 @@ static struct resource wdog_resources[] = { 
	}

};



/* TODO: These should be protected by suitable #ifdef's */

static struct resource ave_resources[] = {

	{

		.name  = "AVE3e I/O Area",

		.start = U300_VIDEOENC_BASE,

		.end   = U300_VIDEOENC_BASE + SZ_512K - 1,

		.flags = IORESOURCE_MEM,

	},

	{

		.name  = "AVE3e IRQ0",

		.start = IRQ_U300_VIDEO_ENC_0,

		.end   = IRQ_U300_VIDEO_ENC_0,

		.flags = IORESOURCE_IRQ,

	},

	{

		.name  = "AVE3e IRQ1",

		.start = IRQ_U300_VIDEO_ENC_1,

		.end   = IRQ_U300_VIDEO_ENC_1,

		.flags = IORESOURCE_IRQ,

	},

	{

		.name  = "AVE3e Physmem Area",

		.start = 0, /* 0 will be remapped to reserved memory */

		.end   = SZ_1M - 1,

		.flags = IORESOURCE_MEM,

	},

	/*

	 * The AVE3e requires two regions of 256MB that it considers

	 * "invisible". The hardware will not be able to access these

	 * addresses, so they should never point to system RAM.

	 */

	{

		.name  = "AVE3e Reserved 0",

		.start = 0xd0000000,

		.end   = 0xd0000000 + SZ_256M - 1,

		.flags = IORESOURCE_MEM,

	},

	{

		.name  = "AVE3e Reserved 1",

		.start = 0xe0000000,

		.end   = 0xe0000000 + SZ_256M - 1,

		.flags = IORESOURCE_MEM,

	},

};



static struct resource dma_resource[] = {

	{

		.start = U300_DMAC_BASE,
@@ -1593,13 +1548,6 @@ static struct platform_device nand_device = { 
	},

};



static struct platform_device ave_device = {

	.name = "video_enc",

	.id = -1,

	.num_resources = ARRAY_SIZE(ave_resources),

	.resource = ave_resources,

};



static struct platform_device dma_device = {

	.name		= "coh901318",

	.id		= -1,
@@ -1624,10 +1572,8 @@ static struct platform_device *platform_devs[] __initdata = { 
	&gpio_device,

	&nand_device,

	&wdog_device,

	&ave_device

};





/*

 * Interrupts: the U300 platforms have two pl190 ARM PrimeCells connected

 * together so some interrupts are connected to the first one and some