ARM: dts: berlin: Use generic "ngpios" rather than "snps,nr-gpios"

This is to remove similar errors as below:

OF: /.../gpio-port@0: could not find phandle

Commit 7569486d79ae ("gpio: dwapb: Add ngpios DT-property support")
explained the reason of above errors well and added the generic
"ngpios" property, let's use it.

Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/berlin2.dtsi b/arch/arm/boot/dts/berlin2.dtsi
index 6194857..1114c59 100644 (file)
--- a/arch/arm/boot/dts/berlin2.dtsi
+++ b/arch/arm/boot/dts/berlin2.dtsi
@@ -191,7 +191,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <8>;
+                                       ngpios = <8>;
                                        reg = <0>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
@@ -209,7 +209,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <8>;
+                                       ngpios = <8>;
                                        reg = <0>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
@@ -227,7 +227,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <8>;
+                                       ngpios = <8>;
                                        reg = <0>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
@@ -245,7 +245,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <8>;
+                                       ngpios = <8>;
                                        reg = <0>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
@@ -446,7 +446,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <8>;
+                                       ngpios = <8>;
                                        reg = <0>;
                                };
                        };
@@ -461,7 +461,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <8>;
+                                       ngpios = <8>;
                                        reg = <0>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;

diff --git a/arch/arm/boot/dts/berlin2cd.dtsi b/arch/arm/boot/dts/berlin2cd.dtsi
index 6f30d7e..b2768f7 100644 (file)
--- a/arch/arm/boot/dts/berlin2cd.dtsi
+++ b/arch/arm/boot/dts/berlin2cd.dtsi
@@ -181,7 +181,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <8>;
+                                       ngpios = <8>;
                                        reg = <0>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
@@ -199,7 +199,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <8>;
+                                       ngpios = <8>;
                                        reg = <0>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
@@ -217,7 +217,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <8>;
+                                       ngpios = <8>;
                                        reg = <0>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
@@ -235,7 +235,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <8>;
+                                       ngpios = <8>;
                                        reg = <0>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
@@ -473,7 +473,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <8>;
+                                       ngpios = <8>;
                                        reg = <0>;
                                };
                        };
@@ -518,7 +518,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <8>;
+                                       ngpios = <8>;
                                        reg = <0>;
                                };
                        };

diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index b6a0aca..598a46f 100644 (file)
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -252,7 +252,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <32>;
+                                       ngpios = <32>;
                                        reg = <0>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
@@ -270,7 +270,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <32>;
+                                       ngpios = <32>;
                                        reg = <0>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
@@ -288,7 +288,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <32>;
+                                       ngpios = <32>;
                                        reg = <0>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
@@ -306,7 +306,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <32>;
+                                       ngpios = <32>;
                                        reg = <0>;
                                        interrupt-controller;
                                        #interrupt-cells = <2>;
@@ -552,7 +552,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <32>;
+                                       ngpios = <32>;
                                        reg = <0>;
                                };
                        };
@@ -613,7 +613,7 @@
                                        compatible = "snps,dw-apb-gpio-port";
                                        gpio-controller;
                                        #gpio-cells = <2>;
-                                       snps,nr-gpios = <32>;
+                                       ngpios = <32>;
                                        reg = <0>;
                                };
                        };