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

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / boot / dts / wm8850.dtsi

diff --git a/arch/arm/boot/dts/wm8850.dtsi b/arch/arm/boot/dts/wm8850.dtsi
index e8cbfdc87bba4bcfaa64089377727b02db13b0a3..fc790d0aee66e6399865802adc49bfe58fd9af71 100644 (file)
--- a/arch/arm/boot/dts/wm8850.dtsi
+++ b/arch/arm/boot/dts/wm8850.dtsi
@@ -41,11 +41,13 @@
                        interrupts = <56 57 58 59 60 61 62 63>;
                };
 
-               gpio: gpio-controller@d8110000 {
-                       compatible = "wm,wm8650-gpio";
-                       gpio-controller;
+               pinctrl: pinctrl@d8110000 {
+                       compatible = "wm,wm8850-pinctrl";
                        reg = <0xd8110000 0x10000>;
-                       #gpio-cells = <3>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
                };
 
                pmc@d8130000 {
@@ -135,11 +137,9 @@
                        };
                };
 
-               fb@d8051700 {
+               fb: fb@d8051700 {
                        compatible = "wm,wm8505-fb";
                        reg = <0xd8051700 0x200>;
-                       display = <&display>;
-                       default-mode = <&mode0>;
                };
 
                ge_rops@d8050400 {