From 519661748e3e1dad18966037dc27095eaf116ce3 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Fri, 10 Jan 2020 09:19:35 -0600 Subject: [PATCH] dts: boards: Define dts aliases at soc level for kinetis socs Defines device tree aliases for on-chip peripherals at the soc level instead of the board level for all kinetis 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/frdm_k22f/frdm_k22f.dts | 18 ------------ boards/arm/frdm_k64f/frdm_k64f.dts | 23 --------------- boards/arm/frdm_kl25z/frdm_kl25z.dts | 9 ------ boards/arm/frdm_kw41z/frdm_kw41z.dts | 11 ------- boards/arm/hexiwear_k64/hexiwear_k64.dts | 21 ------------- boards/arm/hexiwear_kw40z/hexiwear_kw40z.dts | 13 -------- boards/arm/usb_kw24d512/usb_kw24d512.dts | 12 -------- dts/arm/nxp/nxp_k2x.dtsi | 24 +++++++++++++++ dts/arm/nxp/nxp_k6x.dtsi | 31 ++++++++++++++++++++ dts/arm/nxp/nxp_kl25z.dtsi | 13 ++++++++ dts/arm/nxp/nxp_kw2xd.dtsi | 22 ++++++++++++++ dts/arm/nxp/nxp_kw40z.dtsi | 18 ++++++++++++ dts/arm/nxp/nxp_kw41z.dtsi | 19 ++++++++++++ 13 files changed, 127 insertions(+), 107 deletions(-) diff --git a/boards/arm/frdm_k22f/frdm_k22f.dts b/boards/arm/frdm_k22f/frdm_k22f.dts index d3e31a7ec79..793caa62c80 100644 --- a/boards/arm/frdm_k22f/frdm_k22f.dts +++ b/boards/arm/frdm_k22f/frdm_k22f.dts @@ -13,24 +13,6 @@ compatible = "nxp,mk22f12", "nxp,k22f", "nxp,k2x"; aliases { - adc-0 = &adc0; - pwm-0 = &pwm0; - pwm-1 = &pwm1; - pwm-2 = &pwm2; - pwm-3 = &pwm3; - uart-0 = &uart0; - pinmux-a = &pinmux_a; - pinmux-b = &pinmux_b; - pinmux-c = &pinmux_c; - pinmux-d = &pinmux_d; - pinmux-e = &pinmux_e; - gpio-a = &gpioa; - gpio-b = &gpiob; - gpio-c = &gpioc; - gpio-d = &gpiod; - gpio-e = &gpioe; - i2c-0 = &i2c0; - i2c-1 = &i2c1; led0 = &green_led; led1 = &blue_led; led2 = &red_led; diff --git a/boards/arm/frdm_k64f/frdm_k64f.dts b/boards/arm/frdm_k64f/frdm_k64f.dts index 0881ef8400a..da2396dd5cc 100644 --- a/boards/arm/frdm_k64f/frdm_k64f.dts +++ b/boards/arm/frdm_k64f/frdm_k64f.dts @@ -9,34 +9,11 @@ compatible = "nxp,mk64f12", "nxp,k64f", "nxp,k6x"; aliases { - adc-0 = &adc0; - adc-1 = &adc1; - pwm-0 = &pwm0; - pwm-1 = &pwm1; - pwm-2 = &pwm2; - pwm-3 = &pwm3; - uart-0 = &uart0; - uart-3 = &uart3; - pinmux-a = &pinmux_a; - pinmux-b = &pinmux_b; - pinmux-c = &pinmux_c; - pinmux-d = &pinmux_d; - pinmux-e = &pinmux_e; - gpio-a = &gpioa; - gpio-b = &gpiob; - gpio-c = &gpioc; - gpio-d = &gpiod; - gpio-e = &gpioe; - i2c-0 = &i2c0; - i2c-1 = &i2c1; - i2c-2 = &i2c2; led0 = &green_led; led1 = &blue_led; led2 = &red_led; sw0 = &user_button_3; sw1 = &user_button_2; - eth = ð - can-0 = &can0; }; chosen { diff --git a/boards/arm/frdm_kl25z/frdm_kl25z.dts b/boards/arm/frdm_kl25z/frdm_kl25z.dts index 5035141199b..b1e26389d2a 100644 --- a/boards/arm/frdm_kl25z/frdm_kl25z.dts +++ b/boards/arm/frdm_kl25z/frdm_kl25z.dts @@ -9,15 +9,6 @@ compatible = "nxp,frdm-kl25z", "nxp,kl25z", "nxp,mkl25z4"; aliases { - adc-0 = &adc0; - uart-0 = &uart0; - i2c-0 = &i2c0; - i2c-1 = &i2c1; - gpio-a = &gpioa; - gpio-b = &gpiob; - gpio-c = &gpioc; - gpio-d = &gpiod; - gpio-e = &gpioe; led0 = &green_led; led1 = &blue_led; led2 = &red_led; diff --git a/boards/arm/frdm_kw41z/frdm_kw41z.dts b/boards/arm/frdm_kw41z/frdm_kw41z.dts index 912f9ebbac8..69ff70c6f18 100644 --- a/boards/arm/frdm_kw41z/frdm_kw41z.dts +++ b/boards/arm/frdm_kw41z/frdm_kw41z.dts @@ -9,22 +9,11 @@ compatible = "nxp,kw41z", "nxp,mkw41z4"; aliases { - adc-0 = &adc0; - lpuart-0 = &lpuart0; - pinmux-a = &pinmux_a; - pinmux-b = &pinmux_b; - pinmux-c = &pinmux_c; - gpio-a = &gpioa; - gpio-b = &gpiob; - gpio-c = &gpioc; - i2c-0 = &i2c0; - i2c-1 = &i2c1; led0 = &green_led; led1 = &blue_led; led2 = &red_led; sw0 = &user_button_3; sw1 = &user_button_4; - rtc-0 = &rtc0; }; chosen { diff --git a/boards/arm/hexiwear_k64/hexiwear_k64.dts b/boards/arm/hexiwear_k64/hexiwear_k64.dts index 9bb323dc716..3a42d2a8239 100644 --- a/boards/arm/hexiwear_k64/hexiwear_k64.dts +++ b/boards/arm/hexiwear_k64/hexiwear_k64.dts @@ -10,27 +10,6 @@ compatible = "nxp,hexiwear", "nxp,k64f", "nxp,k6x"; aliases { - adc-0 = &adc0; - adc-1 = &adc1; - pwm-0 = &pwm0; - pwm-1 = &pwm1; - pwm-2 = &pwm2; - pwm-3 = &pwm3; - uart-0 = &uart0; - uart-4 = &uart4; - pinmux-a = &pinmux_a; - pinmux-b = &pinmux_b; - pinmux-c = &pinmux_c; - pinmux-d = &pinmux_d; - pinmux-e = &pinmux_e; - gpio-a = &gpioa; - gpio-b = &gpiob; - gpio-c = &gpioc; - gpio-d = &gpiod; - gpio-e = &gpioe; - i2c-0 = &i2c0; - i2c-1 = &i2c1; - i2c-2 = &i2c2; led0 = &green_led; led1 = &blue_led; led2 = &red_led; diff --git a/boards/arm/hexiwear_kw40z/hexiwear_kw40z.dts b/boards/arm/hexiwear_kw40z/hexiwear_kw40z.dts index 2e173a95d5c..2e6f9080630 100644 --- a/boards/arm/hexiwear_kw40z/hexiwear_kw40z.dts +++ b/boards/arm/hexiwear_kw40z/hexiwear_kw40z.dts @@ -8,19 +8,6 @@ model = "Hexiwear KW40 board"; compatible = "nxp,kw40z", "nxp,mkw40z4"; - aliases { - adc-0 = &adc0; - lpuart-0 = &lpuart0; - pinmux-a = &pinmux_a; - pinmux-b = &pinmux_b; - pinmux-c = &pinmux_c; - gpio-a = &gpioa; - gpio-b = &gpiob; - gpio-c = &gpioc; - i2c-0 = &i2c0; - i2c-1 = &i2c1; - }; - chosen { zephyr,sram = &sram0; zephyr,flash = &flash0; diff --git a/boards/arm/usb_kw24d512/usb_kw24d512.dts b/boards/arm/usb_kw24d512/usb_kw24d512.dts index 03cf5b8dd22..d46101919a0 100644 --- a/boards/arm/usb_kw24d512/usb_kw24d512.dts +++ b/boards/arm/usb_kw24d512/usb_kw24d512.dts @@ -9,18 +9,6 @@ compatible = "nxp,usb-kw24d512", "nxp,kw24d512", "nxp,kw2xd"; aliases { - uart-0 = &uart0; - pinmux-a = &pinmux_a; - pinmux-b = &pinmux_b; - pinmux-c = &pinmux_c; - pinmux-d = &pinmux_d; - pinmux-e = &pinmux_e; - gpio-a = &gpioa; - gpio-b = &gpiob; - gpio-c = &gpioc; - gpio-d = &gpiod; - gpio-e = &gpioe; - i2c-0 = &i2c0; led0 = &led_0; led1 = &led_1; sw0 = &user_button_1; diff --git a/dts/arm/nxp/nxp_k2x.dtsi b/dts/arm/nxp/nxp_k2x.dtsi index 60c0e4557e3..ea00dbc7e64 100644 --- a/dts/arm/nxp/nxp_k2x.dtsi +++ b/dts/arm/nxp/nxp_k2x.dtsi @@ -13,6 +13,30 @@ / { aliases { + adc-0 = &adc0; + gpio-a = &gpioa; + gpio-b = &gpiob; + gpio-c = &gpioc; + gpio-d = &gpiod; + 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; + spi-0 = &spi0; + spi-1 = &spi1; + uart-0 = &uart0; + uart-1 = &uart1; + uart-2 = &uart2; + uart-3 = &uart3; + usbd-0 = &usbd; watchdog0 = &wdog; }; diff --git a/dts/arm/nxp/nxp_k6x.dtsi b/dts/arm/nxp/nxp_k6x.dtsi index d8b9a7446e6..639a9ecd0dc 100644 --- a/dts/arm/nxp/nxp_k6x.dtsi +++ b/dts/arm/nxp/nxp_k6x.dtsi @@ -9,6 +9,37 @@ / { aliases { + adc-0 = &adc0; + adc-1 = &adc1; + can-0 = &can0; + eth = ð + gpio-a = &gpioa; + gpio-b = &gpiob; + gpio-c = &gpioc; + gpio-d = &gpiod; + gpio-e = &gpioe; + i2c-0 = &i2c0; + i2c-1 = &i2c1; + i2c-2 = &i2c2; + 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; + spi-0 = &spi0; + spi-1 = &spi1; + spi-2 = &spi2; + uart-0 = &uart0; + uart-1 = &uart1; + uart-2 = &uart2; + uart-3 = &uart3; + uart-4 = &uart4; + uart-5 = &uart5; + usbd-0 = &usbd; watchdog0 = &wdog; }; diff --git a/dts/arm/nxp/nxp_kl25z.dtsi b/dts/arm/nxp/nxp_kl25z.dtsi index 1f7b0c2a339..9c1eae40d6c 100644 --- a/dts/arm/nxp/nxp_kl25z.dtsi +++ b/dts/arm/nxp/nxp_kl25z.dtsi @@ -6,6 +6,19 @@ #include / { + aliases { + adc-0 = &adc0; + gpio-a = &gpioa; + gpio-b = &gpiob; + gpio-c = &gpioc; + gpio-d = &gpiod; + gpio-e = &gpioe; + i2c-0 = &i2c0; + i2c-1 = &i2c1; + uart-0 = &uart0; + usbd-0 = &usbd; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/dts/arm/nxp/nxp_kw2xd.dtsi b/dts/arm/nxp/nxp_kw2xd.dtsi index 65066ebd303..e6a4e733339 100644 --- a/dts/arm/nxp/nxp_kw2xd.dtsi +++ b/dts/arm/nxp/nxp_kw2xd.dtsi @@ -8,6 +8,28 @@ / { aliases { + adc-0 = &adc0; + gpio-a = &gpioa; + gpio-b = &gpiob; + gpio-c = &gpioc; + gpio-d = &gpiod; + 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; + spi-0 = &spi0; + spi-1 = &spi1; + uart-0 = &uart0; + uart-1 = &uart1; + uart-2 = &uart2; + usbd-0 = &usbd; watchdog0 = &wdog; }; diff --git a/dts/arm/nxp/nxp_kw40z.dtsi b/dts/arm/nxp/nxp_kw40z.dtsi index acc944ebd09..894959773b7 100644 --- a/dts/arm/nxp/nxp_kw40z.dtsi +++ b/dts/arm/nxp/nxp_kw40z.dtsi @@ -6,6 +6,24 @@ #include / { + aliases { + adc-0 = &adc0; + gpio-a = &gpioa; + gpio-b = &gpiob; + gpio-c = &gpioc; + i2c-0 = &i2c0; + i2c-1 = &i2c1; + pinmux-a = &pinmux_a; + pinmux-b = &pinmux_b; + pinmux-c = &pinmux_c; + pwm-0 = &pwm0; + pwm-1 = &pwm1; + pwm-2 = &pwm2; + spi-0 = &spi0; + spi-1 = &spi1; + uart-0 = &lpuart0; + }; + cpus { #address-cells = <1>; #size-cells = <0>; diff --git a/dts/arm/nxp/nxp_kw41z.dtsi b/dts/arm/nxp/nxp_kw41z.dtsi index 1b6858b1c6e..d97d49db8d3 100644 --- a/dts/arm/nxp/nxp_kw41z.dtsi +++ b/dts/arm/nxp/nxp_kw41z.dtsi @@ -6,6 +6,25 @@ #include / { + aliases { + adc-0 = &adc0; + gpio-a = &gpioa; + gpio-b = &gpiob; + gpio-c = &gpioc; + i2c-0 = &i2c0; + i2c-1 = &i2c1; + pinmux-a = &pinmux_a; + pinmux-b = &pinmux_b; + pinmux-c = &pinmux_c; + pwm-0 = &pwm0; + pwm-1 = &pwm1; + pwm-2 = &pwm2; + rtc-0 = &rtc0; + spi-0 = &spi0; + spi-1 = &spi1; + uart-0 = &lpuart0; + }; + cpus { #address-cells = <1>; #size-cells = <0>;