ARM: dts: ux500: Rename gpio-controller node

[ Upstream commit 4917b702818872fdf2a9973705af3aa7d3d1f19e ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/ste-ab8500.dtsi b/arch/arm/boot/dts/ste-ab8500.dtsi
index 5fde474ade228cd98e955ceae13cb219b3b51b4d..16d50369226af48f79655b509f380ef2df4e00d7 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 dbaedda2824d5dfc909d6e4a1f3783a6ae985044..8d2cda0b4d6227432a7aa1187738aee44ce8b966 100644 (file)
--- a/arch/arm/boot/dts/ste-ab8505.dtsi
+++ b/arch/arm/boot/dts/ste-ab8505.dtsi
@@ -30,7 +30,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 4946743de7b9b8be09faffb09e6d70a4186594a3..3ccb7b5c71625c1ae9880aeca338f9cd7b4379b3 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 359c1219b0babebe92187847c64ec60d3c6d587c..3586b5d7876a484ca59fbb5babf1f061cb7962db 100644 (file)
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -224,7 +224,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 27d8a07718a001c31b9f38ef21c6c2f33b12425f..f6e0d71f6c09f72b58e9cf19d9e3ba451b32fab9 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