michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: boards: Define dts aliases at soc level for i.mx 6/7 socs

Browse source 
Defines device tree aliases for on-chip peripherals at the soc level
instead of the board level for all i.mx 6/7 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 <maureen.helm@nxp.com>
This commit is contained in:
Maureen Helm 2020-01-10 09:43:39 -06:00 • committed by Anas Nashif
commit ecd24bccd1
6 changed files with 45 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
boards/arm/96b_meerkat96/96b_meerkat96.dts
View file

@ -39,13 +39,10 @@
}; };
aliases { aliases {
gpio-1 = &gpio1;
led0 = &green_led_0; led0 = &green_led_0;
led1 = &green_led_1; led1 = &green_led_1;
led2 = &green_led_2; led2 = &green_led_2;
led3 = &green_led_3; led3 = &green_led_3;
uart-1 = &uart1;
mu-b = &mub;
}; };
}; };

6
boards/arm/colibri_imx7d_m4/colibri_imx7d_m4.dts
View file

@ -13,14 +13,8 @@
compatible = "nxp,mcimx7d_m4"; compatible = "nxp,mcimx7d_m4";
aliases { aliases {
gpio-1 = &gpio1;
gpio-2 = &gpio2;
uart-2 = &uart2;
led0 = &green_led; led0 = &green_led;
sw0 = &user_switch_1; sw0 = &user_switch_1;
i2c-4 = &i2c4;
pwm-1 = &pwm1;
mu-b = &mub;
}; };
chosen { chosen {

7
boards/arm/udoo_neo_full_m4/udoo_neo_full_m4.dts
View file

@ -31,14 +31,7 @@
compatible = "nxp,mcimx6x_m4"; compatible = "nxp,mcimx6x_m4";
aliases { aliases {
uart-5 = &uart5;
gpio-4 = &gpio4;
gpio-5 = &gpio5;
gpio-6 = &gpio6;
led0 = &red_led; led0 = &red_led;
mu-b = &mub;
epit-1 = &epit1;
epit-2 = &epit2;
}; };
chosen { chosen {

5
boards/arm/warp7_m4/warp7_m4.dts
View file

@ -13,12 +13,7 @@
compatible = "nxp,mcimx7d_m4"; compatible = "nxp,mcimx7d_m4";
aliases { aliases {
gpio-7 = &gpio7;
uart-2 = &uart2;
uart-6 = &uart6;
sw0 = &user_switch_1; sw0 = &user_switch_1;
i2c-4 = &i2c4;
mu-b = &mub;
}; };
chosen { chosen {

19
dts/arm/nxp/nxp_imx6sx_m4.dtsi
View file

@ -9,6 +9,25 @@
#include <dt-bindings/rdc/imx_rdc.h> #include <dt-bindings/rdc/imx_rdc.h>
/ { / {
aliases {
epit-1 = &epit1;
epit-2 = &epit2;
gpio-1 = &gpio1;
gpio-2 = &gpio2;
gpio-3 = &gpio3;
gpio-4 = &gpio4;
gpio-5 = &gpio5;
gpio-6 = &gpio6;
gpio-7 = &gpio7;
mu-b = &mub;
uart-1 = &uart1;
uart-2 = &uart2;
uart-3 = &uart3;
uart-4 = &uart4;
uart-5 = &uart5;
uart-6 = &uart6;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;

26
dts/arm/nxp/nxp_imx7d_m4.dtsi
View file

@ -10,6 +10,32 @@
#include <dt-bindings/rdc/imx_rdc.h> #include <dt-bindings/rdc/imx_rdc.h>
/ { / {
aliases {
gpio-1 = &gpio1;
gpio-2 = &gpio2;
gpio-3 = &gpio3;
gpio-4 = &gpio4;
gpio-5 = &gpio5;
gpio-6 = &gpio6;
gpio-7 = &gpio7;
i2c-1 = &i2c1;
i2c-2 = &i2c2;
i2c-3 = &i2c3;
i2c-4 = &i2c4;
mu-b = &mub;
pwm-1 = &pwm1;
pwm-2 = &pwm2;
pwm-3 = &pwm3;
pwm-4 = &pwm4;
uart-1 = &uart1;
uart-2 = &uart2;
uart-3 = &uart3;
uart-4 = &uart4;
uart-5 = &uart5;
uart-6 = &uart6;
uart-7 = &uart7;
};
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;