From ba27877ce2c324e04a518371da0bf976308a314f Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sat, 25 Mar 2006 16:43:17 -0600 Subject: Fix pvrusb2 bug which prevented proper operation of tda9887 From: Mike Isely The pvrusb2 driver was not correctly identifying and handling the tda9887 module. This is the bug fix (code had been ifdef'ed out which should not have been). Signed-off-by: Mike Isely --- linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c') 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 2d97653d5..d537e380f 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c @@ -74,13 +74,11 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) return; } } -#ifdef PVR2_ENABLE_DRIVERID_TDA9887 if (id == I2C_DRIVERID_TDA9887) { if (pvr2_i2c_demod_setup(hdw,cp)) { return; } } -#endif } -- cgit v1.2.3 From b7be9b51e990f64ff667725533d5403660cbdac1 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sat, 25 Mar 2006 16:55:50 -0600 Subject: Implement operation of cx2584x from within pvrusb2 From: Mike Isely This adds new logic to integrate the pvrusb2 driver with the V4L cx25840 module. Signed-off-by: Mike Isely --- linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c') 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; -- cgit v1.2.3 From b07b47fc9fabe18a4073a47397d4bad39ada93b9 Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sat, 25 Mar 2006 17:01:11 -0600 Subject: Integrate pvrusb2 with wm8775 From: Mike Isely Implement new logic in pvrusb2 to operate wm8775, which is needed for new model 24xxx hardware which has a wm8775 inside it (which is used to digitize audio from composite and s-video input). Signed-off-by: Mike Isely --- linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c') 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 897e74d42..fc9d76792 100644 --- a/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c +++ b/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-chips-v4l2.c @@ -29,6 +29,7 @@ #include "pvrusb2-demod.h" #include "pvrusb2-video-v4l.h" #include "pvrusb2-cx2584x-v4l.h" +#include "pvrusb2-wm8775.h" #define trace_i2c(...) pvr2_trace(PVR2_TRACE_I2C,__VA_ARGS__) @@ -75,6 +76,11 @@ void pvr2_i2c_probe(struct pvr2_hdw *hdw,struct pvr2_i2c_client *cp) return; } } + if (id == I2C_DRIVERID_WM8775) { + if (pvr2_i2c_wm8775_setup(hdw,cp)) { + return; + } + } if (id == I2C_DRIVERID_SAA711X) { if (pvr2_i2c_decoder_v4l_setup(hdw,cp)) { return; -- cgit v1.2.3