From 22955b83fda5ba44435948aef967800278b858a1 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Thu, 19 Apr 2018 11:48:18 -0500 Subject: [PATCH] dts: Add gpio labels to all kinetis socs Adds gpio labels to all kinetis socs in preparation for refactoring the mcux gpio driver to dts. The kl25z was missing gpio nodes altogether, so they are added. Signed-off-by: Maureen Helm --- dts/arm/nxp/nxp_k6x.dtsi | 11 ++++--- dts/arm/nxp/nxp_kl25z.dtsi | 43 +++++++++++++++++++++++++ dts/arm/nxp/nxp_kw2xd.dtsi | 11 ++++--- dts/arm/nxp/nxp_kw40z.dtsi | 4 +++ dts/arm/nxp/nxp_kw41z.dtsi | 4 +++ dts/bindings/gpio/nxp,kinetis-gpio.yaml | 6 ++++ 6 files changed, 69 insertions(+), 10 deletions(-) diff --git a/dts/arm/nxp/nxp_k6x.dtsi b/dts/arm/nxp/nxp_k6x.dtsi index 5e401f5329e..70eff895e9c 100644 --- a/dts/arm/nxp/nxp_k6x.dtsi +++ b/dts/arm/nxp/nxp_k6x.dtsi @@ -1,5 +1,6 @@ #include #include +#include #include / { @@ -242,7 +243,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff000 0x40>; interrupts = <59 2>; - + label = "GPIO_0"; gpio-controller; #gpio-cells = <2>; }; @@ -251,7 +252,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff040 0x40>; interrupts = <60 2>; - + label = "GPIO_1"; gpio-controller; #gpio-cells = <2>; }; @@ -260,7 +261,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff080 0x40>; interrupts = <61 2>; - + label = "GPIO_2"; gpio-controller; #gpio-cells = <2>; }; @@ -269,7 +270,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff0c0 0x40>; interrupts = <62 2>; - + label = "GPIO_3"; gpio-controller; #gpio-cells = <2>; }; @@ -278,7 +279,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff100 0x40>; interrupts = <63 2>; - + label = "GPIO_4"; gpio-controller; #gpio-cells = <2>; }; diff --git a/dts/arm/nxp/nxp_kl25z.dtsi b/dts/arm/nxp/nxp_kl25z.dtsi index 61665025df3..6275232bbab 100644 --- a/dts/arm/nxp/nxp_kl25z.dtsi +++ b/dts/arm/nxp/nxp_kl25z.dtsi @@ -1,5 +1,6 @@ #include "armv6-m.dtsi" #include +#include #include / { @@ -94,6 +95,48 @@ label = "ADC_0"; status = "disabled"; }; + + gpioa: gpio@400ff000 { + compatible = "nxp,kinetis-gpio"; + reg = <0x400ff000 0x40>; + interrupts = <30 2>; + label = "GPIO_0"; + gpio-controller; + #gpio-cells = <2>; + }; + + gpiob: gpio@400ff040 { + compatible = "nxp,kinetis-gpio"; + reg = <0x400ff040 0x40>; + label = "GPIO_1"; + gpio-controller; + #gpio-cells = <2>; + }; + + gpioc: gpio@400ff080 { + compatible = "nxp,kinetis-gpio"; + reg = <0x400ff080 0x40>; + label = "GPIO_2"; + gpio-controller; + #gpio-cells = <2>; + }; + + gpiod: gpio@400ff0c0 { + compatible = "nxp,kinetis-gpio"; + reg = <0x400ff0c0 0x40>; + interrupts = <31 2>; + label = "GPIO_3"; + gpio-controller; + #gpio-cells = <2>; + }; + + gpioe: gpio@400ff100 { + compatible = "nxp,kinetis-gpio"; + reg = <0x400ff100 0x40>; + label = "GPIO_4"; + gpio-controller; + #gpio-cells = <2>; + }; }; }; diff --git a/dts/arm/nxp/nxp_kw2xd.dtsi b/dts/arm/nxp/nxp_kw2xd.dtsi index f47afab5092..35f8e6aa140 100644 --- a/dts/arm/nxp/nxp_kw2xd.dtsi +++ b/dts/arm/nxp/nxp_kw2xd.dtsi @@ -1,5 +1,6 @@ #include #include +#include #include / { @@ -193,7 +194,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff000 0x40>; interrupts = <59 2>; - + label = "GPIO_0"; gpio-controller; #gpio-cells = <2>; }; @@ -202,7 +203,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff040 0x40>; interrupts = <60 2>; - + label = "GPIO_1"; gpio-controller; #gpio-cells = <2>; }; @@ -211,7 +212,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff080 0x40>; interrupts = <61 2>; - + label = "GPIO_2"; gpio-controller; #gpio-cells = <2>; }; @@ -220,7 +221,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff0c0 0x40>; interrupts = <62 2>; - + label = "GPIO_3"; gpio-controller; #gpio-cells = <2>; }; @@ -229,7 +230,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff100 0x40>; interrupts = <63 2>; - + label = "GPIO_4"; gpio-controller; #gpio-cells = <2>; }; diff --git a/dts/arm/nxp/nxp_kw40z.dtsi b/dts/arm/nxp/nxp_kw40z.dtsi index a8961ae11eb..728be5d430a 100644 --- a/dts/arm/nxp/nxp_kw40z.dtsi +++ b/dts/arm/nxp/nxp_kw40z.dtsi @@ -1,5 +1,6 @@ #include "armv6-m.dtsi" #include +#include #include / { @@ -161,6 +162,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff000 0x40>; interrupts = <30 2>; + label = "GPIO_0"; gpio-controller; #gpio-cells = <2>; }; @@ -169,6 +171,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff040 0x40>; interrupts = <31 2>; + label = "GPIO_2"; gpio-controller; #gpio-cells = <2>; }; @@ -177,6 +180,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff080 0x40>; interrupts = <31 2>; + label = "GPIO_3"; gpio-controller; #gpio-cells = <2>; }; diff --git a/dts/arm/nxp/nxp_kw41z.dtsi b/dts/arm/nxp/nxp_kw41z.dtsi index 9fc38f6f360..73b0136dc5d 100644 --- a/dts/arm/nxp/nxp_kw41z.dtsi +++ b/dts/arm/nxp/nxp_kw41z.dtsi @@ -1,5 +1,6 @@ #include #include +#include #include / { @@ -161,6 +162,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff000 0x40>; interrupts = <30 2>; + label = "GPIO_0"; gpio-controller; #gpio-cells = <2>; }; @@ -169,6 +171,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff040 0x40>; interrupts = <31 2>; + label = "GPIO_1"; gpio-controller; #gpio-cells = <2>; }; @@ -177,6 +180,7 @@ compatible = "nxp,kinetis-gpio"; reg = <0x400ff080 0x40>; interrupts = <31 2>; + label = "GPIO_2"; gpio-controller; #gpio-cells = <2>; }; diff --git a/dts/bindings/gpio/nxp,kinetis-gpio.yaml b/dts/bindings/gpio/nxp,kinetis-gpio.yaml index 48e49ddf44d..43f8470a884 100644 --- a/dts/bindings/gpio/nxp,kinetis-gpio.yaml +++ b/dts/bindings/gpio/nxp,kinetis-gpio.yaml @@ -24,6 +24,12 @@ properties: description: required interrupts generation: define + label: + type: string + category: required + description: Human readable string describing the device (used by Zephyr for API name) + generation: define + cell_string: GPIO "#cells":