diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-28 08:07:16 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-28 08:07:16 -0500 |
| commit | 6cb87cbb1475f668689f95911d1521ee6ba7f55c (patch) | |
| tree | 2454e7ad7a284c01cc1150f6d6def994e23c99a6 /drivers/rtc | |
| parent | 831f06fe9af0b45fa2cba64300524d1726fb9241 (diff) | |
| parent | fff7b33ce5b1b3687857ea4184d71bf4ce1f6364 (diff) | |
Merge tag 'u-boot-imx-20191228' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2020.01
-----------------
- Fixes for Nitrogen6x
- Fix corruption for mx51evk
- colibri i.MX6: fix broken ESDHC conversion
- mx6sxsabresd: fix broken mmcdev
- imx6q_logic: cleanup boot sequence
- update ATF for imx8mq_evk
- pfuze: fix pmic_get()
Travis CI: https://travis-ci.org/sbabic/u-boot-imx/builds/630007464
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rx8010sj.c | 3 | ||||
| -rw-r--r-- | drivers/rtc/s35392a.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/rtc/rx8010sj.c b/drivers/rtc/rx8010sj.c index 81560e16ce..82c5185e2e 100644 --- a/drivers/rtc/rx8010sj.c +++ b/drivers/rtc/rx8010sj.c @@ -349,7 +349,7 @@ void rtc_init(void) static int rx8010sj_probe(struct udevice *dev) { - rx8010sj_rtc_init(&dev); + rx8010sj_rtc_init(dev); return 0; } @@ -364,6 +364,7 @@ static const struct rtc_ops rx8010sj_rtc_ops = { static const struct udevice_id rx8010sj_rtc_ids[] = { { .compatible = "epson,rx8010sj-rtc" }, + { .compatible = "epson,rx8010" }, { } }; diff --git a/drivers/rtc/s35392a.c b/drivers/rtc/s35392a.c index 844f1b72c7..4f478ccfd7 100644 --- a/drivers/rtc/s35392a.c +++ b/drivers/rtc/s35392a.c @@ -350,6 +350,8 @@ static const struct rtc_ops s35392a_rtc_ops = { static const struct udevice_id s35392a_rtc_ids[] = { { .compatible = "sii,s35392a-rtc" }, + { .compatible = "sii,s35392a" }, + { .compatible = "s35392a" }, { } }; |