U8500 MMIO,CameraFlash: Remove duplicate headers

Remove duplicate header files exist in mmio and
camera flash staging drivers which already exists
in include/linux.

ST-Ericsson ID: NA
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial

Signed-off-by: Pankaj Sen <pankaj.sen@stericsson.com>
Change-Id: I912dad16aadd56d2277526ca168cf11bf7b13524
Change-Id: I952eaef158634be3f1f408a78f79f690f4b00426
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32255
Reviewed-by: Vishal JAIN STE <v.jain@stericsson.com>
Tested-by: Vishal JAIN STE <v.jain@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>

6 files changed, 2 insertions, 254 deletions

diff --git a/drivers/staging/camera_flash/adp1653.c b/drivers/staging/camera_flash/adp1653.c
index 8264e46a1f2..b3ff662037f 100644
--- a/drivers/staging/camera_flash/adp1653.c
+++ b/drivers/staging/camera_flash/adp1653.c
@@ -16,7 +16,6 @@
 #include <asm/mach-types.h>
 #include "flash_common.h"
 #include "adp1653.h"
-#include "camera_flash.h"
 
 /* This data is platform specific for 8500 href-v1 platform,
  * Ideally this should be supplied from platform code
diff --git a/drivers/staging/camera_flash/camera_flash.h b/drivers/staging/camera_flash/camera_flash.h
deleted file mode 100644
index 15faf706dc9..00000000000
--- a/drivers/staging/camera_flash/camera_flash.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef __CAMERA_FLASH_H__
-#define __CAMERA_FLASH_H__
-
-#define FLASH_NAME_SIZE	(20)
-
-struct flash_mode_details {
-	unsigned long led_type;
-	unsigned long max_intensity_uAmp;
-	unsigned long min_intensity_uAmp;
-	unsigned long max_strobe_duration_uSecs;
-	unsigned long feature_bitmap;
-	unsigned char nbFaultRegisters;
-};
-
-/*feature_bitmap (in struct flash_mode_details) bit values*/
-#define INTENSITY_PROGRAMMABLE (0x01)
-#define DURATION_PROGRAMMABLE  (0x02)
-#define TIMEOUT_PROGRAMMABLE   (0x04)
-
-/*Status word returned by driver has status in lower 16 bits
- *and Error in higher 16 bits. definition of status and error
- *bits are there in flash_bitfields.h
- */
-#define SET_FLASH_STATUS(_bitmap, _status) (_bitmap |= (_status & 0xffff))
-#define CLR_FLASH_STATUS(_bitmap, _status) (_bitmap &= ~(_status & 0xffff))
-#define SET_FLASH_ERROR(_bitmap, _status) (_bitmap |= (_status << 16))
-#define CLR_FLASH_ERROR(_bitmap, _status) (_bitmap &= ~(_status << 16))
-#define GET_FLASH_STATUS(_bitmap) (_bitmap & 0xffff)
-#define GET_FLASH_ERROR(_bitmap) (_bitmap >> 16)
-
-struct flash_mode_params {
-	unsigned long duration_uSecs;
-	unsigned long intensity_uAmp;
-	unsigned long timeout_uSecs;
-};
-
-struct flash_ioctl_args_t {
-	unsigned long flash_mode;
-	unsigned long cam;
-	unsigned long status;
-	union mode_arg{
-		struct flash_mode_details details;
-		struct flash_mode_params  params;
-		unsigned long strobe_enable;
-	} mode_arg;
-};
-
-#define FLASH_MAGIC_NUMBER 0x17
-#define FLASH_GET_MODES			_IOR(FLASH_MAGIC_NUMBER, 1,\
-struct flash_ioctl_args_t *)
-#define FLASH_GET_MODE_DETAILS		_IOWR(FLASH_MAGIC_NUMBER, 2,\
-struct flash_ioctl_args_t *)
-#define FLASH_ENABLE_MODE		_IOW(FLASH_MAGIC_NUMBER, 3,\
-struct flash_ioctl_args_t *)
-#define FLASH_DISABLE_MODE		_IOW(FLASH_MAGIC_NUMBER, 4,\
-struct flash_ioctl_args_t *)
-#define FLASH_CONFIGURE_MODE		_IOW(FLASH_MAGIC_NUMBER, 5,\
-struct flash_ioctl_args_t *)
-#define FLASH_TRIGGER_STROBE		_IOW(FLASH_MAGIC_NUMBER, 6,\
-struct flash_ioctl_args_t *)
-#define FLASH_GET_STATUS		_IOW(FLASH_MAGIC_NUMBER, 7,\
-struct flash_ioctl_args_t *)
-#define FLASH_GET_LIFE_COUNTER		_IOW(FLASH_MAGIC_NUMBER, 8,\
-struct flash_ioctl_args_t *)
-#define FLASH_GET_SELF_TEST_MODES	_IOR(FLASH_MAGIC_NUMBER, 9,\
-struct flash_ioctl_args_t *)
-#define FLASH_SELF_TEST			_IOW(FLASH_MAGIC_NUMBER, 10,\
-struct flash_ioctl_args_t *)
-#define FLASH_GET_FAULT_REGISTERS	_IOR(FLASH_MAGIC_NUMBER, 11,\
-struct flash_ioctl_args_t *)
-#define FLASH_GET_SELF_TEST_RESULT	_IOR(FLASH_MAGIC_NUMBER, 12,\
-struct flash_ioctl_args_t *)
-
-#endif
diff --git a/drivers/staging/camera_flash/flash_common.c b/drivers/staging/camera_flash/flash_common.c
index fc59879a170..647bc2b5a0e 100644
--- a/drivers/staging/camera_flash/flash_common.c
+++ b/drivers/staging/camera_flash/flash_common.c
@@ -16,7 +16,6 @@
 #include <linux/kthread.h>
 #include <linux/jiffies.h>
 #include <linux/miscdevice.h>
-#include "camera_flash.h"
 #include "flash_common.h"
 
 #define DEBUG_LOG(...) printk(KERN_DEBUG "Camera Flash driver: " __VA_ARGS__)
diff --git a/drivers/staging/camera_flash/flash_common.h b/drivers/staging/camera_flash/flash_common.h
index d1f63631e82..5117e4229e9 100755
--- a/drivers/staging/camera_flash/flash_common.h
+++ b/drivers/staging/camera_flash/flash_common.h
@@ -2,7 +2,7 @@
 #define __FLASH_COMMON_H__
 
 #include "camera_flash_bitfields.h"
-#include "camera_flash.h"
+#include <linux/camera_flash.h>
 
 struct flash_chip_ops{
 	int (*get_modes)( void *priv_data, unsigned long *modes);
diff --git a/drivers/staging/mmio/mmio.h b/drivers/staging/mmio/mmio.h
deleted file mode 100644
index 1c6f68e3556..00000000000
--- a/drivers/staging/mmio/mmio.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2011
- *
- * Author: Joakim Axelsson <joakim.axelsson@stericsson.com> for ST-Ericsson
- * Author: Rajat Verma <rajat.verma@stericsson.com> for ST-Ericsson
- * License Terms: GNU General Public License v2
- */
-
-#ifndef MMIO_H
-#define MMIO_H
-
-#include <linux/ioctl.h>
-
-#define MMIO_NAME "mmio_camera"
-#define SRA_SUPPORT 1
-
-#ifdef SRA_SUPPORT
-#define SREG_16_BIT (0x1)
-#define SREG_32_BIT (0x2)
-#endif
-/* Kernel side interface for MMIO */
-/* Which camera is currently active */
-enum camera_slot_t {
-	PRIMARY_CAMERA = 0,
-	SECONDARY_CAMERA,
-	CAMERA_SLOT_END
-};
-struct mmio_gpio {
-	int gpio;	/* Set to zero if not in use */
-	int active_high;/* Set if pin is active high */
-	int udelay;	/* Time to wait when activating the pin, in usec */
-};
-enum mmio_select_i2c_t {
-	MMIO_ACTIVATE_IPI2C2 = 0,
-	MMIO_ACTIVATE_I2C_HOST,
-	MMIO_DEACTIVATE_I2C
-};
-
-enum mmio_select_xshutdown_t {
-	MMIO_ENABLE_XSHUTDOWN_FW = 0,
-	MMIO_ENABLE_XSHUTDOWN_HOST,
-	MMIO_DISABLE_XSHUTDOWN
-};
-struct mmio_platform_data {
-	struct device *dev;
-	enum camera_slot_t camera_slot; /* Which camera is currently used,
-					 * Primary/Secondary */
-	void *extra;			/* Board's private data structure
-					 * placeholder */
-	int reset_ipgpio[CAMERA_SLOT_END]; /* Contains logical IP GPIO for
-					    * reset pin */
-	int sia_base;
-	int cr_base;
-	int (*platform_init)(struct mmio_platform_data *pdata);
-	void (*platform_exit)(struct mmio_platform_data *pdata);
-	int (*power_enable)(struct mmio_platform_data *pdata);
-	void (*power_disable)(struct mmio_platform_data *pdata);
-	int (*config_xshutdown_pins)(struct mmio_platform_data *pdata,
-		enum mmio_select_xshutdown_t select, int is_active_high);
-	int (*config_i2c_pins)(struct mmio_platform_data *pdata,
-		enum mmio_select_i2c_t select);
-	int (*clock_enable)(struct mmio_platform_data *pdata);
-	void (*clock_disable)(struct mmio_platform_data *pdata);
-	void (*set_xshutdown)(struct mmio_platform_data *pdata);
-};
-
-#define USER_SIDE_INTERFACE 1
-/* User side is only allowed to access code in USER_SIDE_INTERFACE block */
-#ifdef USER_SIDE_INTERFACE
-enum mmio_bool_t {
-	MMIO_FALSE = 0,
-	MMIO_TRUE = !MMIO_FALSE,
-	MMIO_BOOL_MAX = 0x7FFFFFFF
-};
-
-struct xshutdown_info_t {
-	int ip_gpio;
-	int camera_function;
-};
-
-struct xp70_fw_t {
-	void __iomem *addr_sdram_ext;
-	void __iomem *addr_esram_ext;
-	void __iomem *addr_split;
-	void __iomem *addr_data;
-	unsigned int size_sdram_ext;
-	unsigned int size_esram_ext;
-	unsigned int size_split;
-	unsigned int size_data;
-};
-
-struct isp_write_t {
-	unsigned long t1_dest;
-	unsigned long *data;
-	unsigned long count;
-};
-
-struct trace_buf_t {
-	void *address;
-	unsigned int size;
-};
-
-#ifdef SRA_SUPPORT
-struct s_reg {
-	unsigned int addr;
-	unsigned int value;
-	unsigned int mask;
-};
-
-struct s_reg_list {
-	unsigned int access_mode;
-	unsigned int entries;
-	struct s_reg  *s_regs_p;
-};
-#endif
-struct mmio_input_output_t {
-	union {
-		enum mmio_bool_t	power_on;
-		struct xp70_fw_t	xp70_fw;
-		struct isp_write_t	isp_write;
-		unsigned int		addr_to_map;
-		struct xshutdown_info_t	xshutdown_info;
-		enum camera_slot_t	camera_slot;
-		struct trace_buf_t	trace_buf;
-#ifdef SRA_SUPPORT
-		struct s_reg_list s_reg_list;
-#endif
-	} mmio_arg;
-};
-
-#define MMIO_TRUE	(1)
-#define MMIO_FALSE	(0)
-#define MMIO_INVALID	(~0)
-
-/*Xshutdown from host takes two arguments*/
-#define MMIO_XSHUTDOWN_ENABLE			(0x1)
-#define MMIO_XSHUTDOWN_ACTIVE_HIGH		(0x2)
-
-#define MMIO_MAGIC_NUMBER 0x15
-
-#define MMIO_CAM_INITBOARD	_IOW(MMIO_MAGIC_NUMBER, 1,\
-struct mmio_input_output_t*)
-#define MMIO_CAM_PWR_SENSOR	_IOW(MMIO_MAGIC_NUMBER, 2,\
-struct mmio_input_output_t*)
-#define MMIO_CAM_SET_EXT_CLK	_IOW(MMIO_MAGIC_NUMBER, 3,\
-struct mmio_input_output_t*)
-#define MMIO_CAM_SET_PRI_HWIF	_IO(MMIO_MAGIC_NUMBER, 4)
-#define MMIO_CAM_SET_SEC_HWIF	_IO(MMIO_MAGIC_NUMBER, 5)
-#define MMIO_CAM_INITMMDSPTIMER	_IO(MMIO_MAGIC_NUMBER, 6)
-#define MMIO_CAM_LOAD_XP70_FW	_IOW(MMIO_MAGIC_NUMBER, 7,\
-struct mmio_input_output_t*)
-#define MMIO_CAM_MAP_STATS_AREA	_IOWR(MMIO_MAGIC_NUMBER, 8,\
-struct mmio_input_output_t*)
-#define MMIO_ACTIVATE_I2C2	_IOW(MMIO_MAGIC_NUMBER, 9, int*)
-#define MMIO_ENABLE_XSHUTDOWN_FROM_HOST _IOW(MMIO_MAGIC_NUMBER, 10, int*)
-#define MMIO_CAM_ISP_WRITE	_IOW(MMIO_MAGIC_NUMBER, 11,\
-struct mmio_input_output_t*)
-#define MMIO_CAM_GET_IP_GPIO	_IOWR(MMIO_MAGIC_NUMBER, 12,\
-struct mmio_input_output_t*)
-#define MMIO_CAM_DESINITBOARD	_IO(MMIO_MAGIC_NUMBER, 13)
-#define MMIO_CAM_SET_TRACE_BUFFER _IOW(MMIO_MAGIC_NUMBER, 14,\
-struct mmio_input_output_t*)
-
-#ifdef SRA_SUPPORT
-#define MMIO_CAM_READ_REGS	_IOWR(MMIO_MAGIC_NUMBER, 15,\
-struct mmio_input_output_t*)
-#define MMIO_CAM_MODIFY_REGS	_IOWR(MMIO_MAGIC_NUMBER, 16,\
-struct mmio_input_output_t*)
-#define MMIO_CAM_WRITE_REGS	_IOWR(MMIO_MAGIC_NUMBER, 17,\
-struct mmio_input_output_t*)
-#endif
-
-#endif /* USER_SIDE_INTERFACE */
-
-#endif
-/* MMIO_H */
diff --git a/drivers/staging/mmio/st_mmio.c b/drivers/staging/mmio/st_mmio.c
index 655f7ce3a93..45726c8f405 100644
--- a/drivers/staging/mmio/st_mmio.c
+++ b/drivers/staging/mmio/st_mmio.c
@@ -18,7 +18,7 @@
 #include <linux/vmalloc.h>
 #include <linux/workqueue.h>
 #include <linux/mfd/dbx500-prcmu.h>
-#include "mmio.h"
+#include <linux/mmio.h>
 
 #define ISP_REGION_IO				(0xE0000000)
 #define SIA_ISP_REG_ADDR			(0x521E4)