Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[karo-tx-linux.git] / arch / arm / boot / dts / wm8505.dtsi

diff --git a/arch/arm/boot/dts/wm8505.dtsi b/arch/arm/boot/dts/wm8505.dtsi
index 388f26d0d44945f2cb1c06b9a5b06c34c09caa60..b2bf359e852f9f6505d9f3946ce1d66515b91920 100644 (file)
--- a/arch/arm/boot/dts/wm8505.dtsi
+++ b/arch/arm/boot/dts/wm8505.dtsi
@@ -40,11 +40,13 @@
                        interrupts = <56 57 58 59 60 61 62 63>;
                };
 
-               gpio: gpio-controller@d8110000 {
-                       compatible = "wm,wm8505-gpio";
-                       gpio-controller;
+               pinctrl: pinctrl@d8110000 {
+                       compatible = "wm,wm8505-pinctrl";
                        reg = <0xd8110000 0x10000>;
-                       #gpio-cells = <3>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
                };
 
                pmc@d8130000 {
@@ -151,11 +153,9 @@
                        interrupts = <0>;
                };
 
-               fb@d8050800 {
+               fb: fb@d8050800 {
                        compatible = "wm,wm8505-fb";
                        reg = <0xd8050800 0x200>;
-                       display = <&display>;
-                       default-mode = <&mode0>;
                };
 
                ge_rops@d8050400 {