diff --git a/boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts b/boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts index f5c78cf2f30..1f560ec26f5 100644 --- a/boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts +++ b/boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts @@ -18,8 +18,8 @@ }; chosen { - zephyr,console = &uart1; - zephyr,shell-uart = &uart1; + zephyr,console = &lpuart1; + zephyr,shell-uart = &lpuart1; }; leds { @@ -34,14 +34,14 @@ compatible = "gpio-keys"; user_button: button-1 { label = "User SW4"; - gpios = <&gpio2_rt1010 5 GPIO_ACTIVE_LOW>; + gpios = <&gpio2 5 GPIO_ACTIVE_LOW>; }; }; }; -arduino_serial: &uart1 {}; +arduino_serial: &lpuart1 {}; -&flexspi0 { +&flexspi { reg = <0x402a8000 0x4000>, <0x60000000 0x1000000>; at25sf128a: at25sf128a@0 { compatible = "adesto,at25sf128a", "jedec,spi-nor"; @@ -54,15 +54,15 @@ arduino_serial: &uart1 {}; }; }; -&i2c1 { +&lpi2c1 { status = "okay"; }; -&uart1 { +&lpuart1 { status = "okay"; current-speed = <115200>; }; -&usbd1 { +&usb1 { status = "okay"; }; diff --git a/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts b/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts index e6db04c84d9..2540b008caa 100644 --- a/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts +++ b/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts @@ -18,8 +18,8 @@ }; chosen { - zephyr,console = &uart1; - zephyr,shell-uart = &uart1; + zephyr,console = &lpuart1; + zephyr,shell-uart = &lpuart1; }; leds { @@ -68,9 +68,9 @@ }; }; -arduino_serial: &uart4 {}; +arduino_serial: &lpuart4 {}; -&flexspi0 { +&flexspi { reg = <0x402a8000 0x4000>, <0x60000000 0x1000000>; at25sf128a: at25sf128a@0 { compatible = "adesto,at25sf128a", "jedec,spi-nor"; @@ -83,15 +83,15 @@ arduino_serial: &uart4 {}; }; }; -&i2c1 { +&lpi2c1 { status = "okay"; }; -&uart1 { +&lpuart1 { status = "okay"; current-speed = <115200>; }; -&usbd1 { +&usb1 { status = "okay"; }; diff --git a/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts b/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts index 86fe70ebb96..6e63c0b698e 100644 --- a/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts +++ b/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts @@ -18,8 +18,8 @@ }; chosen { - zephyr,console = &uart1; - zephyr,shell-uart = &uart1; + zephyr,console = &lpuart1; + zephyr,shell-uart = &lpuart1; }; sdram0: memory@80000000 { @@ -75,9 +75,9 @@ }; }; -arduino_serial: &uart2 {}; +arduino_serial: &lpuart2 {}; -&flexspi0 { +&flexspi { reg = <0x402a8000 0x4000>, <0x60000000 0x800000>; is25wp064: is25wp064@0 { compatible = "issi,is25wp064", "jedec,spi-nor"; @@ -90,26 +90,26 @@ arduino_serial: &uart2 {}; }; }; -&i2c1 { +&lpi2c1 { status = "okay"; }; -&i2c4 { +&lpi2c4 { status = "okay"; }; -&uart1 { +&lpuart1 { status = "okay"; current-speed = <115200>; }; -ð { +&enet { status = "okay"; ptp { status = "okay"; }; }; -&usbd1 { +&usb1 { status = "okay"; }; diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts index d8a48e5b245..0f283467927 100644 --- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts +++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts @@ -18,8 +18,8 @@ }; chosen { - zephyr,console = &uart1; - zephyr,shell-uart = &uart1; + zephyr,console = &lpuart1; + zephyr,shell-uart = &lpuart1; }; sdram0: memory@80000000 { @@ -84,9 +84,9 @@ }; }; -arduino_serial: &uart3 {}; +arduino_serial: &lpuart3 {}; -&flexspi0 { +&flexspi { reg = <0x402a8000 0x4000>, <0x60000000 0x4000000>; hyperflash0: hyperflash@0 { compatible = "cypress,s26ks512s"; @@ -95,7 +95,7 @@ arduino_serial: &uart3 {}; }; }; -&lcdif1 { +&lcdif { status = "okay"; port { lcd_panel_out: endpoint { @@ -104,7 +104,7 @@ arduino_serial: &uart3 {}; }; }; -&i2c1 { +&lpi2c1 { status = "okay"; fxos8700@1f { @@ -129,23 +129,23 @@ arduino_serial: &uart3 {}; }; }; -&uart1 { +&lpuart1 { status = "okay"; current-speed = <115200>; }; -&spi3 { +&lpspi3 { status = "okay"; }; -ð { +&enet { status = "okay"; ptp { status = "okay"; }; }; -&usbd1 { +&usb1 { status = "okay"; }; diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts index a6672d068d9..c846aa606f2 100644 --- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts +++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk_qspi.dts @@ -8,7 +8,7 @@ /delete-node/ &hyperflash0; -&flexspi0 { +&flexspi { reg = <0x402a8000 0x4000>, <0x60000000 0x800000>; is25wp064: is25wp064@0 { compatible = "issi,is25wp064", "jedec,spi-nor"; diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts index aec2db98bc6..b3a744a1be5 100644 --- a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts +++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts @@ -18,8 +18,8 @@ }; chosen { - zephyr,console = &uart1; - zephyr,shell-uart = &uart1; + zephyr,console = &lpuart1; + zephyr,shell-uart = &lpuart1; }; sdram0: memory@80000000 { @@ -86,9 +86,9 @@ /delete-node/ eth1; }; -arduino_serial: &uart3 {}; +arduino_serial: &lpuart3 {}; -&flexspi0 { +&flexspi { reg = <0x402a8000 0x4000>, <0x60000000 0x800000>; is25wp064: is25wp064@0 { compatible = "issi,is25wp064", "jedec,spi-nor"; @@ -101,7 +101,7 @@ arduino_serial: &uart3 {}; }; }; -&lcdif1 { +&lcdif { status = "okay"; port { lcd_panel_out: endpoint { @@ -110,7 +110,7 @@ arduino_serial: &uart3 {}; }; }; -&i2c1 { +&lpi2c1 { status = "okay"; ft5336@38 { @@ -121,18 +121,18 @@ arduino_serial: &uart3 {}; }; }; -&uart1 { +&lpuart1 { status = "okay"; current-speed = <115200>; }; -ð { +&enet { status = "okay"; ptp { status = "okay"; }; }; -&usbd1 { +&usb1 { status = "okay"; }; diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.dts b/boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.dts index 9fc784c8813..bea21d50e37 100644 --- a/boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.dts +++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evk_hyperflash.dts @@ -7,7 +7,7 @@ #include "mimxrt1060_evk.dts" /delete-node/ &is25wp064; -&flexspi0 { +&flexspi { reg = <0x402a8000 0x4000>, <0x60000000 0x4000000>; hyperflash0: hyperflash@0 { compatible = "cypress,s26ks512s"; diff --git a/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts b/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts index 26d3714b58a..d1d2b89ccfe 100644 --- a/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts +++ b/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts @@ -19,8 +19,8 @@ }; chosen { - zephyr,console = &uart1; - zephyr,shell-uart = &uart1; + zephyr,console = &lpuart1; + zephyr,shell-uart = &lpuart1; }; sdram0: memory@80000000 { @@ -95,9 +95,9 @@ /delete-node/ eth1; }; -arduino_i2c: &i2c1 {}; +arduino_i2c: &lpi2c1 {}; -&lcdif1 { +&lcdif { status = "okay"; port { lcd_panel_out: endpoint { @@ -106,7 +106,7 @@ arduino_i2c: &i2c1 {}; }; }; -&i2c1 { +&lpi2c1 { status = "okay"; mt9m114@48 { @@ -130,19 +130,19 @@ arduino_i2c: &i2c1 {}; }; }; -&uart1 { +&lpuart1 { status = "okay"; current-speed = <115200>; }; -ð { +&enet { status = "okay"; ptp { status = "okay"; }; }; -&usbd1 { +&usb1 { status = "okay"; }; diff --git a/boards/arm/mm_swiftio/mm_swiftio.dts b/boards/arm/mm_swiftio/mm_swiftio.dts index 805c4cbdae6..3e3283e7664 100644 --- a/boards/arm/mm_swiftio/mm_swiftio.dts +++ b/boards/arm/mm_swiftio/mm_swiftio.dts @@ -19,8 +19,8 @@ }; chosen { - zephyr,console = &uart1; - zephyr,shell-uart = &uart1; + zephyr,console = &lpuart1; + zephyr,shell-uart = &lpuart1; }; sdram0: memory@80000000 { @@ -50,7 +50,7 @@ }; -&flexspi0 { +&flexspi { reg = <0x402a8000 0x4000>, <0x60000000 0x800000>; is25wp064: is25wp064@0 { compatible = "issi,is25wp064", "jedec,spi-nor"; @@ -63,12 +63,12 @@ }; }; -&uart1 { +&lpuart1 { status = "okay"; current-speed = <115200>; }; -&usbd1 { +&usb1 { status = "okay"; }; diff --git a/dts/arm/nxp/nxp_rt.dtsi b/dts/arm/nxp/nxp_rt.dtsi index 98febdadc01..40a4e4a91bd 100644 --- a/dts/arm/nxp/nxp_rt.dtsi +++ b/dts/arm/nxp/nxp_rt.dtsi @@ -11,30 +11,30 @@ / { aliases { - eth = ð + eth = &enet; gpio-1 = &gpio1; gpio-2 = &gpio2; gpio-3 = &gpio3; gpio-4 = &gpio4; gpio-5 = &gpio5; - i2c-1 = &i2c1; - i2c-2 = &i2c2; - i2c-3 = &i2c3; - i2c-4 = &i2c4; - spi-1 = &spi1; - spi-2 = &spi2; - spi-3 = &spi3; - spi-4 = &spi4; - uart-1 = &uart1; - uart-2 = &uart2; - uart-3 = &uart3; - uart-4 = &uart4; - uart-5 = &uart5; - uart-6 = &uart6; - uart-7 = &uart7; - uart-8 = &uart8; - usbd-1 = &usbd1; - usbd-2 = &usbd2; + i2c-1 = &lpi2c1; + i2c-2 = &lpi2c2; + i2c-3 = &lpi2c3; + i2c-4 = &lpi2c4; + spi-1 = &lpspi1; + spi-2 = &lpspi2; + spi-3 = &lpspi3; + spi-4 = &lpspi4; + uart-1 = &lpuart1; + uart-2 = &lpuart2; + uart-3 = &lpuart3; + uart-4 = &lpuart4; + uart-5 = &lpuart5; + uart-6 = &lpuart6; + uart-7 = &lpuart7; + uart-8 = &lpuart8; + usbd-1 = &usb1; + usbd-2 = &usb2; }; chosen { @@ -67,7 +67,7 @@ }; soc { - flexram0: flexram@400b0000 { + flexram: flexram@400b0000 { compatible = "nxp,imx-flexram"; reg = <0x400b0000 0x4000>; interrupts = <38 0>; @@ -75,32 +75,32 @@ #address-cells = <1>; #size-cells = <1>; - itcm0: itcm@0 { + itcm: itcm@0 { compatible = "nxp,imx-itcm"; reg = <0x00000000 0x20000>; }; - dtcm0: dtcm@20000000 { + dtcm: dtcm@20000000 { compatible = "nxp,imx-dtcm"; reg = <0x20000000 0x20000>; }; - ocram0: ocram@20200000 { + ocram: ocram@20200000 { compatible = "mmio-sram"; reg = <0x20200000 0x40000>; }; }; - flexspi0: spi@402a8000 { + flexspi: spi@402a8000 { compatible = "nxp,imx-flexspi"; reg = <0x402a8000 0x4000>; interrupts = <108 0>; - label = "FLEXSPI0"; + label = "FLEXSPI"; #address-cells = <1>; #size-cells = <0>; }; - flexspi1: spi@402a4000 { + flexspi2: spi@402a4000 { compatible = "nxp,imx-flexspi"; reg = <0x402a4000 0x4000>; interrupts = <107 0>; @@ -109,7 +109,7 @@ #size-cells = <0>; }; - semc0: semc0@402f0000 { + semc: semc0@402f0000 { compatible = "nxp,imx-semc"; reg = <0x402f0000 0x4000>; interrupts = <109 0>; @@ -185,7 +185,7 @@ #gpio-cells = <2>; }; - i2c1: i2c@403f0000 { + lpi2c1: i2c@403f0000 { compatible = "nxp,imx-lpi2c"; clock-frequency = ; #address-cells = <1>; @@ -197,7 +197,7 @@ status = "disabled"; }; - i2c2: i2c@403f4000 { + lpi2c2: i2c@403f4000 { compatible = "nxp,imx-lpi2c"; clock-frequency = ; #address-cells = <1>; @@ -209,7 +209,7 @@ status = "disabled"; }; - i2c3: i2c@403f8000 { + lpi2c3: i2c@403f8000 { compatible = "nxp,imx-lpi2c"; clock-frequency = ; #address-cells = <1>; @@ -221,7 +221,7 @@ status = "disabled"; }; - i2c4: i2c@403fc000 { + lpi2c4: i2c@403fc000 { compatible = "nxp,imx-lpi2c"; clock-frequency = ; #address-cells = <1>; @@ -238,7 +238,7 @@ label = "PINMUX_0"; }; - lcdif1: display-controller@402b8000 { + lcdif: display-controller@402b8000 { compatible = "fsl,imx6sx-lcdif"; reg = <0x402b8000 0x4000>; interrupts = <42 0>; @@ -246,7 +246,7 @@ status = "disabled"; }; - spi1: spi@40394000 { + lpspi1: spi@40394000 { compatible = "nxp,imx-lpspi"; reg = <0x40394000 0x4000>; interrupts = <32 3>; @@ -257,7 +257,7 @@ #size-cells = <0>; }; - spi2: spi@40398000 { + lpspi2: spi@40398000 { compatible = "nxp,imx-lpspi"; reg = <0x40398000 0x4000>; interrupts = <33 3>; @@ -268,7 +268,7 @@ #size-cells = <0>; }; - spi3: spi@4039c000 { + lpspi3: spi@4039c000 { compatible = "nxp,imx-lpspi"; reg = <0x4039c000 0x4000>; interrupts = <34 3>; @@ -279,7 +279,7 @@ #size-cells = <0>; }; - spi4: spi@403a0000 { + lpspi4: spi@403a0000 { compatible = "nxp,imx-lpspi"; reg = <0x403a0000 0x4000>; interrupts = <35 3>; @@ -290,7 +290,7 @@ #size-cells = <0>; }; - uart1: uart@40184000 { + lpuart1: uart@40184000 { compatible = "nxp,kinetis-lpuart"; reg = <0x40184000 0x4000>; interrupts = <20 0>; @@ -299,7 +299,7 @@ status = "disabled"; }; - uart2: uart@40188000 { + lpuart2: uart@40188000 { compatible = "nxp,kinetis-lpuart"; reg = <0x40188000 0x4000>; interrupts = <21 0>; @@ -308,7 +308,7 @@ status = "disabled"; }; - uart3: uart@4018c000 { + lpuart3: uart@4018c000 { compatible = "nxp,kinetis-lpuart"; reg = <0x4018c000 0x4000>; interrupts = <22 0>; @@ -317,7 +317,7 @@ status = "disabled"; }; - uart4: uart@40190000 { + lpuart4: uart@40190000 { compatible = "nxp,kinetis-lpuart"; reg = <0x40190000 0x4000>; interrupts = <23 0>; @@ -326,7 +326,7 @@ status = "disabled"; }; - uart5: uart@40194000 { + lpuart5: uart@40194000 { compatible = "nxp,kinetis-lpuart"; reg = <0x40194000 0x4000>; interrupts = <24 0>; @@ -335,7 +335,7 @@ status = "disabled"; }; - uart6: uart@40198000 { + lpuart6: uart@40198000 { compatible = "nxp,kinetis-lpuart"; reg = <0x40198000 0x4000>; interrupts = <25 0>; @@ -344,7 +344,7 @@ status = "disabled"; }; - uart7: uart@4019c000 { + lpuart7: uart@4019c000 { compatible = "nxp,kinetis-lpuart"; reg = <0x4019c000 0x4000>; interrupts = <26 0>; @@ -353,7 +353,7 @@ status = "disabled"; }; - uart8: uart@401a0000 { + lpuart8: uart@401a0000 { compatible = "nxp,kinetis-lpuart"; reg = <0x401a0000 0x4000>; interrupts = <27 0>; @@ -514,7 +514,7 @@ }; }; - eth: ethernet@402d8000 { + enet: ethernet@402d8000 { compatible = "nxp,kinetis-ethernet"; reg = <0x402D8000 0x628>; interrupts = <114 0>; @@ -538,7 +538,7 @@ label = "TRNG"; }; - usbd1: usbd@402e0000 { + usb1: usbd@402e0000 { compatible = "nxp,kinetis-usbd"; reg = <0x402E0000 0x200>; interrupts = <113 1>; @@ -550,7 +550,7 @@ label = "USBD_1"; }; - usbd2: usbd@402e0200 { + usb2: usbd@402e0200 { compatible = "nxp,kinetis-usbd"; reg = <0x402E0200 0x200>; interrupts = <112 1>; diff --git a/dts/arm/nxp/nxp_rt1010.dtsi b/dts/arm/nxp/nxp_rt1010.dtsi index 1addbd42f8f..f775531a8c6 100644 --- a/dts/arm/nxp/nxp_rt1010.dtsi +++ b/dts/arm/nxp/nxp_rt1010.dtsi @@ -15,15 +15,15 @@ * DTCM: 32KB * OCRAM: 64KB */ -&itcm0 { +&itcm { reg = <0x00000000 0x8000>; }; -&dtcm0 { +&dtcm { reg = <0x20000000 0x8000>; }; -&ocram0 { +&ocram { reg = <0x20200000 0x10000>; }; @@ -43,11 +43,11 @@ interrupts = <31 0>; }; -&usbd1 { +&usb1 { interrupts = <25 0>; }; -&flexspi0 { +&flexspi { interrupts = <26 0>; }; @@ -73,11 +73,15 @@ / { aliases { - gpio-2 = &gpio2_rt1010; + /delete-property/ gpio-3; + /delete-property/ gpio-4; }; soc { - gpio2_rt1010: gpio@42000000 { + /* Fixup GPIO2 its a different location on RT1010 */ + /delete-node/ gpio@401bc000; + + gpio2: gpio@42000000 { compatible = "nxp,imx-gpio"; reg = <0x42000000 0x4000>; interrupts = <72 0>; @@ -85,5 +89,9 @@ gpio-controller; #gpio-cells = <2>; }; + + /* Remove GPIO3 & GPIO4, they dont exist on RT1010 */ + /delete-node/ gpio@401c0000; + /delete-node/ gpio@401c4000; }; }; diff --git a/dts/arm/nxp/nxp_rt1015.dtsi b/dts/arm/nxp/nxp_rt1015.dtsi index cf5e6d8c6e4..5c7714b6580 100644 --- a/dts/arm/nxp/nxp_rt1015.dtsi +++ b/dts/arm/nxp/nxp_rt1015.dtsi @@ -15,14 +15,14 @@ * DTCM: 32KB * OCRAM: 64KB */ -&itcm0 { +&itcm { reg = <0x00000000 0x8000>; }; -&dtcm0 { +&dtcm { reg = <0x20000000 0x8000>; }; -&ocram0 { +&ocram { reg = <0x20200000 0x10000>; }; diff --git a/dts/arm/nxp/nxp_rt1020.dtsi b/dts/arm/nxp/nxp_rt1020.dtsi index 76fe8f4fb8e..9ce798e29a0 100644 --- a/dts/arm/nxp/nxp_rt1020.dtsi +++ b/dts/arm/nxp/nxp_rt1020.dtsi @@ -15,14 +15,14 @@ * DTCM: 64KB * OCRAM: 128KB */ -&itcm0 { +&itcm { reg = <0x00000000 0x10000>; }; -&dtcm0 { +&dtcm { reg = <0x20000000 0x10000>; }; -&ocram0 { +&ocram { reg = <0x20200000 0x20000>; }; diff --git a/dts/arm/nxp/nxp_rt1060.dtsi b/dts/arm/nxp/nxp_rt1060.dtsi index bfd4d1ea970..c2bbc62e1f7 100644 --- a/dts/arm/nxp/nxp_rt1060.dtsi +++ b/dts/arm/nxp/nxp_rt1060.dtsi @@ -12,7 +12,7 @@ * ram (OCRAM2) mapped at 0x20200000. In order to have a continuous * region, we describe them in one 768Kb unique node. */ -&ocram0 { +&ocram { compatible = "mmio-sram"; reg = <0x20200000 0xC0000>; }; @@ -20,11 +20,11 @@ /* i.MX rt1060 has a second Ethernet controller. */ / { aliases { - eth1 = ð1; + enet2 = &enet2; }; soc { - eth1: ethernet@402d4000 { + enet2: ethernet@402d4000 { compatible = "nxp,kinetis-ethernet"; reg = <0x402D4000 0x628>; interrupts = <152 0>; diff --git a/dts/arm/nxp/nxp_rt1064.dtsi b/dts/arm/nxp/nxp_rt1064.dtsi index e2748d4a0ee..a73df086265 100644 --- a/dts/arm/nxp/nxp_rt1064.dtsi +++ b/dts/arm/nxp/nxp_rt1064.dtsi @@ -6,7 +6,7 @@ #include -&flexspi1 { +&flexspi2 { reg = <0x402a4000 0x4000>, <0x70000000 0x400000>; /* WINBOND */ w25q32jvwj0: w25q32jvwj@0 {