michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: nxp_k2x: Correct and enable MCG clock controller binding

Browse source 
nxp_k2x.dtsi: Corrects Multipurpose Clock Generator binding
to utilize nxp,kinetis-mcg. Assign MCG to FlexTimer devices.
Enable FlexTimer clocks via System Integration Module clock
gate control registers.

Kconfig.defconfig.mk22f12: Enable default use of
CLOCK_CONTROL_MCUX_MCG when CLOCK_CONTROL is selected.

Signed-off-by: Ryan Holleran <rhollerar@gmail.com>
This commit is contained in:
Ryan Holleran 2021-01-29 23:18:32 -06:00 • committed by Anas Nashif
commit b417bb85d2
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dts/arm/nxp/nxp_k2x.dtsi
View file

@ -60,11 +60,10 @@
}; };
mcg: clock-controller@40064000 { mcg: clock-controller@40064000 {
compatible = "nxp,k22f-mcg"; compatible = "nxp,kinetis-mcg";
reg = <0x40064000 0xd>; reg = <0x40064000 0xd>;
system-clock-frequency = <120000000>; label = "MCG";
#clock-cells = <1>;
clock-controller;
}; };
osc: clock-controller@40065000 { osc: clock-controller@40065000 {
@ -298,6 +297,8 @@
compatible = "nxp,kinetis-ftm"; compatible = "nxp,kinetis-ftm";
reg = <0x40038000 0x98>; reg = <0x40038000 0x98>;
interrupts = <42 0>; interrupts = <42 0>;
clocks = <&mcg KINETIS_MCG_FIXED_FREQ_CLK>,
<&sim KINETIS_SIM_BUS_CLK 0x103C 24>;
prescaler = <16>; prescaler = <16>;
label = "FTM_0"; label = "FTM_0";
status = "disabled"; status = "disabled";
@ -307,6 +308,8 @@
compatible = "nxp,kinetis-ftm"; compatible = "nxp,kinetis-ftm";
reg = <0x40039000 0x98>; reg = <0x40039000 0x98>;
interrupts = <43 0>; interrupts = <43 0>;
clocks = <&mcg KINETIS_MCG_FIXED_FREQ_CLK>,
<&sim KINETIS_SIM_BUS_CLK 0x103C 25>;
prescaler = <16>; prescaler = <16>;
label = "FTM_1"; label = "FTM_1";
status = "disabled"; status = "disabled";
@ -316,6 +319,8 @@
compatible = "nxp,kinetis-ftm"; compatible = "nxp,kinetis-ftm";
reg = <0x4003a000 0x98>; reg = <0x4003a000 0x98>;
interrupts = <44 0>; interrupts = <44 0>;
clocks = <&mcg KINETIS_MCG_FIXED_FREQ_CLK>,
<&sim KINETIS_SIM_BUS_CLK 0x103C 26>;
prescaler = <16>; prescaler = <16>;
label = "FTM_2"; label = "FTM_2";
status = "disabled"; status = "disabled";
@ -325,6 +330,8 @@
compatible = "nxp,kinetis-ftm"; compatible = "nxp,kinetis-ftm";
reg = <0x400b9000 0x98>; reg = <0x400b9000 0x98>;
interrupts = <71 0>; interrupts = <71 0>;
clocks = <&mcg KINETIS_MCG_FIXED_FREQ_CLK>,
<&sim KINETIS_SIM_BUS_CLK 0x103C 6>;
prescaler = <16>; prescaler = <16>;
label = "FTM_3"; label = "FTM_3";
status = "disabled"; status = "disabled";

8
soc/arm/nxp_kinetis/k2x/Kconfig.defconfig.mk22f12
View file

@ -12,9 +12,15 @@ config ADC_MCUX_ADC16
default y default y
depends on ADC depends on ADC
if CLOCK_CONTROL
config CLOCK_CONTROL_MCUX_MCG
default y
config CLOCK_CONTROL_MCUX_SIM config CLOCK_CONTROL_MCUX_SIM
default y default y
depends on CLOCK_CONTROL
endif # CLOCK_CONTROL
config PINMUX_MCUX config PINMUX_MCUX
default y default y