--- v2
+++ v1
@@ -1,52 +1,29 @@
-It has been a while since v1 of this series was sent (2020-09);
-apparently, I did not have enough time or resource figuring out the exact
-difference between rtc-ls1x and rtc-ls2x to see if the two can in fact be
-merged, even today. Sorry for the long delay!
-
-According to the manuals, though, the initialization sequence and
-bitfield descriptions look certainly different, so I'm a bit wary about
-just going ahead and merging these. Per Tiezhu's suggestion in the
-previous thread, I'm just re-submitting this series with tags collected
-and Huacai's e-mail address updated. If anyone (probably Loongson guys?)
-could provide more information regarding the possible merger of rtc-ls1x
-and rtc-ls2x, that would be great.
-
This patch series adds support for the RTC module found on various
Loongson systems with the Loongson-2K SoC or the LS7A bridge chip.
The driver is rewritten from an out-of-tree version to meet mainline
standards. I write kernel code as a hobby, though, so there might still
be overlooked issues. Any suggestions are welcome.
-Note that, the Loongson-2K platform was upstreamed after v1 of this
-series, so v2 additionally contains enablement for it. I'm unable to
-test with my 2K board now, however, so Loongson guys, please test this
-series again on your collection of LS7A and 2K systems, thanks!
+Note when applying this series: the 3rd patch depends on
+commit 262623961478836b from the mips-next tree, so the series should
+preferably go in via mips-next. Otherwise the patch will conflict in the
+merge window anyway.
-v2:
-- Rebased on top of latest linux-next
-- Updated Huacai's e-mail address to the kernel.org one
-- Added collected tags
-- Added adaptation for newly upstreamed Loongson-2K platforms
-
-WANG Xuerui (6):
+WANG Xuerui (4):
rtc: ls2x: Add support for the Loongson-2K/LS7A RTC
dt-bindings: rtc: Add bindings for LS2X RTC
MIPS: Loongson64: DTS: Add RTC support to LS7A
MIPS: Loongson: Enable LS2X RTC in loongson3_defconfig
- MIPS: Loongson64: DTS: Add RTC support to Loongson-2K
- MIPS: Loongson: Enable LS2X RTC in loongson2k_defconfig
.../devicetree/bindings/rtc/trivial-rtc.yaml | 2 +
- .../boot/dts/loongson/loongson64-2k1000.dtsi | 5 +
arch/mips/boot/dts/loongson/ls7a-pch.dtsi | 5 +
- arch/mips/configs/loongson2k_defconfig | 1 +
arch/mips/configs/loongson3_defconfig | 1 +
drivers/rtc/Kconfig | 11 +
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc-ls2x.c | 225 ++++++++++++++++++
- 8 files changed, 251 insertions(+)
+ 6 files changed, 245 insertions(+)
create mode 100644 drivers/rtc/rtc-ls2x.c
--
-2.30.1
+2.28.0