Skip to content

Commit

Permalink
imxrt:Correct register usage in up_rtc_settime
Browse files Browse the repository at this point in the history
  • Loading branch information
davids5 authored and xiaoxiang781216 committed Aug 5, 2022
1 parent 5e90286 commit 1421bc5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions arch/arm/src/imxrt/hardware/imxrt_snvs.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
#define IMXRT_SNVS_LPLR_OFFSET 0x0034 /* SNVS_LP Lock Register */
#define IMXRT_SNVS_LPCR_OFFSET 0x0038 /* SNVS_LP Control Register */
#define IMXRT_SNVS_LPSR_OFFSET 0x004c /* SNVS_LP Status Register */
#define IMXRT_SNVS_LPSRTCMR_OFFSET 0x0050 /* SNVS_LP Secure Real Time Counter MSB Register */
#define IMXRT_SNVS_LPSRTCLR_OFFSET 0x0054 /* SNVS_LP Secure Real Time Counter LSB Register */
#define IMXRT_SNVS_LPSMCMR_OFFSET 0x005c /* SNVS_LP Secure Monotonic Counter MSB Register */
#define IMXRT_SNVS_LPSMCLR_OFFSET 0x0060 /* SNVS_LP Secure Monotonic Counter LSB Register */

Expand Down Expand Up @@ -80,6 +82,8 @@
#define IMXRT_SNVS_LPLR (IMXRT_SNVSHP_BASE + IMXRT_SNVS_LPLR_OFFSET)
#define IMXRT_SNVS_LPCR (IMXRT_SNVSHP_BASE + IMXRT_SNVS_LPCR_OFFSET)
#define IMXRT_SNVS_LPSR (IMXRT_SNVSHP_BASE + IMXRT_SNVS_LPSR_OFFSET)
#define IMXRT_SNVS_LPSRTCMR (IMXRT_SNVSHP_BASE + IMXRT_SNVS_LPSRTCMR_OFFSET)
#define IMXRT_SNVS_LPSRTCLR (IMXRT_SNVSHP_BASE + IMXRT_SNVS_LPSRTCLR_OFFSET)
#define IMXRT_SNVS_LPSMCMR (IMXRT_SNVSHP_BASE + IMXRT_SNVS_LPSMCMR_OFFSET)
#define IMXRT_SNVS_LPSMCLR (IMXRT_SNVSHP_BASE + IMXRT_SNVS_LPSMCLR_OFFSET)

Expand Down
8 changes: 4 additions & 4 deletions arch/arm/src/imxrt/imxrt_lpsrtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -193,10 +193,10 @@ int up_rtc_settime(const struct timespec *ts)
/* Disable the LPSRTC */

regval = getreg32(IMXRT_SNVS_LPCR);
regval &= ~SNVS_LPCR_MCENV;
regval &= ~SVNS_LPCR_SRTCENV;
putreg32(regval, IMXRT_SNVS_LPCR);

while ((getreg32(IMXRT_SNVS_LPCR) & SNVS_LPCR_MCENV) != 0)
while ((getreg32(IMXRT_SNVS_LPCR) & SVNS_LPCR_SRTCENV) != 0)
{
}

Expand All @@ -207,8 +207,8 @@ int up_rtc_settime(const struct timespec *ts)
* IMXRT_SNVS_LPSMCLR 32-bit LSB of alarm setting.
*/

putreg32((uint32_t)ts->tv_sec >> 17, IMXRT_SNVS_LPSMCMR);
putreg32((uint32_t)ts->tv_sec << 15, IMXRT_SNVS_LPSMCLR);
putreg32((uint32_t)ts->tv_sec >> 17, IMXRT_SNVS_LPSRTCMR);
putreg32((uint32_t)ts->tv_sec << 15, IMXRT_SNVS_LPSRTCLR);

/* The time has been set */

Expand Down

0 comments on commit 1421bc5

Please sign in to comment.