On 19/04/15 14:04, Jonathan Cameron wrote: > On 14/04/15 14:37, Daniel Baluta wrote: >> This patchset adds support for LiteOn LTR301 ambient light sensor >> and LTR559 ambient light and proximity sensor. >> >> v7: >> 1. Rebase LTR-301 on top of LTR-559 and merged the patches into a single patchset >> 2. Moved ltr501_chip_info_tbl below ltr501_info in patch 1 in order >> to make patch 2 changes look natural. :) >> 3. Moved "else" branch of id check from patch 2 to patch 1. Now it is no >> longer possible to have a NULL name after this check. If id is not NULL >> than id->name is one of ltr501_id already defined strings. >> >> v6: >> 1. Changed the title in commit log >> >> v5: >> 1. Rebased this patch on top of Daniel's LTR559 patchset >> (http://marc.info/?l=linux-kernel&m=142779827617036&w=2) >> 2. Added info and channel members to chip_info struture. >> >> v4: >> 1. Addressed minor comments from Peter Meerwald >> 2. Changed invalid chip id errno from ENOSYS to ENODEV >> 3. Fixed channel id index number >> 4. Removed unused variable. >> >> v3: >> 1. Sent v2 before by mistake. So sending the final version of v2 as v3. >> >> v2: >> 1. Handled device id NULL case in probe >> 2. Changed pr_warn to dev_warn >> >> v1: >> Extended LTR501 driver to support both LTR301 and LTR501 device. >> >> Daniel Baluta (1): >> iio: ltr501: Add support for ltr559 chip >> >> Kuppuswamy Sathyanarayanan (1): >> iio: ltr501: Add support for ltr301 >> >> drivers/iio/light/Kconfig | 3 +- >> drivers/iio/light/ltr501.c | 240 ++++++++++++++++++++++++++++++++++++++------- >> 2 files changed, 209 insertions(+), 34 deletions(-) >> > > Sorry Daniel, I've confused this further by first taking the set that added > interrupt support to this driver. Hence this series doesn't apply at all. > > Don't suppose you could rebase on my testing branch to deal with that. > > Sorry again, I was obviously half asleep and hadn't registered just how > much pain these two sets were going to cause. I think this is all just fuzz, but I'm more likely to mess it up that you! > > Jonathan > -- > To unsubscribe from this list: send the line "unsubscribe linux-iio" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html