From 82d7751991959078bd7242b16355749c7ce70208 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sun, 30 Jan 2011 08:40:24 -0800 Subject: [PATCH] siihdmi: the deferred timeout is not a settle period --- drivers/video/mxc/siihdmi.c | 5 +---- include/linux/i2c/siihdmi.h | 2 ++ 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/video/mxc/siihdmi.c b/drivers/video/mxc/siihdmi.c index ba3e7e9e6df..2f31fb60157 100644 --- a/drivers/video/mxc/siihdmi.c +++ b/drivers/video/mxc/siihdmi.c @@ -66,9 +66,6 @@ static unsigned int bus_timeout = 50; module_param(bus_timeout, uint, 0644); MODULE_PARM_DESC(bus_timeout, "bus timeout in milliseconds"); -static unsigned int i2c_settle_time = 50; -module_param(i2c_settle_time, uint, 0644); -MODULE_PARM_DESC(i2c_settle_time, "time to wait for i2c to settle in ms"); /* * Interesting note: @@ -919,7 +916,7 @@ static irqreturn_t siihdmi_hotplug_handler(int irq, void *dev_id) struct siihdmi_tx *tx = ((struct siihdmi_tx *) dev_id); schedule_delayed_work(&tx->hotplug, - msecs_to_jiffies(i2c_settle_time)); + msecs_to_jiffies(SIIHDMI_HOTPLUG_HANDLER_TIMEOUT)); return IRQ_HANDLED; } diff --git a/include/linux/i2c/siihdmi.h b/include/linux/i2c/siihdmi.h index dd70e43f056..3a275d12dda 100644 --- a/include/linux/i2c/siihdmi.h +++ b/include/linux/i2c/siihdmi.h @@ -142,6 +142,8 @@ #define SIIHDMI_BASE_TPI_REVISION (0x29) #define SIIHDMI_CTRL_INFO_FRAME_DRAIN_TIME (0x80) +#define SIIHDMI_HOTPLUG_HANDLER_TIMEOUT (0x32) + /* Input Bus and Pixel Repetition */ #define SIIHDMI_PIXEL_REPETITION_DUAL (1 << 0) #define SIIHDMI_PIXEL_REPETITION_QUAD (3 << 0)