Merge tag 'cris-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper...

[cascardo/linux.git] / arch / arm64 / boot / dts / hisilicon / hip05.dtsi

diff --git a/arch/arm64/boot/dts/hisilicon/hip05.dtsi b/arch/arm64/boot/dts/hisilicon/hip05.dtsi
index 6319ff3..4b472a3 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hip05.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hip05.dtsi
@@ -249,24 +249,28 @@
                its_peri: interrupt-controller@8c000000 {
                        compatible = "arm,gic-v3-its";
                        msi-controller;
+                       #msi-cells = <1>;
                        reg = <0x0 0x8c000000 0x0 0x40000>;
                };
 
                its_m3: interrupt-controller@a3000000 {
                        compatible = "arm,gic-v3-its";
                        msi-controller;
+                       #msi-cells = <1>;
                        reg = <0x0 0xa3000000 0x0 0x40000>;
                };
 
                its_pcie: interrupt-controller@b7000000 {
                        compatible = "arm,gic-v3-its";
                        msi-controller;
+                       #msi-cells = <1>;
                        reg = <0x0 0xb7000000 0x0 0x40000>;
                };
 
                its_dsa: interrupt-controller@c6000000 {
                        compatible = "arm,gic-v3-its";
                        msi-controller;
+                       #msi-cells = <1>;
                        reg = <0x0 0xc6000000 0x0 0x40000>;
                };
        };
@@ -296,11 +300,6 @@
                        clock-frequency = <200000000>;
                };
 
-               peri_c_subctrl: syscon@80000000 {
-                       compatible = "hisilicon,hip05-perisubc", "syscon";
-                       reg = < 0x0 0x80000000 0x0 0x10000>;
-               };
-
                uart0: uart@80300000 {
                        compatible = "snps,dw-apb-uart";
                        reg = <0x0 0x80300000 0x0 0x10000>;
@@ -323,6 +322,12 @@
                        status = "disabled";
                };
 
+               lbc: localbus@80380000 {
+                       compatible = "hisilicon,hisi-localbus", "simple-bus";
+                       reg = <0x0 0x80380000 0x0 0x10000>;
+                       status = "disabled";
+               };
+
                peri_gpio0: gpio@802e0000 {
                        #address-cells = <1>;
                        #size-cells = <0>;