Merge tag 'pm+acpi-3.16-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafae...
[cascardo/linux.git] / arch / mips / netlogic / dts / xlp_gvp.dts
index 047d27f..bb4ecd1 100644 (file)
                        interrupt-parent = <&pic>;
                        interrupts = <17>;
                };
-               pic: pic@4000 {
-                       interrupt-controller;
+               pic: pic@110000 {
+                       compatible = "netlogic,xlp-pic";
                        #address-cells = <0>;
                        #interrupt-cells = <1>;
                        reg = <0 0x110000 0x200>;
+                       interrupt-controller;
                };
 
                nor_flash@1,0 {