Fix more IR bugs
Signed-off-by: Jarod Wilson <jarod@redhat.com>
This commit is contained in:
Jarod Wilson
parent
c998b6666e
commit
ef402ae0aa
|
|
@ -48,7 +48,7 @@ Summary: The Linux kernel
|
|||
# reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
|
||||
# scripts/rebase.sh should be made to do that for you, actually.
|
||||
#
|
||||
%global baserelease 79
|
||||
%global baserelease 80
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
|
@ -2148,6 +2148,12 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Wed Jan 19 2011 Jarod Wilson <jarod@redhat.com> 2.6.35.10-80
|
||||
- Make lirc_zilog behave correctly with hdpvr again, and for the first
|
||||
time ever, with pvrusb2-driven HVR-1950 (#635045)
|
||||
- Call dib0700 rc bug whacked (#667157)
|
||||
- Call saa7134-based i2c IR registration bug whacked (#665870)
|
||||
|
||||
* Tue Jan 18 2011 Jarod Wilson <jarod@redhat.com> 2.6.35.10-79
|
||||
- Generally, its a good idea to actually apply the patches you were
|
||||
intending to include in the build, and enable their Kconfig options
|
||||
|
|
|
|||
|
|
@ -2,6 +2,20 @@ Not yet upstream, willl send RSN...
|
|||
|
||||
--jarod
|
||||
|
||||
Author: Jarod Wilson <jarod@redhat.com>
|
||||
Date: Wed Jan 19 16:49:19 2011 -0500
|
||||
|
||||
lirc_zilog: wait a bit after firmware upload
|
||||
|
||||
Signed-off-by: Jarod Wilson <jarod@redhat.com>
|
||||
|
||||
Author: Jarod Wilson <jarod@redhat.com>
|
||||
Date: Wed Jan 19 16:10:14 2011 -0500
|
||||
|
||||
hdpvr: fix up i2c device registration
|
||||
|
||||
Signed-off-by: Jarod Wilson <jarod@redhat.com>
|
||||
|
||||
Author: Jarod Wilson <jarod@redhat.com>
|
||||
Date: Tue Jan 18 15:31:24 2011 -0500
|
||||
|
||||
|
|
@ -21,7 +35,6 @@ Date: Tue Jan 18 00:27:45 2011 -0500
|
|||
Reported-by: Erin Simonds <fisslefink@gmail.com>
|
||||
Signed-off-by: Jarod Wilson <jarod@redhat.com>
|
||||
|
||||
|
||||
Author: Jarod Wilson <jarod@redhat.com>
|
||||
Date: Wed Jan 5 10:16:13 2011 -0500
|
||||
|
||||
|
|
@ -105,3 +118,148 @@ index 6e2911c..1b013d4 100644
|
|||
IR_MAX_DURATION) | 0x03000000);
|
||||
#if 0
|
||||
/* not yet supported, depends on patches from maxim */
|
||||
diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
|
||||
index a6572e5..263e2fa 100644
|
||||
--- a/drivers/media/video/hdpvr/hdpvr-core.c
|
||||
+++ b/drivers/media/video/hdpvr/hdpvr-core.c
|
||||
@@ -381,13 +381,21 @@ static int hdpvr_probe(struct usb_interface *interface,
|
||||
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
|
||||
retval = hdpvr_register_i2c_adapter(dev);
|
||||
if (retval < 0) {
|
||||
- v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
|
||||
+ v4l2_err(&dev->v4l2_dev, "i2c adapter register failed\n");
|
||||
goto error;
|
||||
}
|
||||
|
||||
- retval = hdpvr_register_i2c_ir(dev);
|
||||
- if (retval < 0)
|
||||
- v4l2_err(&dev->v4l2_dev, "registering i2c IR devices failed\n");
|
||||
+ hdpvr_register_ir_rx_i2c(dev);
|
||||
+ if (!dev->i2c_rx) {
|
||||
+ v4l2_err(&dev->v4l2_dev, "i2c IR RX device register failed\n");
|
||||
+ goto rx_reg_fail;
|
||||
+ }
|
||||
+
|
||||
+ hdpvr_register_ir_tx_i2c(dev);
|
||||
+ if (!dev->i2c_tx) {
|
||||
+ v4l2_err(&dev->v4l2_dev, "i2c IR TX device register failed\n");
|
||||
+ goto tx_reg_fail;
|
||||
+ }
|
||||
#endif
|
||||
|
||||
/* let the user know what node this device is now attached to */
|
||||
@@ -395,6 +403,10 @@ static int hdpvr_probe(struct usb_interface *interface,
|
||||
video_device_node_name(dev->video_dev));
|
||||
return 0;
|
||||
|
||||
+tx_reg_fail:
|
||||
+ i2c_unregister_device(dev->i2c_rx);
|
||||
+rx_reg_fail:
|
||||
+ i2c_del_adapter(&dev->i2c_adapter);
|
||||
error:
|
||||
if (dev) {
|
||||
/* Destroy single thread */
|
||||
diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
|
||||
index 89b71fa..e891bb0 100644
|
||||
--- a/drivers/media/video/hdpvr/hdpvr-i2c.c
|
||||
+++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
|
||||
@@ -31,26 +31,39 @@
|
||||
#define Z8F0811_IR_RX_I2C_ADDR 0x71
|
||||
|
||||
|
||||
-static struct i2c_board_info hdpvr_i2c_board_info = {
|
||||
+static struct i2c_board_info hdpvr_ir_tx_i2c_board_info = {
|
||||
I2C_BOARD_INFO("ir_tx_z8f0811_hdpvr", Z8F0811_IR_TX_I2C_ADDR),
|
||||
+};
|
||||
+
|
||||
+void hdpvr_register_ir_tx_i2c(struct hdpvr_device *dev)
|
||||
+{
|
||||
+ struct IR_i2c_init_data *init_data = &dev->ir_i2c_init_data;
|
||||
+
|
||||
+ init_data->name = "HD-PVR";
|
||||
+ hdpvr_ir_tx_i2c_board_info.platform_data = init_data;
|
||||
+
|
||||
+ dev->i2c_tx = i2c_new_device(&dev->i2c_adapter,
|
||||
+ &hdpvr_ir_tx_i2c_board_info);
|
||||
+}
|
||||
+
|
||||
+static struct i2c_board_info hdpvr_ir_rx_i2c_board_info = {
|
||||
I2C_BOARD_INFO("ir_rx_z8f0811_hdpvr", Z8F0811_IR_RX_I2C_ADDR),
|
||||
};
|
||||
|
||||
-int hdpvr_register_i2c_ir(struct hdpvr_device *dev)
|
||||
+void hdpvr_register_ir_rx_i2c(struct hdpvr_device *dev)
|
||||
{
|
||||
- struct i2c_client *c;
|
||||
struct IR_i2c_init_data *init_data = &dev->ir_i2c_init_data;
|
||||
|
||||
/* Our default information for ir-kbd-i2c.c to use */
|
||||
init_data->ir_codes = RC_MAP_HAUPPAUGE_NEW;
|
||||
init_data->internal_get_key_func = IR_KBD_GET_KEY_HAUP_XVR;
|
||||
init_data->type = RC_TYPE_RC5;
|
||||
- init_data->name = "HD PVR";
|
||||
- hdpvr_i2c_board_info.platform_data = init_data;
|
||||
-
|
||||
- c = i2c_new_device(&dev->i2c_adapter, &hdpvr_i2c_board_info);
|
||||
+ init_data->name = "HD-PVR";
|
||||
+ init_data->polling_interval = 260; /* matches lirc_zilog */
|
||||
+ hdpvr_ir_rx_i2c_board_info.platform_data = init_data;
|
||||
|
||||
- return (c == NULL) ? -ENODEV : 0;
|
||||
+ dev->i2c_rx = i2c_new_device(&dev->i2c_adapter,
|
||||
+ &hdpvr_ir_rx_i2c_board_info);
|
||||
}
|
||||
|
||||
static int hdpvr_i2c_read(struct hdpvr_device *dev, int bus,
|
||||
diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
|
||||
index ee74e3b..29357f0 100644
|
||||
--- a/drivers/media/video/hdpvr/hdpvr.h
|
||||
+++ b/drivers/media/video/hdpvr/hdpvr.h
|
||||
@@ -108,6 +108,9 @@ struct hdpvr_device {
|
||||
|
||||
/* I2C adapter */
|
||||
struct i2c_adapter i2c_adapter;
|
||||
+ /* I2C clients */
|
||||
+ struct i2c_client *i2c_rx;
|
||||
+ struct i2c_client *i2c_tx;
|
||||
/* I2C lock */
|
||||
struct mutex i2c_mutex;
|
||||
/* I2C message buffer space */
|
||||
@@ -313,7 +316,8 @@ int hdpvr_cancel_queue(struct hdpvr_device *dev);
|
||||
/* i2c adapter registration */
|
||||
int hdpvr_register_i2c_adapter(struct hdpvr_device *dev);
|
||||
|
||||
-int hdpvr_register_i2c_ir(struct hdpvr_device *dev);
|
||||
+void hdpvr_register_ir_rx_i2c(struct hdpvr_device *dev);
|
||||
+void hdpvr_register_ir_tx_i2c(struct hdpvr_device *dev);
|
||||
|
||||
/*========================================================================*/
|
||||
/* buffer management */
|
||||
diff --git a/drivers/staging/lirc/lirc_zilog.c b/drivers/staging/lirc/lirc_zilog.c
|
||||
index 3fe5f41..6422e26 100644
|
||||
--- a/drivers/staging/lirc/lirc_zilog.c
|
||||
+++ b/drivers/staging/lirc/lirc_zilog.c
|
||||
@@ -503,7 +503,7 @@ static int send_boot_data(struct IR_tx *tx)
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
|
||||
- /* kick it off? */
|
||||
+ /* Hit the go button to activate the new boot data */
|
||||
buf[0] = 0x00;
|
||||
buf[1] = 0x20;
|
||||
ret = i2c_master_send(tx->c, buf, 2);
|
||||
@@ -511,6 +511,14 @@ static int send_boot_data(struct IR_tx *tx)
|
||||
zilog_error("i2c_master_send failed with %d\n", ret);
|
||||
return ret < 0 ? ret : -EFAULT;
|
||||
}
|
||||
+
|
||||
+ /*
|
||||
+ * Wait for zilog to settle after hitting go post boot block upload.
|
||||
+ * Without this delay, the HD-PVR and HVR-1950 both return an -EIO
|
||||
+ * upon attempting to get firmware revision, and tx probe thus fails.
|
||||
+ */
|
||||
+ mdelay(20);
|
||||
+
|
||||
ret = i2c_master_send(tx->c, buf, 1);
|
||||
if (ret != 1) {
|
||||
zilog_error("i2c_master_send failed with %d\n", ret);
|
||||
|
|
|
|||
Loading…
Reference in New Issue