aboutsummaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorAndy Green <andy@openmoko.com>2009-03-03 17:25:02 +0000
committerAndy Green <agreen@octopus.localdomain>2009-03-03 17:25:02 +0000
commitb9de904e7aadd7b37c4035fd5d6f59e5f80089b6 (patch)
tree81015365db8852b914273de7524bec8f47f7fdda /drivers/power
parent75d17a700b015cd5e99636db035c8bd1324eeca4 (diff)
fix-hdq-sample-period-calc.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/hdq.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/power/hdq.c b/drivers/power/hdq.c
index 693d643407d..8b1aee82b9c 100644
--- a/drivers/power/hdq.c
+++ b/drivers/power/hdq.c
@@ -53,7 +53,6 @@ struct hdq_priv {
struct hdq_platform_data *pdata;
} hdq_priv;
-#define HDQ_SAMPLE_PERIOD_US 20
int hdq_fiq_handler(void)
{
@@ -157,7 +156,7 @@ int hdq_fiq_handler(void)
hdq_priv.hdq_ctr2 = 1;
hdq_priv.hdq_bit = 8; /* 8 bits of data */
/* timeout */
- hdq_priv.hdq_ctr = 300 / HDQ_SAMPLE_PERIOD_US;
+ hdq_priv.hdq_ctr = 500 / HDQ_SAMPLE_PERIOD_US;
hdq_priv.hdq_state = HDQB_DATA_RX_LOW;
break;
}
@@ -267,8 +266,10 @@ int hdq_read(int address)
if (fiq_busy())
continue;
- if (hdq_priv.hdq_error)
+ if (hdq_priv.hdq_error) {
+ printk(KERN_ERR "HDQ error: %d\n", hdq_priv.hdq_error);
goto done; /* didn't see a response in good time */
+ }
ret = hdq_priv.hdq_rx_data;
goto done;
@@ -306,8 +307,10 @@ int hdq_write(int address, u8 data)
if (fiq_busy())
continue; /* something bad with FIQ */
- if (hdq_priv.hdq_error)
+ if (hdq_priv.hdq_error) {
+ printk(KERN_ERR "HDQ error: %d\n", hdq_priv.hdq_error);
goto done; /* didn't see a response in good time */
+ }
ret = 0;
goto done;