diff --git a/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi b/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi index 68c27f229fa..b45de978c2e 100644 --- a/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi +++ b/arch/arm/dts/at91-sama5d2_icp-u-boot.dtsi @@ -13,18 +13,6 @@ }; }; -&sdmmc0 { - u-boot,dm-pre-reloc; -}; - -&uart0 { /* mikrobus1 uart */ - u-boot,dm-pre-reloc; -}; - -&pinctrl_sdmmc0_default { - u-boot,dm-pre-reloc; -}; - &pinctrl_mikrobus1_uart { u-boot,dm-pre-reloc; }; @@ -37,6 +25,10 @@ u-boot,dm-pre-reloc; }; +&pinctrl_sdmmc0_default { + u-boot,dm-pre-reloc; +}; + &qspi1 { u-boot,dm-pre-reloc; @@ -44,3 +36,12 @@ u-boot,dm-pre-reloc; }; }; + +&sdmmc0 { + u-boot,dm-pre-reloc; +}; + +&uart0 { /* mikrobus1 uart */ + u-boot,dm-pre-reloc; +}; + diff --git a/arch/arm/dts/at91-sama5d2_icp.dts b/arch/arm/dts/at91-sama5d2_icp.dts index 2c6e91c1c7b..44522197ff6 100644 --- a/arch/arm/dts/at91-sama5d2_icp.dts +++ b/arch/arm/dts/at91-sama5d2_icp.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ OR MIT /* * at91-sama5d2_icp.dts - Device Tree file for SAMA5D2 ICP board - * SAMA5D2 Industrial Connectivity Board + * SAMA5D2 Industrial Connectivity Platform * * Copyright (c) 2018, Microchip Technology Inc. * 2018, Eugen Hristev @@ -48,12 +48,6 @@ }; }; - uart0: serial@f801c000 { /* mikrobus1 uart */ - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_mikrobus1_uart>; - status = "okay"; - }; - macb0: ethernet@f8008000 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_macb0_rmii &pinctrl_macb0_phy_irq &pinctrl_macb0_rst>; @@ -61,6 +55,12 @@ status = "okay"; }; + uart0: serial@f801c000 { /* mikrobus1 uart */ + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_mikrobus1_uart>; + status = "okay"; + }; + i2c1: i2c@fc028000 { dmas = <0>, <0>; pinctrl-names = "default"; @@ -85,6 +85,7 @@ pagesize = <16>; }; }; + pioA: gpio@fc038000 { status = "okay"; pinctrl { @@ -124,6 +125,12 @@ bias-pull-up; }; + pinctrl_mikrobus1_uart: mikrobus1_uart { + pinmux = , + ; + bias-disable; + }; + pinctrl_qspi1_sck_cs_default: qspi1_sck_cs_default { pinmux = , ; @@ -148,12 +155,6 @@ ; bias-disable; }; - - pinctrl_mikrobus1_uart: mikrobus1_uart { - pinmux = , - ; - bias-disable; - }; }; }; };