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

Commit 3ab3a350 authored by Gaëtan Carlier's avatar Gaëtan Carlier Committed by Sascha Hauer
Browse files

ARM : i.MX27 : split code for allocation of ressources of camera and eMMA 



This is to prepare addition of m2m-emmapp driver otherwise
IMX_HAVE_PLATFORM_MX2_CAMERA must be declared even if only Post-Processor is
needed.

IMX_HAVE_PLATFORM_MX2_EMMA define has been added.

Changes since v1:
 - Add "select IMX_HAVE_PLATFORM_MX2_EMMA" for MACH_IMX27_VISSTRIM_M10 platform
   due to pending patch in linux-media tree that will call
   imx27_add_mx2_emmaprp().

Signed-off-by: default avatarGaëtan Carlier <gcembed@gmail.com>
Acked-by: default avatarJavier Martin <javier.martin@vista-silicon.com>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 89a41503

arch/arm/mach-imx/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -394,6 +394,7 @@ config MACH_IMX27_VISSTRIM_M10 
	select IMX_HAVE_PLATFORM_IMX_SSI

	select IMX_HAVE_PLATFORM_IMX_UART

	select IMX_HAVE_PLATFORM_MX2_CAMERA

	select IMX_HAVE_PLATFORM_MX2_EMMA

	select IMX_HAVE_PLATFORM_MXC_EHCI

	select IMX_HAVE_PLATFORM_MXC_MMC

	select LEDS_GPIO_REGISTER

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

+3 −1
Original line number Diff line number Diff line
@@ -53,8 +53,10 @@ 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)



extern const struct imx_mx2_emma_data imx27_mx2_emmaprp_data;

#define imx27_add_mx2_emmaprp()	\

	imx_add_mx2_emmaprp(&imx27_mx2_camera_data)

	imx_add_mx2_emmaprp(&imx27_mx2_emmaprp_data)



extern const struct imx_mxc_ehci_data imx27_mxc_ehci_otg_data;

#define imx27_add_mxc_ehci_otg(pdata)	\

arch/arm/mach-imx/devices/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ config IMX_HAVE_PLATFORM_MX1_CAMERA 
config IMX_HAVE_PLATFORM_MX2_CAMERA

	bool



config IMX_HAVE_PLATFORM_MX2_EMMA

	bool



config IMX_HAVE_PLATFORM_MXC_EHCI

	bool

arch/arm/mach-imx/devices/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,3 +30,4 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_W1) += platform-mxc_w1.o 
obj-$(CONFIG_IMX_HAVE_PLATFORM_SDHCI_ESDHC_IMX) += platform-sdhci-esdhc-imx.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_SPI_IMX) +=  platform-spi_imx.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_AHCI) +=  platform-ahci-imx.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_EMMA) += platform-mx2-emma.o

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

+8 −1
Original line number Diff line number Diff line
@@ -232,8 +232,15 @@ 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 imx_mx2_emma_data {

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;

};

struct platform_device *__init imx_add_mx2_emmaprp(

		const struct imx_mx2_camera_data *data);

		const struct imx_mx2_emma_data *data);



#include <linux/platform_data/usb-ehci-mxc.h>

struct imx_mxc_ehci_data {