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

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

ARM: imx: dynamically allocate mx1-camera device 



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

arch/arm/mach-imx/devices.c

+0 −25
Original line number Diff line number Diff line
@@ -45,31 +45,6 @@ 
#include "devices.h"



#if defined(CONFIG_ARCH_MX1)

static struct resource imx1_camera_resources[] = {

	{

		.start  = 0x00224000,

		.end    = 0x00224010,

		.flags  = IORESOURCE_MEM,

	}, {

		.start  = MX1_CSI_INT,

		.end    = MX1_CSI_INT,

		.flags  = IORESOURCE_IRQ,

	},

};



static u64 imx1_camera_dmamask = DMA_BIT_MASK(32);



struct platform_device imx1_camera_device = {

	.name           = "mx1-camera",

	.id             = 0, /* This is used to put cameras on this interface */

	.dev		= {

		.dma_mask = &imx1_camera_dmamask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

	.resource       = imx1_camera_resources,

	.num_resources  = ARRAY_SIZE(imx1_camera_resources),

};



/* GPIO port description */

static struct mxc_gpio_port imx_gpio_ports[] = {

	{

arch/arm/mach-imx/devices.h

+0 −4
Original line number Diff line number Diff line 
#ifdef CONFIG_ARCH_MX1

extern struct platform_device imx1_camera_device;

#endif



#if defined(CONFIG_MACH_MX21) || defined(CONFIG_MACH_MX27)

extern struct platform_device mxc_wdt;

extern struct platform_device mxc_fb_device;

arch/arm/plat-mxc/devices/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ config IMX_HAVE_PLATFORM_IMX_UART 
config IMX_HAVE_PLATFORM_IMX_UDC

	bool



config IMX_HAVE_PLATFORM_MX1_CAMERA

	bool



config IMX_HAVE_PLATFORM_MXC_NAND

	bool

arch/arm/plat-mxc/devices/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_I2C) += platform-imx-i2c.o 
obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_SSI) += platform-imx-ssi.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UART) += platform-imx-uart.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_IMX_UDC) += platform-imx_udc.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MX1_CAMERA) += platform-mx1-camera.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_NAND) += platform-mxc_nand.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_W1) += platform-mxc_w1.o

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

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

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2010 Pengutronix

 * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>

 *

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

 * the terms of the GNU General Public License version 2 as published by the

 * Free Software Foundation.

 */

#include <mach/hardware.h>

#include <mach/devices-common.h>



#define imx_mx1_camera_data_entry_single(soc, _size)			\

	{								\

		.iobase = soc ## _CSI ## _BASE_ADDR,			\

		.iosize = _size,					\

		.irq = soc ## _INT_CSI,					\

	}



#ifdef CONFIG_SOC_IMX1

const struct imx_mx1_camera_data imx1_mx1_camera_data __initconst =

	imx_mx1_camera_data_entry_single(MX1, 10);

#endif /* ifdef CONFIG_SOC_IMX1 */



struct platform_device *__init imx_add_mx1_camera(

		const struct imx_mx1_camera_data *data,

		const struct mx1_camera_pdata *pdata)

{

	struct resource res[] = {

		{

			.start = data->iobase,

			.end = data->iobase + data->iosize - 1,

			.flags = IORESOURCE_MEM,

		}, {

			.start = data->irq,

			.end = data->irq,

			.flags = IORESOURCE_IRQ,

		},

	};

	return imx_add_platform_device_dmamask("mx1-camera", 0,

			res, ARRAY_SIZE(res),

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

}