Commit bb4c853f authored by Uwe Kleine-König's avatar Uwe Kleine-König
Browse files

ARM: mx25: dynamically allocate mx2-camera devices 



Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
parent 00871505

arch/arm/mach-mx25/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y				:= mm.o devices.o

obj-y				:= mm.o

obj-$(CONFIG_ARCH_MX25)		+= clock.o

obj-$(CONFIG_MACH_MX25_3DS)	+= mach-mx25_3ds.o

obj-$(CONFIG_MACH_EUKREA_CPUIMX25)		+= mach-cpuimx25.o

arch/arm/mach-mx25/devices-imx25.h

+4 −0
Original line number Diff line number Diff line
@@ -59,6 +59,10 @@ extern const struct imx_imx_uart_1irq_data imx25_imx_uart_data[] __initconst; 
#define imx25_add_imx_uart3(pdata)	imx25_add_imx_uart(3, pdata)

#define imx25_add_imx_uart4(pdata)	imx25_add_imx_uart(4, pdata)



extern const struct imx_mx2_camera_data imx25_mx2_camera_data __initconst;

#define imx25_add_mx2_camera(pdata)	\

	imx_add_mx2_camera(&imx25_mx2_camera_data, pdata)



extern const struct imx_mxc_ehci_data imx25_mxc_ehci_otg_data __initconst;

#define imx25_add_mxc_ehci_otg(pdata)	\

	imx_add_mxc_ehci(&imx25_mxc_ehci_otg_data, pdata)

arch/arm/mach-mx25/devices.c

deleted100644 → 0
+0 −45
Original line number Diff line number Diff line 
/*

 * Copyright 2009 Sascha Hauer, <kernel@pengutronix.de>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version 2

 * of the License, or (at your option) any later version.

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor,

 * Boston, MA  02110-1301, USA.

 */



#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/gpio.h>

#include <mach/mx25.h>

#include <mach/irqs.h>



static struct resource mx25_csi_resources[] = {

	{

		.start	= MX25_CSI_BASE_ADDR,

		.end	= MX25_CSI_BASE_ADDR + 0xfff,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= MX25_INT_CSI,

		.flags	= IORESOURCE_IRQ

	},

};



struct platform_device mx25_csi_device = {

	.name	= "mx2-camera",

	.id	= 0,

	.num_resources	= ARRAY_SIZE(mx25_csi_resources),

	.resource	= mx25_csi_resources,

	.dev		= {

		.coherent_dma_mask = 0xffffffff,

	},

};

arch/arm/mach-mx25/devices.h

+0 −1
Original line number Diff line number Diff line 
extern struct platform_device mx25_csi_device;

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

+17 −6
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ 
#include <mach/devices-common.h>



#define imx_mx2_camera_data_entry_single(soc)				\

	{								\

		.iobasecsi = soc ## _CSI_BASE_ADDR,			\

		.iosizecsi = SZ_4K,					\

		.irqcsi = soc ## _INT_CSI,				\

	}

#define imx_mx2_camera_data_entry_single_emma(soc)			\

	{								\

		.iobasecsi = soc ## _CSI_BASE_ADDR,			\

		.iosizecsi = SZ_32,					\
@@ -19,9 +25,14 @@ 
		.irqemmaprp = soc ## _INT_EMMAPRP,			\

	}



#ifdef CONFIG_SOC_IMX25

const struct imx_mx2_camera_data imx25_mx2_camera_data __initconst =

	imx_mx2_camera_data_entry_single(MX25);

#endif /* ifdef CONFIG_SOC_IMX25 */



#ifdef CONFIG_SOC_IMX27

const struct imx_mx2_camera_data imx27_mx2_camera_data __initconst =

	imx_mx2_camera_data_entry_single(MX27);

	imx_mx2_camera_data_entry_single_emma(MX27);

#endif /* ifdef CONFIG_SOC_IMX27 */



struct platform_device *__init imx_add_mx2_camera(
@@ -33,14 +44,14 @@ struct platform_device *__init imx_add_mx2_camera( 
			.start = data->iobasecsi,

			.end = data->iobasecsi + data->iosizecsi - 1,

			.flags = IORESOURCE_MEM,

		}, {

			.start = data->iobaseemmaprp,

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

			.flags = IORESOURCE_MEM,

		}, {

			.start = data->irqcsi,

			.end = data->irqcsi,

			.flags = IORESOURCE_IRQ,

		}, {

			.start = data->iobaseemmaprp,

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

			.flags = IORESOURCE_MEM,

		}, {

			.start = data->irqemmaprp,

			.end = data->irqemmaprp,
@@ -48,6 +59,6 @@ struct platform_device *__init imx_add_mx2_camera( 
		},

	};

	return imx_add_platform_device_dmamask("mx2-camera", 0,

			res, ARRAY_SIZE(res),

			res, data->iobaseemmaprp ? 4 : 2,

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

}