From f5ebc300873e8445ebf855a5b9eec983429a7c89 Mon Sep 17 00:00:00 2001 From: Daniel DeGrasse Date: Tue, 14 Dec 2021 10:26:06 -0600 Subject: [PATCH] soc: imx_rt: Enable IMX.RT General Power Controller Driver GPC driver is used for power management operations on RT series SoCs. Enable inclusion of the driver into the build. Signed-off-by: Daniel DeGrasse --- modules/Kconfig.mcux | 5 +++++ soc/arm/nxp_imx/rt/Kconfig.defconfig.series | 15 ++++----------- soc/arm/nxp_imx/rt/Kconfig.soc | 7 +++++++ west.yml | 2 +- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/modules/Kconfig.mcux b/modules/Kconfig.mcux index 3cd9104a20d..b8ae9fac0f6 100644 --- a/modules/Kconfig.mcux +++ b/modules/Kconfig.mcux @@ -136,6 +136,11 @@ config HAS_MCUX_GPT help Set if the general purpose timer (GPT) module is present in the SoC. +config HAS_MCUX_GPC + bool + help + Set if the general power controller (GPC) module is present in the SoC. + config HAS_MCUX_SNVS bool help diff --git a/soc/arm/nxp_imx/rt/Kconfig.defconfig.series b/soc/arm/nxp_imx/rt/Kconfig.defconfig.series index 749dc9b48f6..e868963727f 100644 --- a/soc/arm/nxp_imx/rt/Kconfig.defconfig.series +++ b/soc/arm/nxp_imx/rt/Kconfig.defconfig.series @@ -95,6 +95,10 @@ config WDT_MCUX_IMX_WDOG default y depends on WATCHDOG +config PM_MCUX_GPC + default y if HAS_MCUX_GPC + depends on SOC_SERIES_IMX_RT11XX && PM + if CODE_SEMC config FLASH_SIZE @@ -198,17 +202,6 @@ config TEST_EXTRA_STACKSIZE default 1024 endif # MBEDTLS -if MCUX_GPT_TIMER - -# set the tick per sec as a divider of the GPT clock source -config SYS_CLOCK_TICKS_PER_SEC - default 8192 - -config SYS_CLOCK_HW_CYCLES_PER_SEC - default 32786 - -endif #MCUX_GPT_TIMER - source "soc/arm/nxp_imx/rt/Kconfig.defconfig.mimxrt*" endif # SOC_SERIES_IMX_RT diff --git a/soc/arm/nxp_imx/rt/Kconfig.soc b/soc/arm/nxp_imx/rt/Kconfig.soc index 698aedca26f..d95a9321756 100644 --- a/soc/arm/nxp_imx/rt/Kconfig.soc +++ b/soc/arm/nxp_imx/rt/Kconfig.soc @@ -295,6 +295,7 @@ config SOC_MIMXRT1176_CM7 select HAS_MCUX_USDHC1 select HAS_MCUX_USDHC2 select HAS_MCUX_ENET + select HAS_MCUX_GPC config SOC_MIMXRT1176_CM4 bool "SOC_MIMXRT1176_CM4" @@ -319,6 +320,7 @@ config SOC_MIMXRT1176_CM4 select HAS_MCUX_USDHC1 select HAS_MCUX_USDHC2 select HAS_MCUX_ENET + select HAS_MCUX_GPC config SOC_MIMXRT1166_CM7 bool "SOC_MIMXRT1166_CM7" @@ -350,6 +352,7 @@ config SOC_MIMXRT1166_CM7 select HAS_MCUX_USDHC1 select HAS_MCUX_USDHC2 select HAS_MCUX_ENET + select HAS_MCUX_GPC config SOC_MIMXRT1166_CM4 @@ -375,6 +378,7 @@ config SOC_MIMXRT1166_CM4 select HAS_MCUX_USDHC1 select HAS_MCUX_USDHC2 select HAS_MCUX_ENET + select HAS_MCUX_GPC endchoice @@ -598,6 +602,9 @@ config BYPASS_LDO_LPSR config ADJUST_LDO bool "Adjust LDO setting" +config PM_MCUX_GPC + bool "MCUX general power controller driver" + menuconfig NXP_IMX_RT_BOOT_HEADER bool "Enable the boot header" depends on !BOOTLOADER_MCUBOOT diff --git a/west.yml b/west.yml index 212b7936096..9e77031323d 100644 --- a/west.yml +++ b/west.yml @@ -98,7 +98,7 @@ manifest: groups: - hal - name: hal_nxp - revision: 66db7c2a57ec1adfd3574169346ed3af9bf17c0b + revision: 36ef159c6b3aaf023e89b48cce7cdc34899ae650 path: modules/hal/nxp groups: - hal