Merge remote-tracking branch 'regulator/topic/twl' into v3.9-rc8

[firefly-linux-kernel-4.4.55.git] / include / media / mt9p031.h

diff --git a/include/media/mt9p031.h b/include/media/mt9p031.h
index 96448c7a318bc697b21e90a520c716b382966b78..0c97b19af29389efca7cda37b6034ee82c38129d 100644 (file)
--- a/include/media/mt9p031.h
+++ b/include/media/mt9p031.h
@@ -3,17 +3,18 @@
 
 struct v4l2_subdev;
 
-enum {
-       MT9P031_COLOR_VERSION,
-       MT9P031_MONOCHROME_VERSION,
-};
-
+/*
+ * struct mt9p031_platform_data - MT9P031 platform data
+ * @set_xclk: Clock frequency set callback
+ * @reset: Chip reset GPIO (set to -1 if not used)
+ * @ext_freq: Input clock frequency
+ * @target_freq: Pixel clock frequency
+ */
 struct mt9p031_platform_data {
        int (*set_xclk)(struct v4l2_subdev *subdev, int hz);
-       int (*reset)(struct v4l2_subdev *subdev, int active);
-       int ext_freq; /* input frequency to the mt9p031 for PLL dividers */
-       int target_freq; /* frequency target for the PLL */
-       int version; /* MT9P031_COLOR_VERSION or MT9P031_MONOCHROME_VERSION */
+       int reset;
+       int ext_freq;
+       int target_freq;
 };
 
 #endif