Changeset 4057 for branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch

Timestamp:

02/13/08 02:29:25 (5 years ago)

Author:

werner

Message:

fix-pcf50606-atomic-i2c-int-read.patch
fix-pcf50633-atomic-i2c-int-read.patch

Datasheet says reading the interrupt source regs (and thereby
clearing them) must be done in a single i2c read transaction

Signed-off-by: Andy Green <andy@…>

series: temporarily backed out fix-pcf50633-LOWBAT-kill-init.patch, since it

conflicts with these patches, and since there's a new version of it in the
queue already, there's no point in fixing it now

---

drivers/i2c/chips/pcf50606.c | 60 ++++++++++++++++++++++++------------------
1 files changed, 34 insertions(+), 26 deletions(-)
drivers/i2c/chips/pcf50633.c | 58 ++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 28 deletions(-)

File:

• branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch (modified) (12 diffs)

branches/src/target/kernel/2.6.24.x/patches/pcf50633.patch

@@ -35 +35 @@
 --- /dev/null
 +++ linux-2.6.24/drivers/i2c/chips/pcf50633.c
-@@ -0,0 +1,1789 @@
+@@ -0,0 +1,1791 @@
 +/* Philips PCF50633 Power Management Unit (PMU) driver
 + *
@@ -527 +527 @@
 +       struct pcf50633_data *pcf =
 +                       container_of(work, struct pcf50633_data, work);
-+       u_int8_t int1, int2, int3, int4, int5;
++       u_int8_t pcfirq[5];
++       int ret;
 +
 +       mutex_lock(&pcf->working_lock);
 +       pcf->working = 1;
-+
-+       /* FIXME: read in one i2c transaction */
-+       int1 = __reg_read(pcf, PCF50633_REG_INT1);
-+       int2 = __reg_read(pcf, PCF50633_REG_INT2);
-+       int3 = __reg_read(pcf, PCF50633_REG_INT3);
-+       int4 = __reg_read(pcf, PCF50633_REG_INT4);
-+       int5 = __reg_read(pcf, PCF50633_REG_INT5);
++       /*
++        * datasheet says we have to read the five IRQ
++        * status regs in one transaction
++        */
++       ret = i2c_smbus_read_i2c_block_data(&pcf->client, PCF50633_REG_INT1, 5,
++                                           pcfirq);
++       if (ret != 5)
++               DEBUGP("Oh crap PMU IRQ register read failed %d\n", ret);
 +
 +       DEBUGP("INT1=0x%02x INT2=0x%02x INT3=0x%02x INT4=0x%02x INT5=0x%02x\n",
-+               int1, int2, int3, int4, int5);
-+
-+       if (int1 & PCF50633_INT1_ADPINS) {
++               pcfirq[0], pcfirq[1], pcfirq[2], pcfirq[3], pcfirq[4]);
++
++       if (pcfirq[0] & PCF50633_INT1_ADPINS) {
 +               /* Charger inserted */
 +               DEBUGPC("ADPINS ");
@@ -554 +556 @@
 +               //kobject_uevent( ,KOBJ_ADD);
 +       }
-+       if (int1 & PCF50633_INT1_ADPREM) {
++       if (pcfirq[0] & PCF50633_INT1_ADPREM) {
 +               /* Charger removed */
 +               DEBUGPC("ADPREM ");
@@ -566 +568 @@
 +               //kobject_uevent( ,KOBJ_ADD);
 +       }
-+       if (int1 & PCF50633_INT1_USBINS) {
++       if (pcfirq[0] & PCF50633_INT1_USBINS) {
 +               DEBUGPC("USBINS ");
 +               input_report_key(pcf->input_dev, KEY_POWER2, 1);
@@ -576 +578 @@
 +
 +       }
-+       if (int1 & PCF50633_INT1_USBREM) {
++       if (pcfirq[0] & PCF50633_INT1_USBREM) {
 +               DEBUGPC("USBREM ");
 +               input_report_key(pcf->input_dev, KEY_POWER2, 0);
@@ -585 +587 @@
 +                                      PCF50633_FEAT_MBC, PMU_EVT_USB_REMOVE);
 +       }
-+       if (int1 & PCF50633_INT1_ALARM) {
++       if (pcfirq[0] & PCF50633_INT1_ALARM) {
 +               DEBUGPC("ALARM ");
 +               if (pcf->pdata->used_features & PCF50633_FEAT_RTC)
@@ -591 +593 @@
 +                                      RTC_AF | RTC_IRQF);
 +       }
-+       if (int1 & PCF50633_INT1_SECOND) {
++       if (pcfirq[0] & PCF50633_INT1_SECOND) {
 +               DEBUGPC("SECOND ");
 +               if (pcf->flags & PCF50633_F_RTC_SECOND)
@@ -613 +615 @@
 +       }
 +
-+       if (int2 & PCF50633_INT2_ONKEYF) {
++       if (pcfirq[1] & PCF50633_INT2_ONKEYF) {
 +               /* ONKEY falling edge (start of button press) */
 +               DEBUGPC("ONKEYF ");
@@ -619 +621 @@
 +               input_report_key(pcf->input_dev, KEY_POWER, 1);
 +       }
-+       if (int2 & PCF50633_INT2_ONKEYR) {
++       if (pcfirq[1] & PCF50633_INT2_ONKEYR) {
 +               /* ONKEY rising edge (end of button press) */
 +               DEBUGPC("ONKEYR ");
@@ -634 +636 @@
 +       /* FIXME: we don't use EXTON1/2/3. thats why we skip it */
 +
-+       if (int3 & PCF50633_INT3_BATFULL) {
++       if (pcfirq[2] & PCF50633_INT3_BATFULL) {
 +               DEBUGPC("BATFULL ");
 +               /* FIXME: signal this to userspace */
 +       }
-+       if (int3 & PCF50633_INT3_CHGHALT) {
++       if (pcfirq[2] & PCF50633_INT3_CHGHALT) {
 +               DEBUGPC("CHGHALT ");
 +               /* FIXME: signal this to userspace */
 +       }
-+       if (int3 & PCF50633_INT3_THLIMON) {
++       if (pcfirq[2] & PCF50633_INT3_THLIMON) {
 +               DEBUGPC("THLIMON ");
 +               pcf->flags |= PCF50633_F_CHG_PROT;
 +               /* FIXME: signal this to userspace */
 +       }
-+       if (int3 & PCF50633_INT3_THLIMOFF) {
++       if (pcfirq[2] & PCF50633_INT3_THLIMOFF) {
 +               DEBUGPC("THLIMOFF ");
 +               pcf->flags &= ~PCF50633_F_CHG_PROT;
 +               /* FIXME: signal this to userspace */
 +       }
-+       if (int3 & PCF50633_INT3_USBLIMON) {
++       if (pcfirq[2] & PCF50633_INT3_USBLIMON) {
 +               DEBUGPC("USBLIMON ");
 +               /* FIXME: signal this to userspace */
 +       }
-+       if (int3 & PCF50633_INT3_USBLIMOFF) {
++       if (pcfirq[2] & PCF50633_INT3_USBLIMOFF) {
 +               DEBUGPC("USBLIMOFF ");
 +               /* FIXME: signal this to userspace */
 +       }
-+       if (int3 & PCF50633_INT3_ADCRDY) {
++       if (pcfirq[2] & PCF50633_INT3_ADCRDY) {
 +               /* ADC result ready */
 +               DEBUGPC("ADCRDY ");
 +       }
-+       if (int3 & PCF50633_INT3_ONKEY1S) {
++       if (pcfirq[2] & PCF50633_INT3_ONKEY1S) {
 +               /* ONKEY pressed for more than 1 second */
 +               pcf->onkey_seconds = 0;
@@ -676 +678 @@
 +       }
 +
-+       if (int4 & (PCF50633_INT4_LOWBAT|PCF50633_INT4_LOWSYS)) {
++       if (pcfirq[3] & (PCF50633_INT4_LOWBAT|PCF50633_INT4_LOWSYS)) {
 +               /* Really low battery voltage, we have 8 seconds left */
 +               DEBUGPC("LOWBAT ");
@@ -687 +689 @@
 +                                PCF50633_OOCSHDWN_TOTRST);
 +       }
-+       if (int4 & PCF50633_INT4_HIGHTMP) {
++       if (pcfirq[3] & PCF50633_INT4_HIGHTMP) {
 +               /* High temperature */
 +               DEBUGPC("HIGHTMP ");
 +               apm_queue_event(APM_CRITICAL_SUSPEND);
 +       }
-+       if (int4 & (PCF50633_INT4_AUTOPWRFAIL|PCF50633_INT4_DWN1PWRFAIL|
++       if (pcfirq[3] & (PCF50633_INT4_AUTOPWRFAIL|PCF50633_INT4_DWN1PWRFAIL|
 +                  PCF50633_INT4_DWN2PWRFAIL|PCF50633_INT4_LEDPWRFAIL|
 +                  PCF50633_INT4_LEDOVP)) {