On 08/17/2012 03:16 AM, Bill Huang wrote: > Add DT property "ti,system-power-controller" telling whether or not this > pmic is in charge of controlling the system power, so the power off > routine can be hooked up to system call "pm_power_off". > > Based on the work by: > Dan Willemsen <dwillemsen@xxxxxxxxxx> > > Signed-off-by: Bill Huang <bilhuang@xxxxxxxxxx> Tested-by: Stephen Warren <swarren@xxxxxxxxxxxxx> Note that this conflicts (only context in tps6586x.txt I think) with commit b93fffb "regulator: tps6586x: add support for SYS rail" in the regulator tree. Also note that the patch is based on linux-next, which contains a mis-merge of tps6586x.txt from the regulator tree. In other words, expect some slight conflicts when you apply this. Taking it through the regulator tree would eliminate them. -- To unsubscribe from this list: send the line "unsubscribe linux-doc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html