Skip to contentSkip to conversation

xilinx: Add RTC support for Xilinx ZynqMP

PATCH Applied Michal Simek 2 participants 6 messages Jul 29, 2021 – Aug 6, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover xilinx: Add RTC support for Xilinx ZynqMP

Hi,

this series is correcting RTC uclass behavior to match RTC aliases to enable RTC_EMULATION driver with ZYNQMP driver. If DT node is present ZynqMP RTC is used. If not RTC emaulation is used.

The driver has been tested on Xilinx zcu104 also with booting to Linux to make sure that U-Boot format match with Linux format.

Thanks,
Michal

Michal Simek (4):
dm: rtc: uclass: Add flag to control sequence numbering
cmd: date: rtc: Update command to read the first RTC with seq 0
rtc: zynqmp: Add support for ZynqMP RTC
xilinx: zynqmp: Enable CMD_RTC command with Zynqmp RTC driver

 MAINTAINERS                          |   1 +
 cmd/date.c                           |   9 +-
 configs/xilinx_zynqmp_virt_defconfig |   2 +
 drivers/rtc/Kconfig                  |   7 ++
 drivers/rtc/Makefile                 |   1 +
 drivers/rtc/rtc-uclass.c             |   1 +
 drivers/rtc/zynqmp_rtc.c             | 158 +++++++++++++++++++++++++++
 7 files changed, 176 insertions(+), 3 deletions(-)
 create mode 100644 drivers/rtc/zynqmp_rtc.c
Signature · 1 line
2.32.0
#1 lore raw

PATCH 1/4 dm: rtc: uclass: Add flag to control sequence numbering

RTCs are using aliases for sequences. That's why enable DM_UC_FLAG_SEQ_ALIAS for exact RTC indentification.
The same flag is used by a lot of other uclasses like mmc, pci, serial, spi, timer, tpm, etc.

---

 drivers/rtc/rtc-uclass.c | 1 +
 1 file changed, 1 insertion(+)
drivers/rtc/rtc-uclass.c +1 -0
index be6a2ddb6671..321b8732ed9a 100644
@@ -176,6 +176,7 @@ int rtc_write32(struct udevice *dev, unsigned int reg, u32 value)
 UCLASS_DRIVER(rtc) = {
 	.name		= "rtc",
 	.id		= UCLASS_RTC,
+	.flags		= DM_UC_FLAG_SEQ_ALIAS,
 #if !CONFIG_IS_ENABLED(OF_PLATDATA)
 	.post_bind	= dm_scan_fdt_dev,
 #endif
Signature · 1 line
2.32.0
#2 lore raw

PATCH 2/4 cmd: date: rtc: Update command to read the first RTC with seq 0

In reply to Michal Simek

RTCs are using sequence number defined in aliases node. Date command with DM_RTC enabled is looking for the first RTC with index 0. But when RTC_EMULATION is enabled it gets likely most of the time index 0 even when system has rtc0 device via aliases node and gets sequence number 0. That's why extend the code to look for sequence 0 number first. If this fails continue to use existing device with index 0.

---

 cmd/date.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
cmd/date.c +6 -3
index 0e1189475313..5d5c20a59af9 100644
@@ -41,10 +41,13 @@ static int do_date(struct cmd_tbl *cmdtp, int flag, int argc,
 #ifdef CONFIG_DM_RTC
 	struct udevice *dev;
 
-	rcode = uclass_get_device(UCLASS_RTC, 0, &dev);
+	rcode = uclass_get_device_by_seq(UCLASS_RTC, 0, &dev);
 	if (rcode) {
-		printf("Cannot find RTC: err=%d\n", rcode);
-		return CMD_RET_FAILURE;
+		rcode = uclass_get_device(UCLASS_RTC, 0, &dev);
+		if (rcode) {
+			printf("Cannot find RTC: err=%d\n", rcode);
+			return CMD_RET_FAILURE;
+		}
 	}
 #elif defined(CONFIG_SYS_I2C)
 	old_bus = i2c_get_bus_num();
Signature · 1 line
2.32.0
#3 lore raw

PATCH 3/4 rtc: zynqmp: Add support for ZynqMP RTC

In reply to Michal Simek

The whole driver logic is taken from Linux kernel but only set/get/reset functions are implemented. When device is power off RTC is power out of battery.

---

 MAINTAINERS              |   1 +
 drivers/rtc/Kconfig      |   7 ++
 drivers/rtc/Makefile     |   1 +
 drivers/rtc/zynqmp_rtc.c | 158 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 167 insertions(+)
 create mode 100644 drivers/rtc/zynqmp_rtc.c
MAINTAINERS +1 -0
index 8a18b3b6d939..5734ebb80363 100644
@@ -600,6 +600,7 @@ F:	drivers/mtd/nand/raw/zynq_nand.c
 F:	drivers/net/phy/xilinx_phy.c
 F:	drivers/net/zynq_gem.c
 F:	drivers/serial/serial_zynq.c
+F:	drivers/rtc/zynqmp_rtc.c
 F:	drivers/spi/zynq_qspi.c
 F:	drivers/spi/zynq_spi.c
 F:	drivers/timer/cadence-ttc.c
drivers/rtc/Kconfig +7 -0
index cbdfddb80f66..b6692e62df1c 100644
@@ -195,4 +195,11 @@ config RTC_DAVINCI
 	  Say "yes" here to support the on chip real time clock
 	  present on TI OMAP1, AM33xx, DA8xx/OMAP-L13x, AM43xx and DRA7xx.
 
+config RTC_ZYNQMP
+	bool "Enable ZynqMP RTC driver"
+	depends on ARCH_ZYNQMP
+	help
+	  Say "yes" here to support the on chip real time clock
+	  present on Xilinx ZynqMP SoC.
+
 endmenu
drivers/rtc/Makefile +1 -0
index 331a49ab599a..d621be622848 100644
@@ -57,3 +57,4 @@ obj-$(CONFIG_RTC_STM32) += stm32_rtc.o
 obj-$(CONFIG_SANDBOX) += sandbox_rtc.o
 obj-$(CONFIG_RTC_X1205) += x1205.o
 obj-$(CONFIG_RTC_ABX80X) += abx80x.o
+obj-$(CONFIG_RTC_ZYNQMP) += zynqmp_rtc.o
drivers/rtc/zynqmp_rtc.c new file +158 -0

158 lines not on this page · raw message

Signature · 1 line
2.32.0
#4 lore raw

PATCH 4/4 xilinx: zynqmp: Enable CMD_RTC command with Zynqmp RTC driver

In reply to Michal Simek

Enable RTC command to be able to check available.
And also enable ZynqMP RTC driver to be possible to use by default.

Here is the list when both drivers are enabled:
ZynqMP> rtc list
RTC #0 - rtc_emul
RTC #1 - rtc@ffa60000

---

 configs/xilinx_zynqmp_virt_defconfig | 2 ++
 1 file changed, 2 insertions(+)
configs/xilinx_zynqmp_virt_defconfig +2 -0
index a1a3526f3c5f..9a45ccb5287c 100644
@@ -62,6 +62,7 @@ CONFIG_CMD_TFTPPUT=y
 CONFIG_CMD_BMP=y
 CONFIG_CMD_CACHE=y
 CONFIG_CMD_EFIDEBUG=y
+CONFIG_CMD_RTC=y
 CONFIG_CMD_TIME=y
 CONFIG_CMD_GETTIME=y
 CONFIG_CMD_TIMER=y
@@ -153,6 +154,7 @@ CONFIG_DM_REGULATOR=y
 CONFIG_DM_REGULATOR_FIXED=y
 CONFIG_DM_RTC=y
 CONFIG_RTC_EMULATION=y
+CONFIG_RTC_ZYNQMP=y
 CONFIG_SCSI=y
 CONFIG_DM_SCSI=y
 CONFIG_ARM_DCC=y
Signature · 1 line
2.32.0
Applied
#5 lore raw
In reply to Michal Simek

čt 29. 7. 2021 v 13:36 odesílatel Michal Simek <[email protected]> napsal:

Quoted 30 lines

Hi,

this series is correcting RTC uclass behavior to match RTC aliases to enable RTC_EMULATION driver with ZYNQMP driver. If DT node is present ZynqMP RTC is used. If not RTC emaulation is used.

The driver has been tested on Xilinx zcu104 also with booting to Linux to make sure that U-Boot format match with Linux format.

Thanks,
Michal

Michal Simek (4):
dm: rtc: uclass: Add flag to control sequence numbering
cmd: date: rtc: Update command to read the first RTC with seq 0
rtc: zynqmp: Add support for ZynqMP RTC
xilinx: zynqmp: Enable CMD_RTC command with Zynqmp RTC driver

 MAINTAINERS                          |   1 +
 cmd/date.c                           |   9 +-
 configs/xilinx_zynqmp_virt_defconfig |   2 +
 drivers/rtc/Kconfig                  |   7 ++
 drivers/rtc/Makefile                 |   1 +
 drivers/rtc/rtc-uclass.c             |   1 +
 drivers/rtc/zynqmp_rtc.c             | 158 +++++++++++++++++++++++++++
 7 files changed, 176 insertions(+), 3 deletions(-)
 create mode 100644 drivers/rtc/zynqmp_rtc.c
Quoted 3 lines

--
2.32.0

Applied.
M

Signature · 5 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs