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

Commit 35e3bc53 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Shawn Guo
Browse files

ARM: i.MX: Remove i.MX1 camera support 



i.MX1 camera driver has been removed by the commit 90b05589.
This patch removes remaining support files for this camera.

Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent d3a22442

arch/arm/mach-imx/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ obj-y += ssi-fiq.o 
obj-y += ssi-fiq-ksym.o

endif



# Support for CMOS sensor interface

obj-$(CONFIG_MX1_VIDEO) += mx1-camera-fiq.o mx1-camera-fiq-ksym.o



# i.MX1 based machines

obj-$(CONFIG_ARCH_MX1ADS) += mach-mx1ads.o

obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o

arch/arm/mach-imx/devices/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ config IMX_HAVE_PLATFORM_IMX_UART 
config IMX_HAVE_PLATFORM_IPU_CORE

	bool



config IMX_HAVE_PLATFORM_MX1_CAMERA

	bool



config IMX_HAVE_PLATFORM_MX2_CAMERA

	bool

arch/arm/mach-imx/devices/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ obj-$(CONFIG_IMX_HAVE_PLATFORM_PATA_IMX) += platform-pata_imx.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_IPU_CORE) += platform-ipu-core.o

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

obj-$(CONFIG_IMX_HAVE_PLATFORM_MX2_CAMERA) += platform-mx2-camera.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_EHCI) += platform-mxc-ehci.o

obj-$(CONFIG_IMX_HAVE_PLATFORM_MXC_MMC) += platform-mxc-mmc.o

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

+0 −10
Original line number Diff line number Diff line
@@ -192,16 +192,6 @@ struct platform_device *__init imx_add_mx3_sdc_fb( 
		const struct imx_ipu_core_data *data,

		struct mx3fb_platform_data *pdata);



#include <linux/platform_data/camera-mx1.h>

struct imx_mx1_camera_data {

	resource_size_t iobase;

	resource_size_t iosize;

	resource_size_t irq;

};

struct platform_device *__init imx_add_mx1_camera(

		const struct imx_mx1_camera_data *data,

		const struct mx1_camera_pdata *pdata);



#include <linux/platform_data/camera-mx2.h>

struct imx_mx2_camera_data {

	const char *devid;

arch/arm/mach-imx/devices/platform-mx1-camera.c

deleted100644 → 0
+0 −42
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 "../hardware.h"

#include "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));

}