Skip to content

Commit 06fb8ca

Browse files
committed
Revert "boards: mimxrt700_evk: Enable NS & NP GPIO0 access"
This reverts commit 40f0842. The PCNS and ICNS registers of the mimxrt798s's GPIO0 peripheral allow accesses to be set up only with mutual exclusivity (either the cm33_cpu0 or the hifi4), thus the access is reverted to the cm33_cpu0 domain. Signed-off-by: Vit Stanicek <[email protected]>
1 parent 32db67a commit 06fb8ca

File tree

1 file changed

+3
-20
lines changed

1 file changed

+3
-20
lines changed

boards/nxp/mimxrt700_evk/board.c

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -308,14 +308,9 @@ void board_early_init_hook(void)
308308
CLOCK_SetClkDiv(kCLOCK_DivFlexioClk, 1U);
309309
#endif
310310

311-
#if CONFIG_BOARD_MIMXRT700_EVK_MIMXRT798S_CM33_CPU0
311+
#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio0), okay)
312312
CLOCK_EnableClock(kCLOCK_Gpio0);
313313
RESET_ClearPeripheralReset(kGPIO0_RST_SHIFT_RSTn);
314-
315-
GPIO0->PCNS = 0xFFFFFFFFU;
316-
GPIO0->PCNP = 0xFFFFFFFFU;
317-
GPIO0->ICNP = 0xFFFFFFFFU;
318-
GPIO0->ICNS = 0xFFFFFFFFU;
319314
#endif
320315

321316
#if DT_NODE_HAS_STATUS(DT_NODELABEL(gpio1), okay)
@@ -459,9 +454,7 @@ void board_early_init_hook(void)
459454
CLOCK_AttachClk(kLPOSC_to_WWDT0);
460455
#endif
461456

462-
#if DT_NODE_HAS_STATUS(DT_NODELABEL(sai0), okay) \
463-
|| DT_NODE_HAS_STATUS(DT_NODELABEL(sai1), okay) \
464-
|| DT_NODE_HAS_STATUS(DT_NODELABEL(sai2), okay)
457+
#if DT_NODE_HAS_STATUS(DT_NODELABEL(sai0), okay)
465458
/* SAI clock 368.64 / 15 = 24.576MHz */
466459
CLOCK_AttachClk(kAUDIO_PLL_PFD3_to_AUDIO_VDD2);
467460
CLOCK_AttachClk(kAUDIO_VDD2_to_SAI012);
@@ -561,12 +554,10 @@ static void GlikeyClearConfig(GLIKEY_Type *base)
561554
static void BOARD_InitAHBSC(void)
562555
{
563556
#if defined(CONFIG_SOC_MIMXRT798S_CM33_CPU0)
564-
GlikeyWriteEnable(GLIKEY0, 0U);
565557
GlikeyWriteEnable(GLIKEY0, 1U);
566-
GlikeyWriteEnable(GLIKEY0, 2U);
558+
AHBSC0->MISC_CTRL_DP_REG = 0x000086aa;
567559
/* AHBSC0 MISC_CTRL_REG, disable Privilege & Secure checking. */
568560
AHBSC0->MISC_CTRL_REG = 0x000086aa;
569-
AHBSC0->MISC_CTRL_DP_REG = 0x000086aa;
570561

571562
GlikeyWriteEnable(GLIKEY0, 7U);
572563
/* Enable arbiter0 accessing SRAM */
@@ -575,14 +566,6 @@ static void BOARD_InitAHBSC(void)
575566
AHBSC0->MEDIA_ARB0RAM_ACCESS_ENABLE = 0x3FFFFFFF;
576567
AHBSC0->NPU_ARB0RAM_ACCESS_ENABLE = 0x3FFFFFFF;
577568
AHBSC0->HIFI4_ARB0RAM_ACCESS_ENABLE = 0x3FFFFFFF;
578-
579-
GlikeyWriteEnable(GLIKEY0, 6U);
580-
AHBSC0->MASTER_SEC_LEVEL = 0x3;
581-
AHBSC0->MASTER_SEC_ANTI_POL_REG = 0xFFC;
582-
583-
AHBSC0->APB_SLAVE_GROUP0_RULE0 = 0x00000000;
584-
AHBSC0->AHB_PERIPHERAL0_SLAVE_RULE1 = 0x00000000;
585-
AHBSC0->AIPS1_BRIDGE_GROUP0_MEM_RULE2 = 0x00000000;
586569
#endif
587570

588571
GlikeyWriteEnable(GLIKEY1, 1U);

0 commit comments

Comments
 (0)