From 0dd852bc3c54f023e42334d5145c7347d4a17aed Mon Sep 17 00:00:00 2001
From: Maureen Helm <maureen.helm@nxp.com>
Date: Mon, 19 Jun 2017 20:43:45 -0500
Subject: [PATCH] dts: Rename k64f-pinmux to kinetis-pinmux

Multiple Kinetis SoCs have the same pinmux hardware as the k64 and can
use the same mcux driver, so rename the dts to be more generic.

Signed-off-by: Maureen Helm <maureen.helm@nxp.com>
---
 dts/arm/nxp/nxp_k6x.dtsi                      | 10 +++---
 dts/arm/nxp/nxp_kw40z.dtsi                    |  6 ++--
 dts/arm/nxp/nxp_kw41z.dtsi                    |  6 ++--
 ...k64pinmux.yaml => nxp,kinetis-pinmux.yaml} |  6 ++--
 dts/arm/yaml/nxp,kw41z-pinmux.yaml            | 32 -------------------
 5 files changed, 14 insertions(+), 46 deletions(-)
 rename dts/arm/yaml/{k64pinmux.yaml => nxp,kinetis-pinmux.yaml} (78%)
 delete mode 100644 dts/arm/yaml/nxp,kw41z-pinmux.yaml

diff --git a/dts/arm/nxp/nxp_k6x.dtsi b/dts/arm/nxp/nxp_k6x.dtsi
index ad07196ebf0..cc25709cc90 100644
--- a/dts/arm/nxp/nxp_k6x.dtsi
+++ b/dts/arm/nxp/nxp_k6x.dtsi
@@ -169,14 +169,14 @@
 		};
 
 		pinmux_a: pinmux@40049000 {
-			compatible = "nxp,k64f-pinmux";
+			compatible = "nxp,kinetis-pinmux";
 			reg = <0x40049000 0xd0>;
 
 			clocks = <&sim 0x1038 9>;
 		};
 
 		pinmux_b: pinmux@4004a000 {
-			compatible = "nxp,k64f-pinmux";
+			compatible = "nxp,kinetis-pinmux";
 			reg = <0x4004a000 0xd0>;
 
 			clocks = <&sim 0x1038 10>;
@@ -203,19 +203,19 @@
 		};
 
 		pinmux_c: pinmux@4004b000 {
-			compatible = "nxp,k64f-pinmux";
+			compatible = "nxp,kinetis-pinmux";
 			reg = <0x4004b000 0xd0>;
 			clocks = <&sim 0x1038 11>;
 		};
 
 		pinmux_d: pinmux@4004c000 {
-			compatible = "nxp,k64f-pinmux";
+			compatible = "nxp,kinetis-pinmux";
 			reg = <0x4004c000 0xd0>;
 			clocks = <&sim 0x1038 12>;
 		};
 
 		pinmux_e: pinmux@4004d000 {
-			compatible = "nxp,k64f-pinmux";
+			compatible = "nxp,kinetis-pinmux";
 			reg = <0x4004d000 0xd0>;
 			clocks = <&sim 0x1038 13>;
 		};
diff --git a/dts/arm/nxp/nxp_kw40z.dtsi b/dts/arm/nxp/nxp_kw40z.dtsi
index 537e2c8908b..542f591edc6 100644
--- a/dts/arm/nxp/nxp_kw40z.dtsi
+++ b/dts/arm/nxp/nxp_kw40z.dtsi
@@ -57,7 +57,7 @@
 		};
 
 		pinmux_a: pinmux@40049000 {
-			compatible = "nxp,kw41z-pinmux";
+			compatible = "nxp,kinetis-pinmux";
 			reg = <0x40049000 0xa4>;
 			clocks = <&sim 0x1038 9>;
 
@@ -70,13 +70,13 @@
 		};
 
 		pinmux_b: pinmux@4004a000 {
-			compatible = "nxp,kw41z-pinmux";
+			compatible = "nxp,kinetis-pinmux";
 			reg = <0x4004a000 0xa4>;
 			clocks = <&sim 0x1038 10>;
 		};
 
 		pinmux_c: pinmux@4004b000 {
-			compatible = "nxp,kw41z-pinmux";
+			compatible = "nxp,kinetis-pinmux";
 			reg = <0x4004b000 0xa4>;
 			clocks = <&sim 0x1038 11>;
 
diff --git a/dts/arm/nxp/nxp_kw41z.dtsi b/dts/arm/nxp/nxp_kw41z.dtsi
index 1090396d482..44457e4c983 100644
--- a/dts/arm/nxp/nxp_kw41z.dtsi
+++ b/dts/arm/nxp/nxp_kw41z.dtsi
@@ -57,7 +57,7 @@
 		};
 
 		pinmux_a: pinmux@40049000 {
-			compatible = "nxp,kw41z-pinmux";
+			compatible = "nxp,kinetis-pinmux";
 			reg = <0x40049000 0xa4>;
 			clocks = <&sim 0x1038 9>;
 
@@ -70,13 +70,13 @@
 		};
 
 		pinmux_b: pinmux@4004a000 {
-			compatible = "nxp,kw41z-pinmux";
+			compatible = "nxp,kinetis-pinmux";
 			reg = <0x4004a000 0xa4>;
 			clocks = <&sim 0x1038 10>;
 		};
 
 		pinmux_c: pinmux@4004b000 {
-			compatible = "nxp,kw41z-pinmux";
+			compatible = "nxp,kinetis-pinmux";
 			reg = <0x4004b000 0xa4>;
 			clocks = <&sim 0x1038 11>;
 
diff --git a/dts/arm/yaml/k64pinmux.yaml b/dts/arm/yaml/nxp,kinetis-pinmux.yaml
similarity index 78%
rename from dts/arm/yaml/k64pinmux.yaml
rename to dts/arm/yaml/nxp,kinetis-pinmux.yaml
index b6101528236..27e198f0721 100644
--- a/dts/arm/yaml/k64pinmux.yaml
+++ b/dts/arm/yaml/nxp,kinetis-pinmux.yaml
@@ -1,16 +1,16 @@
 ---
-title: K64 Pinmux
+title: Kinetis Pinmux
 version: 0.1
 
 description: >
-    This is a representation of the K64 Pinmux node
+    This is a representation of the Kinetis Pinmux node
 
 properties:
   - compatible:
       type: string
       category: required
       description: compatible strings
-      constraint: "nxp,k64f-pinmux"
+      constraint: "nxp,kinetis-pinmux"
 
   - reg:
       type: int
diff --git a/dts/arm/yaml/nxp,kw41z-pinmux.yaml b/dts/arm/yaml/nxp,kw41z-pinmux.yaml
deleted file mode 100644
index 1b18e11d042..00000000000
--- a/dts/arm/yaml/nxp,kw41z-pinmux.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-title: KW41Z Pinmux
-version: 0.1
-
-description: >
-    This is a representation of the KW41Z Pinmux node
-
-properties:
-  - compatible:
-      type: string
-      category: required
-      description: compatible strings
-      constraint: "nxp,kw41z-pinmux"
-
-  - reg:
-      type: int
-      description: mmio register space
-      generation: define
-      category: required
-
-  - clocks:
-      type: array
-      description: clock gate information
-      generation: define
-      category: required
-
-cell_string: PINMUX
-
-"#cells":
-  - pin
-  - function
-...