summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hdpvr-ir-enable.patch229
-rw-r--r--kernel.spec11
-rw-r--r--thinkpad-acpi-fix-backlight.patch56
3 files changed, 5 insertions, 291 deletions
diff --git a/hdpvr-ir-enable.patch b/hdpvr-ir-enable.patch
deleted file mode 100644
index e73c42122..000000000
--- a/hdpvr-ir-enable.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-diff --git a/drivers/media/video/hdpvr/Makefile b/drivers/media/video/hdpvr/Makefile
-index e0230fc..3baa9f6 100644
---- a/drivers/media/video/hdpvr/Makefile
-+++ b/drivers/media/video/hdpvr/Makefile
-@@ -1,6 +1,4 @@
--hdpvr-objs := hdpvr-control.o hdpvr-core.o hdpvr-video.o
--
--hdpvr-$(CONFIG_I2C) += hdpvr-i2c.o
-+hdpvr-objs := hdpvr-control.o hdpvr-core.o hdpvr-video.o hdpvr-i2c.o
-
- obj-$(CONFIG_VIDEO_HDPVR) += hdpvr.o
-
-diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
-index 830d47b..70cfdc8 100644
---- a/drivers/media/video/hdpvr/hdpvr-core.c
-+++ b/drivers/media/video/hdpvr/hdpvr-core.c
-@@ -364,14 +364,13 @@ static int hdpvr_probe(struct usb_interface *interface,
- goto error;
- }
-
--#ifdef CONFIG_I2C
-- /* until i2c is working properly */
-- retval = 0; /* hdpvr_register_i2c_adapter(dev); */
-+#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");
- goto error;
- }
--#endif /* CONFIG_I2C */
-+#endif
-
- /* let the user know what node this device is now attached to */
- v4l2_info(&dev->v4l2_dev, "device now attached to %s\n",
-diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
-index 463b81b..60cdc06 100644
---- a/drivers/media/video/hdpvr/hdpvr-i2c.c
-+++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
-@@ -10,6 +10,8 @@
- *
- */
-
-+#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-+
- #include <linux/i2c.h>
- #include <linux/slab.h>
-
-@@ -22,8 +24,11 @@
- #define REQTYPE_I2C_WRITE 0xb0
- #define REQTYPE_I2C_WRITE_STATT 0xd0
-
--static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
-- char *data, int len)
-+#define HDPVR_HW_Z8F0811_IR_TX_I2C_ADDR 0x70
-+#define HDPVR_HW_Z8F0811_IR_RX_I2C_ADDR 0x71
-+
-+static int hdpvr_i2c_read(struct hdpvr_device *dev, int bus,
-+ unsigned char addr, char *data, int len)
- {
- int ret;
- char *buf = kmalloc(len, GFP_KERNEL);
-@@ -33,7 +38,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
- ret = usb_control_msg(dev->udev,
- usb_rcvctrlpipe(dev->udev, 0),
- REQTYPE_I2C_READ, CTRL_READ_REQUEST,
-- 0x100|addr, 0, buf, len, 1000);
-+ (bus << 8) | addr, 0, buf, len, 1000);
-
- if (ret == len) {
- memcpy(data, buf, len);
-@@ -46,8 +51,8 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
- return ret;
- }
-
--static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
-- char *data, int len)
-+static int hdpvr_i2c_write(struct hdpvr_device *dev, int bus,
-+ unsigned char addr, char *data, int len)
- {
- int ret;
- char *buf = kmalloc(len, GFP_KERNEL);
-@@ -58,7 +63,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
- ret = usb_control_msg(dev->udev,
- usb_sndctrlpipe(dev->udev, 0),
- REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
-- 0x100|addr, 0, buf, len, 1000);
-+ (bus << 8) | addr, 0, buf, len, 1000);
-
- if (ret < 0)
- goto error;
-@@ -68,7 +73,7 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
- REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
- 0, 0, buf, 2, 1000);
-
-- if (ret == 2)
-+ if ((ret == 2) && (buf[1] == (len - 1)))
- ret = 0;
- else if (ret >= 0)
- ret = -EIO;
-@@ -93,10 +98,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
- addr = msgs[i].addr << 1;
-
- if (msgs[i].flags & I2C_M_RD)
-- retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
-+ retval = hdpvr_i2c_read(dev, 1, addr, msgs[i].buf,
- msgs[i].len);
- else
-- retval = hdpvr_i2c_write(dev, addr, msgs[i].buf,
-+ retval = hdpvr_i2c_write(dev, 1, addr, msgs[i].buf,
- msgs[i].len);
- }
-
-@@ -115,30 +120,58 @@ static struct i2c_algorithm hdpvr_algo = {
- .functionality = hdpvr_functionality,
- };
-
-+static struct i2c_adapter hdpvr_i2c_adapter_template = {
-+ .name = "Hauppage HD PVR I2C",
-+ .owner = THIS_MODULE,
-+ .id = I2C_HW_B_HDPVR,
-+ .algo = &hdpvr_algo,
-+};
-+
-+static struct i2c_board_info hdpvr_i2c_board_info = {
-+ I2C_BOARD_INFO("ir_tx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_TX_I2C_ADDR),
-+ I2C_BOARD_INFO("ir_rx_z8f0811_haup", HDPVR_HW_Z8F0811_IR_RX_I2C_ADDR),
-+};
-+
-+static int hdpvr_activate_ir(struct hdpvr_device *dev)
-+{
-+ char buffer[8];
-+
-+ mutex_lock(&dev->i2c_mutex);
-+
-+ hdpvr_i2c_read(dev, 0, 0x54, buffer, 1);
-+
-+ buffer[0] = 0;
-+ buffer[1] = 0x8;
-+ hdpvr_i2c_write(dev, 1, 0x54, buffer, 2);
-+
-+ buffer[1] = 0x18;
-+ hdpvr_i2c_write(dev, 1, 0x54, buffer, 2);
-+
-+ mutex_unlock(&dev->i2c_mutex);
-+
-+ return 0;
-+}
-+
- int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
- {
-- struct i2c_adapter *i2c_adap;
- int retval = -ENOMEM;
-
-- i2c_adap = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL);
-- if (i2c_adap == NULL)
-- goto error;
-+ hdpvr_activate_ir(dev);
-
-- strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
-- sizeof(i2c_adap->name));
-- i2c_adap->algo = &hdpvr_algo;
-- i2c_adap->owner = THIS_MODULE;
-- i2c_adap->dev.parent = &dev->udev->dev;
-+ memcpy(&dev->i2c_adapter, &hdpvr_i2c_adapter_template,
-+ sizeof(struct i2c_adapter));
-+ dev->i2c_adapter.dev.parent = &dev->udev->dev;
-
-- i2c_set_adapdata(i2c_adap, dev);
-+ i2c_set_adapdata(&dev->i2c_adapter, dev);
-
-- retval = i2c_add_adapter(i2c_adap);
-+ retval = i2c_add_adapter(&dev->i2c_adapter);
-+ if (retval)
-+ goto error;
-
-- if (!retval)
-- dev->i2c_adapter = i2c_adap;
-- else
-- kfree(i2c_adap);
-+ i2c_new_device(&dev->i2c_adapter, &hdpvr_i2c_board_info);
-
- error:
- return retval;
- }
-+
-+#endif
-diff --git a/drivers/media/video/hdpvr/hdpvr-video.c b/drivers/media/video/hdpvr/hdpvr-video.c
-index c338f3f..26fd9bf 100644
---- a/drivers/media/video/hdpvr/hdpvr-video.c
-+++ b/drivers/media/video/hdpvr/hdpvr-video.c
-@@ -1221,12 +1221,9 @@ static void hdpvr_device_release(struct video_device *vdev)
- v4l2_device_unregister(&dev->v4l2_dev);
-
- /* deregister I2C adapter */
--#ifdef CONFIG_I2C
-+#if defined(CONFIG_I2C) || (CONFIG_I2C_MODULE)
- mutex_lock(&dev->i2c_mutex);
-- if (dev->i2c_adapter)
-- i2c_del_adapter(dev->i2c_adapter);
-- kfree(dev->i2c_adapter);
-- dev->i2c_adapter = NULL;
-+ i2c_del_adapter(&dev->i2c_adapter);
- mutex_unlock(&dev->i2c_mutex);
- #endif /* CONFIG_I2C */
-
-diff --git a/drivers/media/video/hdpvr/hdpvr.h b/drivers/media/video/hdpvr/hdpvr.h
-index b0f046d..2107055 100644
---- a/drivers/media/video/hdpvr/hdpvr.h
-+++ b/drivers/media/video/hdpvr/hdpvr.h
-@@ -102,7 +102,7 @@ struct hdpvr_device {
- struct work_struct worker;
-
- /* I2C adapter */
-- struct i2c_adapter *i2c_adapter;
-+ struct i2c_adapter i2c_adapter;
- /* I2C lock */
- struct mutex i2c_mutex;
-
-diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
-index 4bef5c5..4385341 100644
---- a/include/linux/i2c-id.h
-+++ b/include/linux/i2c-id.h
-@@ -33,5 +33,6 @@
-
- /* --- Bit algorithm adapters */
- #define I2C_HW_B_CX2388x 0x01001b /* connexant 2388x based tv cards */
-+#define I2C_HW_B_HDPVR 0x010025 /* Hauppauge HD PVR */
-
- #endif /* LINUX_I2C_ID_H */
diff --git a/kernel.spec b/kernel.spec
index 3391d195f..a3b0fd1c8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -644,7 +644,6 @@ Patch399: acpi_battery-fribble-sysfs-files-from-a-resume-notifier.patch
Patch450: linux-2.6-input-kill-stupid-messages.patch
Patch452: linux-2.6.30-no-pcspkr-modalias.patch
-Patch454: thinkpad-acpi-fix-backlight.patch
Patch460: linux-2.6-serial-460800.patch
@@ -697,7 +696,6 @@ Patch2910: linux-2.6-v4l-dvb-add-lgdt3304-support.patch
Patch2912: linux-2.6-v4l-dvb-ir-core-update.patch
#Patch2916: lirc-staging-2.6.36-fixes.patch
-#Patch2917: hdpvr-ir-enable.patch
Patch2918: flexcop-fix-xlate_proc_name-warning.patch
@@ -1257,8 +1255,6 @@ ApplyPatch die-floppy-die.patch
ApplyPatch linux-2.6.30-no-pcspkr-modalias.patch
-#ApplyPatch thinkpad-acpi-fix-backlight.patch
-
# Allow to use 480600 baud on 16C950 UARTs
ApplyPatch linux-2.6-serial-460800.patch
@@ -1321,8 +1317,6 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
# http://www.lirc.org/
#ApplyOptionalPatch lirc-staging-2.6.36-fixes.patch
-# enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
-#ApplyPatch hdpvr-ir-enable.patch
# rhbz#664852
ApplyPatch flexcop-fix-xlate_proc_name-warning.patch
@@ -1956,6 +1950,11 @@ fi
# and build.
%changelog
+* Fri Mar 25 2011 Chuck Ebbert <cebbert@redhat.com>
+- Drop unused patches already applied upstream:
+ hdpvr-ir-enable.patch
+ thinkpad-acpi-fix-backlight.patch
+
* Wed Mar 23 2011 Kyle McMartin <kmcmartin@redhat.com>
- Re-create ACPI battery sysfs files on resume from suspend, fixes the
upstream changes to the dropped
diff --git a/thinkpad-acpi-fix-backlight.patch b/thinkpad-acpi-fix-backlight.patch
deleted file mode 100644
index 5ed2544fe..000000000
--- a/thinkpad-acpi-fix-backlight.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -up linux-2.6.34.noarch/drivers/platform/x86/thinkpad_acpi.c.orig linux-2.6.34.noarch/drivers/platform/x86/thinkpad_acpi.c
---- linux-2.6.34.noarch/drivers/platform/x86/thinkpad_acpi.c.orig 2010-05-17 16:28:13.254200070 -0400
-+++ linux-2.6.34.noarch/drivers/platform/x86/thinkpad_acpi.c 2010-05-17 16:29:56.471200083 -0400
-@@ -3397,7 +3397,7 @@ static int __init hotkey_init(struct ibm
- /* update bright_acpimode... */
- tpacpi_check_std_acpi_brightness_support();
-
-- if (tp_features.bright_acpimode && acpi_video_backlight_support()) {
-+ if (acpi_video_backlight_support()) {
- printk(TPACPI_INFO
- "This ThinkPad has standard ACPI backlight "
- "brightness control, supported by the ACPI "
-@@ -6189,26 +6189,24 @@ static int __init brightness_init(struct
- * going to publish a backlight interface
- */
- b = tpacpi_check_std_acpi_brightness_support();
-- if (b > 0) {
-
-- if (acpi_video_backlight_support()) {
-- if (brightness_enable > 1) {
-- printk(TPACPI_NOTICE
-- "Standard ACPI backlight interface "
-- "available, not loading native one.\n");
-- return 1;
-- } else if (brightness_enable == 1) {
-- printk(TPACPI_NOTICE
-- "Backlight control force enabled, even if standard "
-- "ACPI backlight interface is available\n");
-- }
-- } else {
-- if (brightness_enable > 1) {
-- printk(TPACPI_NOTICE
-- "Standard ACPI backlight interface not "
-- "available, thinkpad_acpi native "
-- "brightness control enabled\n");
-- }
-+ if (acpi_video_backlight_support()) {
-+ if (brightness_enable > 1) {
-+ printk(TPACPI_NOTICE
-+ "Standard ACPI backlight interface "
-+ "available, not loading native one.\n");
-+ return 1;
-+ } else if (brightness_enable == 1) {
-+ printk(TPACPI_NOTICE
-+ "Backlight control force enabled, even if standard "
-+ "ACPI backlight interface is available\n");
-+ }
-+ } else {
-+ if (brightness_enable > 1) {
-+ printk(TPACPI_NOTICE
-+ "Standard ACPI backlight interface not "
-+ "available, thinkpad_acpi native "
-+ "brightness control enabled\n");
- }
- }
-