From 28c2c627e5af1bf2fb93ed76b4ab3562819d28db Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Mon, 19 Jun 2017 20:56:08 -0500 Subject: [PATCH] dts: Rename k64f-gpio to kinetis-gpio Multiple Kinetis SoCs have the same gpio hardware as the k64 and can use the same mcux driver, so rename the dts to be more generic. Also fixes some stranded references to kw41z-gpio to the new kinetis-gpio. Signed-off-by: Maureen Helm --- dts/arm/nxp/nxp_k6x.dtsi | 10 +++++----- dts/arm/nxp/nxp_kw40z.dtsi | 6 +++--- dts/arm/nxp/nxp_kw41z.dtsi | 6 +++--- dts/arm/yaml/{k64gpio.yaml => nxp,kinetis-gpio.yaml} | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) rename dts/arm/yaml/{k64gpio.yaml => nxp,kinetis-gpio.yaml} (79%) diff --git a/dts/arm/nxp/nxp_k6x.dtsi b/dts/arm/nxp/nxp_k6x.dtsi index cc25709cc90..291f4f7d942 100644 --- a/dts/arm/nxp/nxp_k6x.dtsi +++ b/dts/arm/nxp/nxp_k6x.dtsi @@ -221,7 +221,7 @@ }; gpioa: gpio@400ff000 { - compatible = "nxp,k64f-gpio"; + compatible = "nxp,kinetis-gpio"; reg = <0x400ff000 0x40>; interrupts = <59 2>; @@ -230,7 +230,7 @@ }; gpiob: gpio@400ff040 { - compatible = "nxp,k64f-gpio"; + compatible = "nxp,kinetis-gpio"; reg = <0x400ff040 0x40>; interrupts = <60 2>; @@ -239,7 +239,7 @@ }; gpioc: gpio@400ff080 { - compatible = "nxp,k64f-gpio"; + compatible = "nxp,kinetis-gpio"; reg = <0x400ff080 0x40>; interrupts = <61 2>; @@ -248,7 +248,7 @@ }; gpiod: gpio@400ff0c0 { - compatible = "nxp,k64f-gpio"; + compatible = "nxp,kinetis-gpio"; reg = <0x400ff0c0 0x40>; interrupts = <62 2>; @@ -257,7 +257,7 @@ }; gpioe: gpio@400ff100 { - compatible = "nxp,k64f-gpio"; + compatible = "nxp,kinetis-gpio"; reg = <0x400ff100 0x40>; interrupts = <63 2>; diff --git a/dts/arm/nxp/nxp_kw40z.dtsi b/dts/arm/nxp/nxp_kw40z.dtsi index 542f591edc6..838d10b8cbf 100644 --- a/dts/arm/nxp/nxp_kw40z.dtsi +++ b/dts/arm/nxp/nxp_kw40z.dtsi @@ -110,7 +110,7 @@ }; gpioa: gpio@400ff000 { - compatible = "nxp,kw41z-gpio"; + compatible = "nxp,kinetis-gpio"; reg = <0x400ff000 0x40>; interrupts = <30 2>; gpio-controller; @@ -118,7 +118,7 @@ }; gpiob: gpio@400ff040 { - compatible = "nxp,kw41z-gpio"; + compatible = "nxp,kinetis-gpio"; reg = <0x400ff040 0x40>; interrupts = <31 2>; gpio-controller; @@ -126,7 +126,7 @@ }; gpioc: gpio@400ff080 { - compatible = "nxp,kw41z-gpio"; + compatible = "nxp,kinetis-gpio"; reg = <0x400ff080 0x40>; interrupts = <31 2>; gpio-controller; diff --git a/dts/arm/nxp/nxp_kw41z.dtsi b/dts/arm/nxp/nxp_kw41z.dtsi index 44457e4c983..9e9e9ff9adf 100644 --- a/dts/arm/nxp/nxp_kw41z.dtsi +++ b/dts/arm/nxp/nxp_kw41z.dtsi @@ -110,7 +110,7 @@ }; gpioa: gpio@400ff000 { - compatible = "nxp,kw41z-gpio"; + compatible = "nxp,kinetis-gpio"; reg = <0x400ff000 0x40>; interrupts = <30 2>; gpio-controller; @@ -118,7 +118,7 @@ }; gpiob: gpio@400ff040 { - compatible = "nxp,kw41z-gpio"; + compatible = "nxp,kinetis-gpio"; reg = <0x400ff040 0x40>; interrupts = <31 2>; gpio-controller; @@ -126,7 +126,7 @@ }; gpioc: gpio@400ff080 { - compatible = "nxp,kw41z-gpio"; + compatible = "nxp,kinetis-gpio"; reg = <0x400ff080 0x40>; interrupts = <31 2>; gpio-controller; diff --git a/dts/arm/yaml/k64gpio.yaml b/dts/arm/yaml/nxp,kinetis-gpio.yaml similarity index 79% rename from dts/arm/yaml/k64gpio.yaml rename to dts/arm/yaml/nxp,kinetis-gpio.yaml index 2ab3afdcf29..39d36fa01df 100644 --- a/dts/arm/yaml/k64gpio.yaml +++ b/dts/arm/yaml/nxp,kinetis-gpio.yaml @@ -1,16 +1,16 @@ --- -title: K64 GPIO +title: Kinetis GPIO version: 0.1 description: > - This is a representation of the K64 GPIO nodes + This is a representation of the Kinetis GPIO nodes properties: - compatible: type: string category: required description: compatible strings - constraint: "nxp,k64f-gpio" + constraint: "nxp,kinetis-gpio" - reg: type: int