commit 21d1aa4ef11e156f1c2f67cdaae4b7be5cd49a70
author yiting.deng <yiting.deng@amlogic.com> Wed Feb 08 17:46:11 2023 +0800
committer yiting.deng <yiting.deng@amlogic.com> Mon Feb 13 15:21:28 2023 +0800
tree e1b8c659bc288f9a9ed5c666f177083d1416a9cb
parent 068c9c3c328442aad8da6efacd49829886f9d902

rtc: a4 bl30 rtc pxp bringup [3/3]

PD#SWPL-108913

Problem:
a4 bl30 rtc pxp bringup

Solution:
a4 bl30 rtc pxp bringup

Verify:
pxp,a5

Change-Id: I313505eeb51c9f91b5d7cde200b20d101a88b330
Signed-off-by: yiting.deng <yiting.deng@amlogic.com>

rtc/rtc.c

diff --git a/rtc/rtc.c b/rtc/rtc.c
index a991597..a4da1ed 100644
--- a/rtc/rtc.c
+++ b/rtc/rtc.c
@@ -16,10 +16,23 @@
 #include "string.h"
 #include "interrupt.h"
 #include "suspend.h"
+#include "rtc_register.h"
 
 #undef TAG
 #define TAG "AOCPU RTC"
 
+static uint32_t gray_to_binary(uint32_t gray)
+{
+	uint32_t bcd = gray;
+	int size = sizeof(bcd) * 8;
+	int i;
+
+	for (i = 0; (1 << i) < size; i++)
+		bcd ^= bcd >> (1 << i);
+
+	return bcd;
+}
+
 static void vRTCInterruptHandler(void)
 {
 	uint32_t buf[4] = { 0 };
@@ -27,17 +40,17 @@
 	uint32_t reg_val;
 
 	/* Mask alarm0 irq */
-	reg_val = REG32(RTC_INT_MASK);
+	reg_val = REG32(RTC_DIG_INT_MASK);
 	reg_val |= 0x1;
-	REG32(RTC_INT_MASK) = reg_val;
+	REG32(RTC_DIG_INT_MASK) = reg_val;
 
 	/* Clear alarm0 */
-	REG32(RTC_ALARM0_REG) = 0;
+	REG32(RTC_DIG_ALARM0_REG) = 0;
 
-	alarm0_int_status = REG32(RTC_INT_STATUS) & (1 << RTC_INT_ALM0_IRQ);
+	alarm0_int_status = REG32(RTC_DIG_INT_STATUS) & (1 << RTC_INT_ALM0_IRQ);
 	/* Clear alarm0 int status */
 	if (alarm0_int_status)
-		REG32(RTC_INT_CLR) |= (1 << RTC_INT_CLR_ALM0_IRQ);
+		REG32(RTC_DIG_INT_CLR) |= (1 << RTC_INT_CLR_ALM0_IRQ);
 
 	printf("[%s]: rtc alarm fired\n", TAG);
 
@@ -88,7 +101,10 @@
 {
 	uint32_t reg_val;
 
-	reg_val = REG32(RTC_REAL_TIME);
+	reg_val = REG32(RTC_DIG_REAL_TIME);
+#ifdef CONFIG_RTC_STORAGE_FORMAT_GRAY
+	reg_val = gray_to_binary(reg_val);
+#endif
 	REG32(VRTC_STICKY_REG) = reg_val;
 }