summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2006-03-25 16:55:50 -0600
committerMike Isely <isely@pobox.com>2006-03-25 16:55:50 -0600
commitb7be9b51e990f64ff667725533d5403660cbdac1 (patch)
tree9607ae1fb1bf59e54ab180d1fadd57c611192afb /linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
parent91ae35c1daa731973eb99fd8d422e60a6cb4ea5d (diff)
downloadmediapointer-dvb-s2-b7be9b51e990f64ff667725533d5403660cbdac1.tar.gz
mediapointer-dvb-s2-b7be9b51e990f64ff667725533d5403660cbdac1.tar.bz2
Implement operation of cx2584x from within pvrusb2
From: Mike Isely <isely@pobox.com> This adds new logic to integrate the pvrusb2 driver with the V4L cx25840 module. Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c')
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
index d537e380f..897e74d42 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c
@@ -28,6 +28,7 @@
#include "pvrusb2-tuner.h"
#include "pvrusb2-demod.h"
#include "pvrusb2-video-v4l.h"
+#include "pvrusb2-cx2584x-v4l.h"
#define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__)
@@ -69,6 +70,11 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp)
return;
}
}
+ if (id == I2C_DRIVERID_CX25840) {
+ if (pvr2_i2c_cx2584x_v4l_setup(hdw,cp)) {
+ return;
+ }
+ }
if (id == I2C_DRIVERID_SAA711X) {
if (pvr2_i2c_decoder_v4l_setup(hdw,cp)) {
return;