The patch titled
Further fixes for the at32ap700x RTC driver:
has been removed from the -mm tree. Its filename was
driver-for-the-atmel-on-chip-rtc-on-at32ap700x-devices-update.patch
This patch was dropped because it was folded into driver-for-the-atmel-on-chip-rtc-on-at32ap700x-devices.patch
------------------------------------------------------
Subject: Further fixes for the at32ap700x RTC driver:
From: David Brownell <david-b@xxxxxxxxxxx>
- Strike some alarm setup code that's no longer needed.
(This patch seems to have gotten lost somewhere...)
- Make the driver name (and its module alias) match what
the platform setup code uses, so the driver can bind
and hotplug.
Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Hans-Christian Egtvedt <hcegtvedt@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-at32ap700x.c | 26 +++-----------------------
1 file changed, 3 insertions(+), 23 deletions(-)
diff -puN drivers/rtc/rtc-at32ap700x.c~driver-for-the-atmel-on-chip-rtc-on-at32ap700x-devices-update drivers/rtc/rtc-at32ap700x.c
--- a/drivers/rtc/rtc-at32ap700x.c~driver-for-the-atmel-on-chip-rtc-on-at32ap700x-devices-update
+++ a/drivers/rtc/rtc-at32ap700x.c
@@ -109,28 +109,6 @@ static int at32_rtc_setalarm(struct devi
rtc_unix_time = rtc_readl(rtc, VAL);
- /* RTC does only support one alarm time, not periodic */
- if (alrm->time.tm_mday <= 0) {
- struct rtc_time tm;
- unsigned long then;
-
- rtc_time_to_tm(rtc_unix_time, &tm);
-
- alrm->time.tm_mday = tm.tm_mday;
- alrm->time.tm_mon = tm.tm_mon;
- alrm->time.tm_year = tm.tm_year;
-
- rtc_tm_to_time(&alrm->time, &then);
-
- /* check if the alarm wraps into tomorrow */
- if (then < rtc_unix_time) {
- rtc_time_to_tm(rtc_unix_time + 24 * 60 * 60, &tm);
- alrm->time.tm_mday = tm.tm_mday;
- alrm->time.tm_mon = tm.tm_mon;
- alrm->time.tm_year = tm.tm_year;
- }
- }
-
ret = rtc_tm_to_time(&alrm->time, &alarm_unix_time);
if (ret)
return ret;
@@ -312,10 +290,12 @@ static int __exit at32_rtc_remove(struct
return 0;
}
+MODULE_ALIAS("at32ap700x_rtc");
+
static struct platform_driver at32_rtc_driver = {
.remove = __exit_p(at32_rtc_remove),
.driver = {
- .name = "rtc-at32ap700x",
+ .name = "at32ap700x_rtc",
.owner = THIS_MODULE,
},
};
_
Patches currently in -mm which might be from david-b@xxxxxxxxxxx are
origin.patch
spi-controller-drivers-check-for-unsupported-modes.patch
spi-add-3wire-mode-flag.patch
spidev-compiler-warning-gone.patch
spi_mpc83xxc-underclocking-hotfix.patch
atmel_spi-minor-updates.patch
atmel_spi-dont-always-deselect-chip-between-messages.patch
s3c24xx-spi-controllers-both-select-bitbang.patch
spi-master-driver-for-xilinx-virtex.patch
spi-omap2_mcspi-driver.patch
use-mutex-instead-of-semaphore-in-spi-core-init-code.patch
rtc-ds1307-cleanups.patch
rtc-rs5c372-becomes-a-new-style-i2c-driver.patch
thecus-n2100-register-rtc-rs5c372-i2c-device.patch
rtc-make-example-code-jump-to-done-instead-of-return-when-ioctl-not-supported.patch
rtc-dev-return-enotty-in-ioctl-if-irq_set_freq-is-not-implemented-by-driver.patch
driver-for-the-atmel-on-chip-rtc-on-at32ap700x-devices.patch
driver-for-the-atmel-on-chip-rtc-on-at32ap700x-devices-update.patch
rtc-kconfig-tweax.patch
rtc-add-rtc-m41t80-driver-take-2.patch
rtc-watchdog-support-for-rtc-m41t80-driver-take-2.patch
rtc-ds1307-becomes-new-style-i2c-driver.patch
csb337-supports-new-style-rtc-ds1307.patch
omap-add-ti-twl92330-menelaus-power-management-chip-driver.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
