Skip to content

Commit bbb2aa4

Browse files
thenguyenyfKhiemNguyenT
thenguyenyf
authored and
KhiemNguyenT
committed
hal: renesas: ra: add ofs setting for WDT
Reflect OFS setting for WDT from Zephyr Kconfig value Signed-off-by: The Nguyen <[email protected]> Signed-off-by: Khoa Nguyen <[email protected]>
1 parent 123bce8 commit bbb2aa4

22 files changed

+160
-27
lines changed

‎drivers/ra/README

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ Patch List:
130130
* Reflect OFS setting for WDT from Zephyr Kconfig value
131131
Impacted files:
132132
zephyr/ra/ra_cfg/fsp_cfg/bsp/**/bsp_mcu_family_cfg.h
133+
zephyr/ra/ra_cfg/fsp_cfg/bsp/**/bsp_mcu_ofs_cfg.h
133134

134135
* Correct IO define for R_ELC_ELSEGR_Type on RA8M1, RA8D1, RA8T1
135136
Impacted files:

‎zephyr/ra/ra_cfg/fsp_cfg/bsp/ra2a1/bsp_mcu_ofs_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,15 @@
99
#ifndef BSP_MCU_OFS_CFG_H_
1010
#define BSP_MCU_OFS_CFG_H_
1111

12+
/* OFS0 WDT configurations */
13+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
14+
#define WDTSTRT (0)
15+
#else
16+
#define WDTSTRT (1)
17+
#endif /* CONFIG_WDT_RENESAS_RA_START_IN_BOOT */
18+
1219
#define OFS_IWDT (0xA001A001 | 1 << 1 | 3 << 2 | 15 << 4 | 3 << 8 | 3 << 10 | 1 << 12 | 1 << 14)
13-
#define OFS_WDT (1 << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
20+
#define OFS_WDT (WDTSTRT << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
1421
#define BSP_CFG_OPTION_SETTING_OFS0 (OFS_IWDT | OFS_WDT)
1522
#define BSP_CFG_OPTION_SETTING_OFS1_NO_HOCOFRQ (0xFFFF8EC3 | (1 <<2) | (3 << 3) | (1 << 8))
1623

‎zephyr/ra/ra_cfg/fsp_cfg/bsp/ra2l1/bsp_mcu_ofs_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,15 @@
99
#ifndef BSP_MCU_OFS_CFG_H_
1010
#define BSP_MCU_OFS_CFG_H_
1111

12+
/* OFS0 WDT configurations */
13+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
14+
#define WDTSTRT (0)
15+
#else
16+
#define WDTSTRT (1)
17+
#endif /* CONFIG_WDT_RENESAS_RA_START_IN_BOOT */
18+
1219
#define OFS_IWDT (0xA001A001 | 1 << 1 | 3 << 2 | 15 << 4 | 3 << 8 | 3 << 10 | 1 << 12 | 1 << 14)
13-
#define OFS_WDT (1 << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
20+
#define OFS_WDT (WDTSTRT << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
1421
#define BSP_CFG_OPTION_SETTING_OFS0 (OFS_IWDT | OFS_WDT)
1522
#define BSP_CFG_OPTION_SETTING_OFS1_NO_HOCOFRQ (0x7FFF8EC3 | 1 <<2 | 3 << 3 | 1 << 8 | 1 << 31)
1623

‎zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4e1/bsp_mcu_ofs_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,15 @@
1010
#define BSP_MCU_OFS_CFG_H_
1111

1212
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0))
13+
/* OFS0 WDT configurations */
14+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
15+
#define WDTSTRT (0)
16+
#else
17+
#define WDTSTRT (1)
18+
#endif /* CONFIG_WDT_RENESAS_RA_START_IN_BOOT */
19+
1320
#define OFS_IWDT (0xA001A001 | 1 << 1 | 3 << 2 | 15 << 4 | 3 << 8 | 3 << 10 | 1 << 12 | 1 << 14)
14-
#define OFS_WDT (1 << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
21+
#define OFS_WDT (WDTSTRT << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
1522
#define BSP_CFG_OPTION_SETTING_OFS0 (OFS_IWDT | OFS_WDT)
1623
#endif /* option_setting_ofs0 */
1724

‎zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4e2/bsp_mcu_ofs_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,15 @@
1010
#define BSP_MCU_OFS_CFG_H_
1111

1212
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0))
13+
/* OFS0 WDT configurations */
14+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
15+
#define WDTSTRT (0)
16+
#else
17+
#define WDTSTRT (1)
18+
#endif /* CONFIG_WDT_RENESAS_RA_START_IN_BOOT */
19+
1320
#define OFS_IWDT (0xA001A001 | 1 << 1 | 3 << 2 | 15 << 4 | 3 << 8 | 3 << 10 | 1 << 12 | 1 << 14)
14-
#define OFS_WDT (1 << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
21+
#define OFS_WDT (WDTSTRT << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
1522
#define BSP_CFG_OPTION_SETTING_OFS0 (OFS_IWDT | OFS_WDT)
1623
#endif /* option_setting_ofs0 */
1724

‎zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4l1/bsp_mcu_ofs_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,15 @@
1010
#define BSP_MCU_OFS_CFG_H_
1111

1212
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0))
13+
/* OFS0 WDT configurations */
14+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
15+
#define WDTSTRT (0)
16+
#else
17+
#define WDTSTRT (1)
18+
#endif /* CONFIG_WDT_RENESAS_RA_START_IN_BOOT */
19+
1320
#define OFS_IWDT (0xA001A001 | 1 << 1 | 3 << 2 | 15 << 4 | 3 << 8 | 3 << 10 | 1 << 12 | 1 << 14)
14-
#define OFS_WDT (1 << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
21+
#define OFS_WDT (WDTSTRT << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
1522
#define BSP_CFG_OPTION_SETTING_OFS0 (OFS_IWDT | OFS_WDT)
1623
#endif /* option_setting_ofs0 */
1724

‎zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4m1/bsp_mcu_family_cfg.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ extern "C" {
3838
#define BSP_CLOCK_CFG_MAIN_OSC_WAIT (9)
3939
#endif
4040

41-
/* OFS0 WDT configurations */
42-
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
43-
#define WDTSTRT (0)
44-
#else
45-
#define WDTSTRT (1)
46-
#endif
47-
4841
/* Used to create IELS values for the interrupt initialization table
4942
* g_interrupt_event_link_select. */
5043
#define BSP_PRV_IELS_ENUM(vector) CONCAT(ELC_, vector)

‎zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4m1/bsp_mcu_ofs_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,15 @@
99
#ifndef BSP_MCU_OFS_CFG_H_
1010
#define BSP_MCU_OFS_CFG_H_
1111

12+
/* OFS0 WDT configurations */
13+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
14+
#define WDTSTRT (0)
15+
#else
16+
#define WDTSTRT (1)
17+
#endif /* CONFIG_WDT_RENESAS_RA_START_IN_BOOT */
18+
1219
#define OFS_IWDT (0xA001A001 | 1 << 1 | 3 << 2 | 15 << 4 | 3 << 8 | 3 << 10 | 1 << 12 | 1 << 14)
13-
#define OFS_WDT (1 << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
20+
#define OFS_WDT (WDTSTRT << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
1421
#define BSP_CFG_OPTION_SETTING_OFS0 (OFS_IWDT | OFS_WDT)
1522
#define BSP_CFG_OPTION_SETTING_OFS1_NO_HOCOFRQ (0xFFFF8EC3 | (1 <<2) | (3 << 3) | (1 << 8))
1623

‎zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4m2/bsp_mcu_ofs_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,15 @@
1010
#define BSP_MCU_OFS_CFG_H_
1111

1212
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0))
13+
/* OFS0 WDT configurations */
14+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
15+
#define WDTSTRT (0)
16+
#else
17+
#define WDTSTRT (1)
18+
#endif /* CONFIG_WDT_RENESAS_RA_START_IN_BOOT */
19+
1320
#define OFS_IWDT (0xA001A001 | 1 << 1 | 3 << 2 | 15 << 4 | 3 << 8 | 3 << 10 | 1 << 12 | 1 << 14)
14-
#define OFS_WDT (1 << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
21+
#define OFS_WDT (WDTSTRT << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
1522
#define BSP_CFG_OPTION_SETTING_OFS0 (OFS_IWDT | OFS_WDT)
1623
#endif /* option_setting_ofs0 */
1724

‎zephyr/ra/ra_cfg/fsp_cfg/bsp/ra4m3/bsp_mcu_ofs_cfg.h

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,15 @@
1010
#define BSP_MCU_OFS_CFG_H_
1111

1212
#if DT_NODE_HAS_STATUS_OKAY(DT_NODELABEL(option_setting_ofs0))
13+
/* OFS0 WDT configurations */
14+
#ifdef CONFIG_WDT_RENESAS_RA_START_IN_BOOT
15+
#define WDTSTRT (0)
16+
#else
17+
#define WDTSTRT (1)
18+
#endif /* CONFIG_WDT_RENESAS_RA_START_IN_BOOT */
19+
1320
#define OFS_IWDT (0xA001A001 | 1 << 1 | 3 << 2 | 15 << 4 | 3 << 8 | 3 << 10 | 1 << 12 | 1 << 14)
14-
#define OFS_WDT (1 << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
21+
#define OFS_WDT (WDTSTRT << 17 | 3 << 18 | 15 << 20 | 3 << 24 | 3 << 26 | 1 << 28 | 1 << 30)
1522
#define BSP_CFG_OPTION_SETTING_OFS0 (OFS_IWDT | OFS_WDT)
1623
#endif /* option_setting_ofs0 */
1724

0 commit comments

Comments
 (0)