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

Commit 9c70e227 authored by Valentin Longchamp's avatar Valentin Longchamp Committed by Sascha Hauer
Browse files

mx31: add camera device 



This adds the camera device based on Guennadi's soc_camera architecture
for the mx31.

The proposed init by Guennadi was removed and must be implemented in the
board init file as it contains a lot of board specific info (memory
size, clock speed).

Signed-off-by: default avatarValentin Longchamp <valentin.longchamp@epfl.ch>
Reviewed-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 03c13ecc

arch/arm/mach-mx3/devices.c

+21 −1
Original line number Diff line number Diff line
@@ -22,10 +22,12 @@ 
#include <linux/platform_device.h>

#include <linux/serial.h>

#include <linux/gpio.h>

#include <linux/dma-mapping.h>

#include <mach/hardware.h>

#include <mach/irqs.h>

#include <mach/common.h>

#include <mach/imx-uart.h>

#include <mach/mx3_camera.h>



#include "devices.h"
@@ -346,7 +348,25 @@ struct platform_device mx3_fb = { 
	.num_resources	= ARRAY_SIZE(fb_resources),

	.resource	= fb_resources,

	.dev		= {

		.coherent_dma_mask = 0xffffffff,

		.coherent_dma_mask = DMA_BIT_MASK(32),

       },

};



static struct resource camera_resources[] = {

	{

		.start	= IPU_CTRL_BASE_ADDR + 0x60,

		.end	= IPU_CTRL_BASE_ADDR + 0x87,

		.flags	= IORESOURCE_MEM,

	},

};



struct platform_device mx3_camera = {

	.name		= "mx3-camera",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(camera_resources),

	.resource	= camera_resources,

	.dev		= {

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

};

arch/arm/mach-mx3/devices.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ extern struct platform_device mxc_i2c_device1; 
extern struct platform_device mxc_i2c_device2;

extern struct platform_device mx3_ipu;

extern struct platform_device mx3_fb;

extern struct platform_device mx3_camera;

extern struct platform_device mxc_fec_device;

extern struct platform_device mxcsdhc_device0;

extern struct platform_device mxcsdhc_device1;