The patch titled Subject: drivers/rtc/rtc-ab8500.c: remove fix for AB8500 ED version has been added to the -mm tree. Its filename is drivers-rtc-rtc-ab8500c-remove-fix-for-ab8500-ed-version.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Bengt Jonsson <bengt.g.jonsson@xxxxxxxxxxxxxx> Subject: drivers/rtc/rtc-ab8500.c: remove fix for AB8500 ED version AB8500 ED (Early Drop) is no longer supported by the kernel. Signed-off-by: Bengt Jonsson <bengt.g.jonsson@xxxxxxxxxxxxxx> Signed-off-by: Linus Walleij <linus.walleij@xxxxxxxxxx> Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-ab8500.c | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff -puN drivers/rtc/rtc-ab8500.c~drivers-rtc-rtc-ab8500c-remove-fix-for-ab8500-ed-version drivers/rtc/rtc-ab8500.c --- a/drivers/rtc/rtc-ab8500.c~drivers-rtc-rtc-ab8500c-remove-fix-for-ab8500-ed-version +++ a/drivers/rtc/rtc-ab8500.c @@ -88,22 +88,17 @@ static int ab8500_rtc_read_time(struct d if (retval < 0) return retval; - /* Early AB8500 chips will not clear the rtc read request bit */ - if (abx500_get_chip_id(dev) == 0) { - usleep_range(1000, 1000); - } else { - /* Wait for some cycles after enabling the rtc read in ab8500 */ - while (time_before(jiffies, timeout)) { - retval = abx500_get_register_interruptible(dev, - AB8500_RTC, AB8500_RTC_READ_REQ_REG, &value); - if (retval < 0) - return retval; + /* Wait for some cycles after enabling the rtc read in ab8500 */ + while (time_before(jiffies, timeout)) { + retval = abx500_get_register_interruptible(dev, + AB8500_RTC, AB8500_RTC_READ_REQ_REG, &value); + if (retval < 0) + return retval; - if (!(value & RTC_READ_REQUEST)) - break; + if (!(value & RTC_READ_REQUEST)) + break; - usleep_range(1000, 5000); - } + usleep_range(1000, 5000); } /* Read the Watchtime registers */ _ Subject: Subject: drivers/rtc/rtc-ab8500.c: remove fix for AB8500 ED version Patches currently in -mm which might be from bengt.g.jonsson@xxxxxxxxxxxxxx are drivers-rtc-rtc-ab8500c-remove-fix-for-ab8500-ed-version.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html