Merge branch 'late/fixes' into fixes

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / vt8500.dtsi

diff --git a/arch/arm/boot/dts/vt8500.dtsi b/arch/arm/boot/dts/vt8500.dtsi
index 68c8dc644383a248a502bb5da7a359010a6b4342..4a4b96f6827ed59f7f468b09eae2704fba5e92ad 100644 (file)
--- a/arch/arm/boot/dts/vt8500.dtsi
+++ b/arch/arm/boot/dts/vt8500.dtsi
@@ -25,11 +25,13 @@
                        #interrupt-cells = <1>;
                };
 
-               gpio: gpio-controller@d8110000 {
-                       compatible = "via,vt8500-gpio";
-                       gpio-controller;
+               pinctrl: pinctrl@d8110000 {
+                       compatible = "via,vt8500-pinctrl";
                        reg = <0xd8110000 0x10000>;
-                       #gpio-cells = <3>;
+                       interrupt-controller;
+                       #interrupt-cells = <2>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
                };
 
                pmc@d8130000 {