From 62d2d362ac68b2e89b97af61dc5dc396715bbdad Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 26 Apr 2017 10:08:23 -0500 Subject: [PATCH] arm: nxp: kl2x: Move to using UART_MCUX_LPSCI for UART0 Cleanup soc code to enable UART_MCUX_LPSCI to support UART0. Change-Id: I173febffcffc902f228946124e0434f122a67607 Signed-off-by: Kumar Gala --- arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4 | 2 +- arch/arm/soc/nxp_kinetis/kl2x/Kconfig.soc | 1 + arch/arm/soc/nxp_kinetis/kl2x/soc.c | 6 ++++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4 b/arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4 index 22b9a69e274..c74f64ff910 100644 --- a/arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4 +++ b/arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4 @@ -31,7 +31,7 @@ endif # GPIO if SERIAL -config UART_MCUX +config UART_MCUX_LPSCI def_bool y endif # SERIAL diff --git a/arch/arm/soc/nxp_kinetis/kl2x/Kconfig.soc b/arch/arm/soc/nxp_kinetis/kl2x/Kconfig.soc index cedbb27f66a..8081d971918 100644 --- a/arch/arm/soc/nxp_kinetis/kl2x/Kconfig.soc +++ b/arch/arm/soc/nxp_kinetis/kl2x/Kconfig.soc @@ -15,6 +15,7 @@ config SOC_MKL25Z4 select HAS_MCUX select HAS_OSC select HAS_MCG + select HAS_LPSCI endchoice diff --git a/arch/arm/soc/nxp_kinetis/kl2x/soc.c b/arch/arm/soc/nxp_kinetis/kl2x/soc.c index d3777850176..11a15c78896 100644 --- a/arch/arm/soc/nxp_kinetis/kl2x/soc.c +++ b/arch/arm/soc/nxp_kinetis/kl2x/soc.c @@ -13,6 +13,8 @@ #include #include +#define LPSCI0SRC_MCGFLLCLK (1) + /******************************************************************************* * Variables ******************************************************************************/ @@ -93,8 +95,8 @@ static ALWAYS_INLINE void clkInit(void) CLOCK_SetInternalRefClkConfig(kMCG_IrclkEnable, kMCG_IrcSlow, 0); CLOCK_SetSimConfig(&simConfig); -#ifdef CONFIG_UART_MCUX_0 - CLOCK_SetLpsci0Clock(1); +#ifdef CONFIG_UART_MCUX_LPSCI_0 + CLOCK_SetLpsci0Clock(LPSCI0SRC_MCGFLLCLK); #endif }