ARM: i.MX: Remove i.MX1 camera support
Subsystems (3)
PATCH 1/1 ARM: i.MX: Remove i.MX1 camera support
i.MX1 camera driver has been removed by the commit 90b055898e. This patch removes remaining support files for this camera.
Signed-off-by Alexander Shiyan <[email protected]>
--- arch/arm/mach-imx/Makefile | 3 -- arch/arm/mach-imx/devices/Kconfig | 3 -- arch/arm/mach-imx/devices/Makefile | 1 - arch/arm/mach-imx/devices/devices-common.h | 10 ------ arch/arm/mach-imx/devices/platform-mx1-camera.c | 42 ------------------------- arch/arm/mach-imx/mx1-camera-fiq-ksym.c | 18 ----------- arch/arm/mach-imx/mx1-camera-fiq.S | 35 --------------------- include/linux/platform_data/camera-mx1.h | 35 --------------------- 8 files changed, 147 deletions(-) delete mode 100644 arch/arm/mach-imx/devices/platform-mx1-camera.c delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq-ksym.c delete mode 100644 arch/arm/mach-imx/mx1-camera-fiq.S delete mode 100644 include/linux/platform_data/camera-mx1.h
arch/arm/mach-imx/Makefile +0 -3
@@ -39,9 +39,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
@@ -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
@@ -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
@@ -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 deleted +0 -42
42 lines not on this page · raw message
arch/arm/mach-imx/mx1-camera-fiq-ksym.c deleted +0 -18
@@ -1,18 +0,0 @@ -/* -* Exported ksyms of ARCH_MX1 -* -* Copyright (C) 2008, Darius Augulis <[email protected]> -* -* 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 <linux/platform_device.h> -#include <linux/module.h> - -#include <linux/platform_data/camera-mx1.h> - -/* IMX camera FIQ handler */ -EXPORT_SYMBOL (mx1_camera_sof_fiq_start); -EXPORT_SYMBOL (mx1_camera_sof_fiq_end);
arch/arm/mach-imx/mx1-camera-fiq.S deleted +0 -35
@@ -1,35 +0,0 @@ -/* - * Copyright (C) 2008 Paulius Zaleckas <[email protected]> - * - * Based on linux/arch/arm/lib/floppydma.S - * Copyright (C) 1995, 1996 Russell King - * - * 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 <linux/linkage.h> -#include <asm/assembler.h> - - .text - .global mx1_camera_sof_fiq_end - .global mx1_camera_sof_fiq_start -mx1_camera_sof_fiq_start: - @ enable dma - ldr r12, [r9] - orr r12, r12, #0x00000001 - str r12, [r9] - @ unmask DMA interrupt - ldr r12, [r8] - bic r12, r12, r13 - str r12, [r8] - @ disable SOF interrupt - ldr r12, [r10] - bic r12, r12, #0x00010000 - str r12, [r10] - @ clear SOF flag - mov r12, #0x00010000 - str r12, [r11] - @ return from FIQ - subs pc, lr, #4 -mx1_camera_sof_fiq_end:
include/linux/platform_data/camera-mx1.h deleted +0 -35
@@ -1,35 +0,0 @@ -/* -* mx1_camera.h - i.MX1/i.MXL camera driver header file -* -* Copyright (c) 2008, Paulius Zaleckas <[email protected]> -* Copyright (C) 2009, Darius Augulis <[email protected]> -* -* Based on PXA camera.h file: -* Copyright (C) 2003, Intel Corporation -* Copyright (C) 2008, Guennadi Liakhovetski <[email protected]> -* -* 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. -*/ - -#ifndef __ASM_ARCH_CAMERA_H_ -#define __ASM_ARCH_CAMERA_H_ - -#define MX1_CAMERA_DATA_HIGH 1 -#define MX1_CAMERA_PCLK_RISING 2 -#define MX1_CAMERA_VSYNC_HIGH 4 - -extern unsigned char mx1_camera_sof_fiq_start, mx1_camera_sof_fiq_end; - -/** -* struct mx1_camera_pdata - i.MX1/i.MXL camera platform data -* @mclk_10khz: master clock frequency in 10kHz units -* @flags: MX1 camera platform flags -*/ -struct mx1_camera_pdata { -unsigned long mclk_10khz; -unsigned long flags; -}; - -#endif /* __ASM_ARCH_CAMERA_H_ */
Signature · 1 line
1.8.5.5
Shawn Guo
AppliedPATCH 1/1 ARM: i.MX: Remove i.MX1 camera support
Quoted 4 lines · Alexander Shiyan
i.MX1 camera driver has been removed by the commit
90b055898e. This patch removes remaining support files for this camera.Signed-off-by Alexander Shiyan <[email protected]>
Applied, thanks.