summaryrefslogtreecommitdiffstats
path: root/drivers/media/platform/omap3isp/omap3isp.h
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2015-05-20 09:08:30 +0200
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-08-16 18:18:06 +0200
commit78c66fbcec717b22fd9db4ddc95e543cfcf544af (patch)
tree72b7373abd6f42d2953a57b27c95f391a5386491 /drivers/media/platform/omap3isp/omap3isp.h
parent[media] sr030pc30: don't read a new pointer (diff)
downloadlinux-78c66fbcec717b22fd9db4ddc95e543cfcf544af.tar.xz
linux-78c66fbcec717b22fd9db4ddc95e543cfcf544af.zip
[media] v4l: omap3isp: Drop platform data support
Platforms using the OMAP3 ISP have all switched to DT, drop platform data support. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Acked-by: Sakari Ailus <sakari.ailus@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to '')
-rw-r--r--drivers/media/platform/omap3isp/omap3isp.h (renamed from include/media/omap3isp.h)42
1 files changed, 8 insertions, 34 deletions
diff --git a/include/media/omap3isp.h b/drivers/media/platform/omap3isp/omap3isp.h
index 048f8f9117ef..190e259a6a2d 100644
--- a/include/media/omap3isp.h
+++ b/drivers/media/platform/omap3isp/omap3isp.h
@@ -1,7 +1,7 @@
/*
* omap3isp.h
*
- * TI OMAP3 ISP - Platform data
+ * TI OMAP3 ISP - Bus Configuration
*
* Copyright (C) 2011 Nokia Corporation
*
@@ -16,18 +16,10 @@
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
*/
-#ifndef __MEDIA_OMAP3ISP_H__
-#define __MEDIA_OMAP3ISP_H__
-
-struct i2c_board_info;
-struct isp_device;
+#ifndef __OMAP3ISP_H__
+#define __OMAP3ISP_H__
enum isp_interface_type {
ISP_INTERFACE_PARALLEL,
@@ -37,20 +29,13 @@ enum isp_interface_type {
ISP_INTERFACE_CSI2C_PHY1,
};
-enum {
- ISP_LANE_SHIFT_0 = 0,
- ISP_LANE_SHIFT_2 = 1,
- ISP_LANE_SHIFT_4 = 2,
- ISP_LANE_SHIFT_6 = 3,
-};
-
/**
* struct isp_parallel_cfg - Parallel interface configuration
* @data_lane_shift: Data lane shifter
- * ISP_LANE_SHIFT_0 - CAMEXT[13:0] -> CAM[13:0]
- * ISP_LANE_SHIFT_2 - CAMEXT[13:2] -> CAM[11:0]
- * ISP_LANE_SHIFT_4 - CAMEXT[13:4] -> CAM[9:0]
- * ISP_LANE_SHIFT_6 - CAMEXT[13:6] -> CAM[7:0]
+ * 0 - CAMEXT[13:0] -> CAM[13:0]
+ * 1 - CAMEXT[13:2] -> CAM[11:0]
+ * 2 - CAMEXT[13:4] -> CAM[9:0]
+ * 3 - CAMEXT[13:6] -> CAM[7:0]
* @clk_pol: Pixel clock polarity
* 0 - Sample on rising edge, 1 - Sample on falling edge
* @hs_pol: Horizontal synchronization polarity
@@ -144,15 +129,4 @@ struct isp_bus_cfg {
} bus; /* gcc < 4.6.0 chokes on anonymous union initializers */
};
-struct isp_platform_subdev {
- struct i2c_board_info *board_info;
- int i2c_adapter_id;
- struct isp_bus_cfg *bus;
-};
-
-struct isp_platform_data {
- struct isp_platform_subdev *subdevs;
- void (*set_constraints)(struct isp_device *isp, bool enable);
-};
-
-#endif /* __MEDIA_OMAP3ISP_H__ */
+#endif /* __OMAP3ISP_H__ */