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

Commit 52f1a845 authored by Javier Martin's avatar Javier Martin Committed by Mauro Carvalho Chehab
Browse files

[media] MX2: Add platform definitions for eMMa-PrP device 



eMMa-PrP device included in Freescale i.MX2 chips can also
be used separately to process memory buffers. This patch
provides arch glue code for the driver which provides this
functionality.

Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarJavier Martin <javier.martin@vista-silicon.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8091cb7d

arch/arm/mach-imx/clock-imx27.c

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK(NULL, "dma", dma_clk)

	_REGISTER_CLOCK(NULL, "rtic", rtic_clk)

	_REGISTER_CLOCK(NULL, "brom", brom_clk)

	_REGISTER_CLOCK(NULL, "emma", emma_clk)

	_REGISTER_CLOCK("m2m-emmaprp.0", NULL, emma_clk)

	_REGISTER_CLOCK(NULL, "slcdc", slcdc_clk)

	_REGISTER_CLOCK("imx27-fec.0", NULL, fec_clk)

	_REGISTER_CLOCK(NULL, "emi", emi_clk)

arch/arm/mach-imx/devices-imx27.h

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ extern const struct imx_imx_uart_1irq_data imx27_imx_uart_data[]; 
extern const struct imx_mx2_camera_data imx27_mx2_camera_data;

#define imx27_add_mx2_camera(pdata)	\

	imx_add_mx2_camera(&imx27_mx2_camera_data, pdata)

#define imx27_add_mx2_emmaprp(pdata)	\

	imx_add_mx2_emmaprp(&imx27_mx2_camera_data)



extern const struct imx_mxc_ehci_data imx27_mxc_ehci_otg_data;

#define imx27_add_mxc_ehci_otg(pdata)	\

arch/arm/plat-mxc/devices/platform-mx2-camera.c

+18 −0
Original line number Diff line number Diff line
@@ -62,3 +62,21 @@ struct platform_device *__init imx_add_mx2_camera( 
			res, data->iobaseemmaprp ? 4 : 2,

			pdata, sizeof(*pdata), DMA_BIT_MASK(32));

}



struct platform_device *__init imx_add_mx2_emmaprp(

		const struct imx_mx2_camera_data *data)

{

	struct resource res[] = {

		{

			.start = data->iobaseemmaprp,

			.end = data->iobaseemmaprp + data->iosizeemmaprp - 1,

			.flags = IORESOURCE_MEM,

		}, {

			.start = data->irqemmaprp,

			.end = data->irqemmaprp,

			.flags = IORESOURCE_IRQ,

		},

	};

	return imx_add_platform_device_dmamask("m2m-emmaprp", 0,

			res, 2, NULL, 0, DMA_BIT_MASK(32));

}

arch/arm/plat-mxc/include/mach/devices-common.h

+2 −0
Original line number Diff line number Diff line
@@ -223,6 +223,8 @@ struct imx_mx2_camera_data { 
struct platform_device *__init imx_add_mx2_camera(

		const struct imx_mx2_camera_data *data,

		const struct mx2_camera_platform_data *pdata);

struct platform_device *__init imx_add_mx2_emmaprp(

		const struct imx_mx2_camera_data *data);



#include <mach/mxc_ehci.h>

struct imx_mxc_ehci_data {