From 201f8897cd112d671bc897d59f28f29ccf42ca3d Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Fri, 10 Jan 2020 09:56:56 -0600 Subject: [PATCH] dts: boards: Define dts aliases at soc level for i.mx rt socs Defines device tree aliases for on-chip peripherals at the soc level instead of the board level for all i.mx rt socs. The eliminates some duplicate code in the board level device trees, and will allow drivers to use device-tree generated macros directly instead of through dts fixups. Signed-off-by: Maureen Helm --- boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts | 5 ---- boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts | 8 ------ boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts | 9 ------- boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts | 10 -------- boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts | 7 ----- boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts | 7 ----- boards/arm/mm_swiftio/mm_swiftio.dts | 1 - dts/arm/nxp/nxp_rt.dtsi | 27 ++++++++++++++++++++ dts/arm/nxp/nxp_rt1010.dtsi | 4 +++ 9 files changed, 31 insertions(+), 47 deletions(-) diff --git a/boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts b/boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts index f6c4204cd9b..dd2a3e3a1f4 100644 --- a/boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts +++ b/boards/arm/mimxrt1010_evk/mimxrt1010_evk.dts @@ -13,11 +13,6 @@ compatible = "nxp,mimxrt1010"; aliases { - gpio-1= &gpio1; - gpio-2= &gpio2_rt1010; - gpio-5= &gpio5; - i2c-1 = &i2c1; - uart-1 = &uart1; led0 = &green_led; sw0 = &user_button; }; diff --git a/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts b/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts index 89f7b0af66d..ee4731e1e59 100644 --- a/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts +++ b/boards/arm/mimxrt1015_evk/mimxrt1015_evk.dts @@ -13,14 +13,6 @@ compatible = "nxp,mimxrt1015"; aliases { - gpio-1= &gpio1; - gpio-2= &gpio2; - gpio-3= &gpio3; - gpio-4= &gpio4; - gpio-5= &gpio5; - i2c-1 = &i2c1; - uart-1 = &uart1; - uart-4 = &uart4; led0 = &green_led; sw0 = &user_button; }; diff --git a/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts b/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts index f6faea0be1e..946db6db0dd 100644 --- a/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts +++ b/boards/arm/mimxrt1020_evk/mimxrt1020_evk.dts @@ -13,17 +13,8 @@ compatible = "nxp,mimxrt1021"; aliases { - gpio-1= &gpio1; - gpio-2= &gpio2; - gpio-3= &gpio3; - gpio-4= &gpio4; - gpio-5= &gpio5; - i2c-1 = &i2c1; - i2c-4 = &i2c4; - uart-1 = &uart1; led0 = &green_led; sw0 = &user_button; - eth = ð }; chosen { diff --git a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts index 2f6eabe79ea..98dba455159 100644 --- a/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts +++ b/boards/arm/mimxrt1050_evk/mimxrt1050_evk.dts @@ -13,18 +13,8 @@ compatible = "nxp,mimxrt1052"; aliases { - gpio-1= &gpio1; - gpio-2= &gpio2; - gpio-3= &gpio3; - gpio-4= &gpio4; - gpio-5= &gpio5; - i2c-1 = &i2c1; - uart-1 = &uart1; - uart-3 = &uart3; led0 = &green_led; sw0 = &user_button; - spi-3 = &spi3; - eth = ð }; chosen { diff --git a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts index 129ac41f477..a4c6291935d 100644 --- a/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts +++ b/boards/arm/mimxrt1060_evk/mimxrt1060_evk.dts @@ -13,15 +13,8 @@ compatible = "nxp,mimxrt1062"; aliases { - gpio-1= &gpio1; - gpio-2= &gpio2; - gpio-3= &gpio3; - gpio-4= &gpio4; - gpio-5= &gpio5; - uart-1 = &uart1; led0 = &green_led; sw0 = &user_button; - eth = ð }; chosen { diff --git a/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts b/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts index fbf7d804ffc..019764ad509 100644 --- a/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts +++ b/boards/arm/mimxrt1064_evk/mimxrt1064_evk.dts @@ -13,16 +13,9 @@ compatible = "nxp,mimxrt1064"; aliases { - gpio-1= &gpio1; - gpio-2= &gpio2; - gpio-3= &gpio3; - gpio-4= &gpio4; - gpio-5= &gpio5; - uart-1 = &uart1; led0 = &green_led; pwm-led0 = &green_pwm_led; sw0 = &user_button; - eth = ð }; chosen { diff --git a/boards/arm/mm_swiftio/mm_swiftio.dts b/boards/arm/mm_swiftio/mm_swiftio.dts index 57ff0da3ad6..805c4cbdae6 100644 --- a/boards/arm/mm_swiftio/mm_swiftio.dts +++ b/boards/arm/mm_swiftio/mm_swiftio.dts @@ -13,7 +13,6 @@ compatible = "nxp,mimxrt1052"; aliases { - uart-1 = &uart1; led0 = &green_led; led1 = &red_led; led2 = &blue_led; diff --git a/dts/arm/nxp/nxp_rt.dtsi b/dts/arm/nxp/nxp_rt.dtsi index a80327e6bd2..4cbca822ec8 100644 --- a/dts/arm/nxp/nxp_rt.dtsi +++ b/dts/arm/nxp/nxp_rt.dtsi @@ -10,6 +10,33 @@ #include / { + aliases { + eth = ð + 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; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/dts/arm/nxp/nxp_rt1010.dtsi b/dts/arm/nxp/nxp_rt1010.dtsi index 359c17a5051..1addbd42f8f 100644 --- a/dts/arm/nxp/nxp_rt1010.dtsi +++ b/dts/arm/nxp/nxp_rt1010.dtsi @@ -72,6 +72,10 @@ }; / { + aliases { + gpio-2 = &gpio2_rt1010; + }; + soc { gpio2_rt1010: gpio@42000000 { compatible = "nxp,imx-gpio";