diff --git a/boards/arm/twr_ke18f/twr_ke18f.dts b/boards/arm/twr_ke18f/twr_ke18f.dts index cff5ba75507..a529f84a6ff 100644 --- a/boards/arm/twr_ke18f/twr_ke18f.dts +++ b/boards/arm/twr_ke18f/twr_ke18f.dts @@ -77,32 +77,32 @@ pwmleds { compatible = "pwm-leds"; orange_pwm_led: led_pwm_0 { - pwms = <&ftm3 7 60000>; + pwms = <&pwm3 7 60000>; label = "User PWM LED D9"; }; yellow_pwm_led: led_pwm_1 { - pwms = <&ftm3 6 60000>; + pwms = <&pwm3 6 60000>; label = "User PWM LED D8"; }; green_pwm_led: led_pwm_2 { - pwms = <&ftm3 5 60000>; + pwms = <&pwm3 5 60000>; label = "User PWM LED D7"; }; red_pwm_led: led_pwm_3 { - pwms = <&ftm3 4 60000>; + pwms = <&pwm3 4 60000>; label = "User PWM LED D6"; }; tri_red_pwm_led: led_pwm_4 { - pwms = <&ftm0 1 60000>; + pwms = <&pwm0 1 60000>; label = "User Tricolor PWM LED D5 (Red)"; }; tri_green_pwm_led: led_pwm_5 { - pwms = <&ftm0 0 60000>; + pwms = <&pwm0 0 60000>; label = "User Tricolor PWM LED D5 (Green)"; }; tri_blue_pwm_led: led_pwm_6 { - pwms = <&ftm0 5 60000>; + pwms = <&pwm0 5 60000>; label = "User Tricolor PWM LED D5 (Blue)"; }; }; @@ -158,11 +158,11 @@ current-speed = <115200>; }; -&ftm0 { +&pwm0 { status = "okay"; }; -&ftm3 { +&pwm3 { status = "okay"; }; diff --git a/dts/arm/nxp/nxp_ke1xf.dtsi b/dts/arm/nxp/nxp_ke1xf.dtsi index 362a5449a41..af8e8a7e049 100644 --- a/dts/arm/nxp/nxp_ke1xf.dtsi +++ b/dts/arm/nxp/nxp_ke1xf.dtsi @@ -34,10 +34,10 @@ adc-0 = &adc0; adc-1 = &adc1; adc-2 = &adc2; - ftm-0 = &ftm0; - ftm-1 = &ftm1; - ftm-2 = &ftm2; - ftm-3 = &ftm3; + pwm-0 = &pwm0; + pwm-1 = &pwm1; + pwm-2 = &pwm2; + pwm-3 = &pwm3; }; cpus { @@ -344,42 +344,42 @@ #io-channel-cells = <1>; }; - ftm0: pwm@40038000 { + pwm0: pwm@40038000 { compatible = "nxp,kinetis-ftm"; reg = <0x40038000 0x1000>; interrupts = <42 0>; clocks = <&pcc 0xe0 KINETIS_PCC_SRC_FIRC_ASYNC>; - label = "FTM_0"; + label = "PWM_0"; #pwm-cells = <2>; status = "disabled"; }; - ftm1: pwm@40039000 { + pwm1: pwm@40039000 { compatible = "nxp,kinetis-ftm"; reg = <0x40039000 0x1000>; interrupts = <43 0>; clocks = <&pcc 0xe4 KINETIS_PCC_SRC_FIRC_ASYNC>; - label = "FTM_1"; + label = "PWM_1"; #pwm-cells = <2>; status = "disabled"; }; - ftm2: pwm@4003a000 { + pwm2: pwm@4003a000 { compatible = "nxp,kinetis-ftm"; reg = <0x4003a000 0x1000>; interrupts = <44 0>; clocks = <&pcc 0xe8 KINETIS_PCC_SRC_FIRC_ASYNC>; - label = "FTM_2"; + label = "PWM_2"; #pwm-cells = <2>; status = "disabled"; }; - ftm3: pwm@40026000 { + pwm3: pwm@40026000 { compatible = "nxp,kinetis-ftm"; reg = <0x40026000 0x1000>; interrupts = <71 0>; clocks = <&pcc 0x98 KINETIS_PCC_SRC_FIRC_ASYNC>; - label = "FTM_3"; + label = "PWM_3"; #pwm-cells = <2>; status = "disabled"; }; diff --git a/soc/arm/nxp_kinetis/ke1xf/soc.c b/soc/arm/nxp_kinetis/ke1xf/soc.c index 1a7f3bed51a..ae12ed3978b 100644 --- a/soc/arm/nxp_kinetis/ke1xf/soc.c +++ b/soc/arm/nxp_kinetis/ke1xf/soc.c @@ -196,17 +196,17 @@ static ALWAYS_INLINE void clk_init(void) #ifdef DT_NXP_KINETIS_ADC12_ADC_2_CLOCK_IP_SOURCE CLOCK_SetIpSrc(kCLOCK_Adc2, DT_NXP_KINETIS_ADC12_ADC_2_CLOCK_IP_SOURCE); #endif -#ifdef DT_NXP_KINETIS_FTM_FTM_0_CLOCK_IP_SOURCE - CLOCK_SetIpSrc(kCLOCK_Ftm0, DT_NXP_KINETIS_FTM_FTM_0_CLOCK_IP_SOURCE); +#ifdef DT_NXP_KINETIS_FTM_PWM_0_CLOCK_IP_SOURCE + CLOCK_SetIpSrc(kCLOCK_Ftm0, DT_NXP_KINETIS_FTM_PWM_0_CLOCK_IP_SOURCE); #endif -#ifdef DT_NXP_KINETIS_FTM_FTM_1_CLOCK_IP_SOURCE - CLOCK_SetIpSrc(kCLOCK_Ftm1, DT_NXP_KINETIS_FTM_FTM_1_CLOCK_IP_SOURCE); +#ifdef DT_NXP_KINETIS_FTM_PWM_1_CLOCK_IP_SOURCE + CLOCK_SetIpSrc(kCLOCK_Ftm1, DT_NXP_KINETIS_FTM_PWM_1_CLOCK_IP_SOURCE); #endif -#ifdef DT_NXP_KINETIS_FTM_FTM_2_CLOCK_IP_SOURCE - CLOCK_SetIpSrc(kCLOCK_Ftm2, DT_NXP_KINETIS_FTM_FTM_2_CLOCK_IP_SOURCE); +#ifdef DT_NXP_KINETIS_FTM_PWM_2_CLOCK_IP_SOURCE + CLOCK_SetIpSrc(kCLOCK_Ftm2, DT_NXP_KINETIS_FTM_PWM_2_CLOCK_IP_SOURCE); #endif -#ifdef DT_NXP_KINETIS_FTM_FTM_3_CLOCK_IP_SOURCE - CLOCK_SetIpSrc(kCLOCK_Ftm3, DT_NXP_KINETIS_FTM_FTM_3_CLOCK_IP_SOURCE); +#ifdef DT_NXP_KINETIS_FTM_PWM_3_CLOCK_IP_SOURCE + CLOCK_SetIpSrc(kCLOCK_Ftm3, DT_NXP_KINETIS_FTM_PWM_3_CLOCK_IP_SOURCE); #endif }