← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/mfd/twl4030-power.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/mfd/twl4030-power.c
120
120
        [RES_HFCLKOUT]  = 0x8b,
121
121
        [RES_32KCLKOUT] = 0x8e,
122
122
        [RES_RESET]     = 0x91,
123
 
        [RES_Main_Ref]  = 0x94,
 
123
        [RES_MAIN_REF]  = 0x94,
124
124
};
125
125
 
126
126
static int __init twl4030_write_script_byte(u8 address, u8 byte)
447
447
                if (err)
448
448
                        goto out;
449
449
        }
450
 
        if (tscript->flags & TWL4030_SLEEP_SCRIPT)
451
 
                if (order)
 
450
        if (tscript->flags & TWL4030_SLEEP_SCRIPT) {
 
451
                if (!order)
452
452
                        pr_warning("TWL4030: Bad order of scripts (sleep "\
453
453
                                        "script before wakeup) Leads to boot"\
454
454
                                        "failure on some boards\n");
455
455
                err = twl4030_config_sleep_sequence(address);
 
456
        }
456
457
out:
457
458
        return err;
458
459
}
484
485
                        return err;
485
486
        }
486
487
        if (flags & TWL4030_WAKEUP12_SCRIPT) {
487
 
                if (err)
488
488
                err = twl_i2c_write_u8(TWL4030_MODULE_PM_MASTER, END_OF_SCRIPT,
489
489
                                R_SEQ_ADD_S2A12);
 
490
                if (err)
490
491
                        return err;
491
492
        }
492
493
        if (flags & TWL4030_WAKEUP3_SCRIPT) {