1 files changed, 8 insertions, 41 deletions

diff --git a/drivers/media/platform/exynos4-is/fimc-is-sensor.h b/drivers/media/platform/exynos4-is/fimc-is-sensor.h
index 6036d49a6c68..173ccffa4bcd 100644
--- a/drivers/media/platform/exynos4-is/fimc-is-sensor.h
+++ b/drivers/media/platform/exynos4-is/fimc-is-sensor.h
@@ -13,24 +13,13 @@
 #ifndef FIMC_IS_SENSOR_H_
 #define FIMC_IS_SENSOR_H_
 
-#include <linux/clk.h>
-#include <linux/device.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/regulator/consumer.h>
-#include <linux/videodev2.h>
-#include <media/v4l2-subdev.h>
-
-#define FIMC_IS_SENSOR_OPEN_TIMEOUT     2000 /* ms */
-
-#define FIMC_IS_SENSOR_DEF_PIX_WIDTH    1296
-#define FIMC_IS_SENSOR_DEF_PIX_HEIGHT   732
+#include <linux/of.h>
+#include <linux/types.h>
 
+#define S5K6A3_OPEN_TIMEOUT             2000 /* ms */
 #define S5K6A3_SENSOR_WIDTH             1392
 #define S5K6A3_SENSOR_HEIGHT            1392
 
-#define SENSOR_NUM_SUPPLIES             2
-
 enum fimc_is_sensor_id {
         FIMC_IS_SENSOR_ID_S5K3H2 = 1,
         FIMC_IS_SENSOR_ID_S5K6A3,
@@ -45,45 +34,23 @@ enum fimc_is_sensor_id {
 
 struct sensor_drv_data {
         enum fimc_is_sensor_id id;
-        const char * const subdev_name;
-        unsigned int width;
-        unsigned int height;
+        /* sensor open timeout in ms */
+        unsigned short open_timeout;
 };
 
 /**
  * struct fimc_is_sensor - fimc-is sensor data structure
- * @dev: pointer to this I2C client device structure
- * @subdev: the image sensor's v4l2 subdev
- * @pad: subdev media source pad
- * @supplies: image sensor's voltage regulator supplies
- * @gpio_reset: GPIO connected to the sensor's reset pin
  * @drvdata: a pointer to the sensor's parameters data structure
  * @i2c_bus: ISP I2C bus index (0...1)
  * @test_pattern: true to enable video test pattern
- * @lock: mutex protecting the structure's members below
- * @format: media bus format at the sensor's source pad
  */
 struct fimc_is_sensor {
-        struct device *dev;
-        struct v4l2_subdev subdev;
-        struct media_pad pad;
-        struct regulator_bulk_data supplies[SENSOR_NUM_SUPPLIES];
-        int gpio_reset;
         const struct sensor_drv_data *drvdata;
         unsigned int i2c_bus;
-        bool test_pattern;
-
-        struct mutex lock;
-        struct v4l2_mbus_framefmt format;
+        u8 test_pattern;
 };
 
-static inline
-struct fimc_is_sensor *sd_to_fimc_is_sensor(struct v4l2_subdev *sd)
-{
-        return container_of(sd, struct fimc_is_sensor, subdev);
-}
-
-int fimc_is_register_sensor_driver(void);
-void fimc_is_unregister_sensor_driver(void);
+const struct sensor_drv_data *fimc_is_sensor_get_drvdata(
+                                struct device_node *node);
 
 #endif /* FIMC_IS_SENSOR_H_ */