ARM: dts: ux500: Rename gpio-controller node

Rename the AB8500 gpio controller node from ab8500-gpio to
ab8500-gpiocontroller, since -gpio is a common suffix for
gpio consumers.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/ste-ab8500.dtsi b/arch/arm/boot/dts/ste-ab8500.dtsi
index f78b410..d0fe3f9 100644 (file)
--- a/arch/arm/boot/dts/ste-ab8500.dtsi
+++ b/arch/arm/boot/dts/ste-ab8500.dtsi
@@ -34,7 +34,7 @@
                                        #clock-cells = <1>;
                                };
 
-                               ab8500_gpio: ab8500-gpio {
+                               ab8500_gpio: ab8500-gpiocontroller {
                                        compatible = "stericsson,ab8500-gpio";
                                        gpio-controller;
                                        #gpio-cells = <2>;

diff --git a/arch/arm/boot/dts/ste-ab8505.dtsi b/arch/arm/boot/dts/ste-ab8505.dtsi
index 3380afa..0defc15 100644 (file)
--- a/arch/arm/boot/dts/ste-ab8505.dtsi
+++ b/arch/arm/boot/dts/ste-ab8505.dtsi
@@ -31,7 +31,7 @@
                                        #clock-cells = <1>;
                                };
 
-                               ab8505_gpio: ab8505-gpio {
+                               ab8505_gpio: ab8505-gpiocontroller {
                                        compatible = "stericsson,ab8505-gpio";
                                        gpio-controller;
                                        #gpio-cells = <2>;

diff --git a/arch/arm/boot/dts/ste-href-ab8500.dtsi b/arch/arm/boot/dts/ste-href-ab8500.dtsi
index 4946743..3ccb7b5 100644 (file)
--- a/arch/arm/boot/dts/ste-href-ab8500.dtsi
+++ b/arch/arm/boot/dts/ste-href-ab8500.dtsi
@@ -9,7 +9,7 @@
        soc {
                prcmu@80157000 {
                        ab8500 {
-                               ab8500-gpio {
+                               ab8500-gpiocontroller {
                                        /* Hog a few default settings */
                                        pinctrl-names = "default";
                                        pinctrl-0 = <&gpio2_default_mode>,

diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index 83b1796..7566b49 100644 (file)
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -202,7 +202,7 @@
 
                prcmu@80157000 {
                        ab8500 {
-                               ab8500-gpio {
+                               ab8500-gpiocontroller {
                                };
 
                                ab8500_usb {

diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index b344b37..40f1d7c 100644 (file)
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -376,7 +376,7 @@
 
                prcmu@80157000 {
                        ab8500 {
-                               ab8500-gpio {
+                               ab8500-gpiocontroller {
                                        /*
                                         * AB8500 GPIOs are numbered starting from 1, so the first
                                         * index 0 is what in the datasheet is called "GPIO1", and