diff --git a/boards/arm/frdm_k22f/frdm_k22f.dts b/boards/arm/frdm_k22f/frdm_k22f.dts index 4e4003aef20..9bc59cfccca 100644 --- a/boards/arm/frdm_k22f/frdm_k22f.dts +++ b/boards/arm/frdm_k22f/frdm_k22f.dts @@ -107,7 +107,7 @@ arduino_spi: &spi0 { status = "okay"; }; -&pwm3 { +&ftm3 { status = "okay"; }; @@ -116,7 +116,7 @@ arduino_spi: &spi0 { current-speed = <115200>; }; -&usbd { +&usbotg { compatible = "nxp,kinetis-usbd"; status = "okay"; num-bidir-endpoints = <8>; diff --git a/dts/arm/nxp/nxp_k2x.dtsi b/dts/arm/nxp/nxp_k2x.dtsi index c3fbc9d26fc..76a38d253e2 100644 --- a/dts/arm/nxp/nxp_k2x.dtsi +++ b/dts/arm/nxp/nxp_k2x.dtsi @@ -24,22 +24,22 @@ gpio-e = &gpioe; i2c-0 = &i2c0; i2c-1 = &i2c1; - pinmux-a = &pinmux_a; - pinmux-b = &pinmux_b; - pinmux-c = &pinmux_c; - pinmux-d = &pinmux_d; - pinmux-e = &pinmux_e; - pwm-0 = &pwm0; - pwm-1 = &pwm1; - pwm-2 = &pwm2; - pwm-3 = &pwm3; + pinmux-a = &porta; + pinmux-b = &portb; + pinmux-c = &portc; + pinmux-d = &portd; + pinmux-e = &porte; + pwm-0 = &ftm0; + pwm-1 = &ftm1; + pwm-2 = &ftm2; + pwm-3 = &ftm3; spi-0 = &spi0; spi-1 = &spi1; uart-0 = &uart0; uart-1 = &uart1; uart-2 = &uart2; uart-3 = &uart3; - usbd-0 = &usbd; + usbd-0 = &usbotg; watchdog0 = &wdog; }; @@ -75,8 +75,7 @@ }; soc { - - mpu@4000d000 { + mpu: mpu@4000d000 { compatible = "nxp,k22f-mpu"; reg = <0x4000d000 0x824>; @@ -91,14 +90,14 @@ clock-controller; }; - clock-controller@40065000 { + osc: clock-controller@40065000 { compatible = "nxp,k22f-osc"; reg = <0x40065000 0x4>; enable-external-reference; }; - rtc@4003d000 { + rtc: rtc@4003d000 { compatible = "nxp,k22f-rtc"; reg = <0x4003d000 0x808>; clock-frequency = <32768>; @@ -199,31 +198,31 @@ status = "disabled"; }; - pinmux_a: pinmux@40049000 { + porta: pinmux@40049000 { compatible = "nxp,kinetis-pinmux"; reg = <0x40049000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 9>; }; - pinmux_b: pinmux@4004a000 { + portb: pinmux@4004a000 { compatible = "nxp,kinetis-pinmux"; reg = <0x4004a000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 10>; }; - pinmux_c: pinmux@4004b000 { + portc: pinmux@4004b000 { compatible = "nxp,kinetis-pinmux"; reg = <0x4004b000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 11>; }; - pinmux_d: pinmux@4004c000 { + portd: pinmux@4004c000 { compatible = "nxp,kinetis-pinmux"; reg = <0x4004c000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 12>; }; - pinmux_e: pinmux@4004d000 { + porte: pinmux@4004d000 { compatible = "nxp,kinetis-pinmux"; reg = <0x4004d000 0xd0>; clocks = <&sim KINETIS_SIM_BUS_CLK 0x1038 13>; @@ -236,7 +235,7 @@ label = "GPIO_0"; gpio-controller; #gpio-cells = <2>; - nxp,kinetis-port = <&pinmux_a>; + nxp,kinetis-port = <&porta>; }; gpiob: gpio@400ff040 { @@ -246,7 +245,7 @@ label = "GPIO_1"; gpio-controller; #gpio-cells = <2>; - nxp,kinetis-port = <&pinmux_b>; + nxp,kinetis-port = <&portb>; }; gpioc: gpio@400ff080 { @@ -256,7 +255,7 @@ label = "GPIO_2"; gpio-controller; #gpio-cells = <2>; - nxp,kinetis-port = <&pinmux_c>; + nxp,kinetis-port = <&portc>; }; gpiod: gpio@400ff0c0 { @@ -266,7 +265,7 @@ label = "GPIO_3"; gpio-controller; #gpio-cells = <2>; - nxp,kinetis-port = <&pinmux_d>; + nxp,kinetis-port = <&portd>; }; gpioe: gpio@400ff100 { @@ -276,7 +275,7 @@ label = "GPIO_4"; gpio-controller; #gpio-cells = <2>; - nxp,kinetis-port = <&pinmux_e>; + nxp,kinetis-port = <&porte>; }; spi0: spi@4002c000 { @@ -308,7 +307,7 @@ label = "WDT_0"; }; - pwm0: pwm@40038000{ + ftm0: pwm@40038000{ compatible = "nxp,kinetis-ftm"; reg = <0x40038000 0x98>; interrupts = <42 0>; @@ -317,7 +316,7 @@ #pwm-cells = <3>; }; - pwm1: pwm@40039000{ + ftm1: pwm@40039000{ compatible = "nxp,kinetis-ftm"; reg = <0x40039000 0x98>; interrupts = <43 0>; @@ -326,7 +325,7 @@ #pwm-cells = <3>; }; - pwm2: pwm@4003a000{ + ftm2: pwm@4003a000{ compatible = "nxp,kinetis-ftm"; reg = <0x4003a000 0x98>; interrupts = <44 0>; @@ -335,7 +334,7 @@ #pwm-cells = <3>; }; - pwm3: pwm@400b9000{ + ftm3: pwm@400b9000{ compatible = "nxp,kinetis-ftm"; reg = <0x400b9000 0x98>; interrupts = <71 0>; @@ -353,7 +352,7 @@ #io-channel-cells = <1>; }; - usbd: usbd@40072000 { + usbotg: usbd@40072000 { compatible = "nxp,kinetis-usbd"; reg = <0x40072000 0x1000>; interrupts = <53 1>;