Merge tag 'nfsd-4.15' of git://linux-nfs.org/~bfields/linux

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / meson.dtsi

diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi
index cd6ad072e72c17ebe287b72d3f26657a402a97ba..4926133077b3541165ccf989af0834a8362411b3 100644 (file)
--- a/arch/arm/boot/dts/meson.dtsi
+++ b/arch/arm/boot/dts/meson.dtsi
@@ -80,6 +80,20 @@
                        #size-cells = <1>;
                        ranges = <0x0 0xc1100000 0x200000>;
 
+                       assist: assist@7c00 {
+                               compatible = "amlogic,meson-mx-assist", "syscon";
+                               reg = <0x7c00 0x200>;
+                       };
+
+                       gpio_intc: interrupt-controller@9880 {
+                               compatible = "amlogic,meson-gpio-intc";
+                               reg = <0xc1109880 0x10>;
+                               interrupt-controller;
+                               #interrupt-cells = <2>;
+                               amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
+                               status = "disabled";
+                       };
+
                        hwrng: rng@8100 {
                                compatible = "amlogic,meson-rng";
                                reg = <0x8100 0x8>;
@@ -160,6 +174,15 @@
                                status = "disabled";
                        };
 
+                       sdio: mmc@8c20 {
+                               compatible = "amlogic,meson-mx-sdio";
+                               reg = <0x8c20 0x20>;
+                               interrupts = <GIC_SPI 28 IRQ_TYPE_EDGE_RISING>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
+
                        spifc: spi@8c80 {
                                compatible = "amlogic,meson6-spifc";
                                reg = <0x8c80 0x80>;
@@ -217,7 +240,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xc9040000 0x40000>;
-                       interrupts = <GIC_SPI 30 IRQ_TYPE_EDGE_RISING>;
+                       interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
                        phys = <&usb0_phy>;
                        phy-names = "usb2-phy";
                        dr_mode = "host";
@@ -229,7 +252,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0xc90c0000 0x40000>;
-                       interrupts = <GIC_SPI 31 IRQ_TYPE_EDGE_RISING>;
+                       interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
                        phys = <&usb1_phy>;
                        phy-names = "usb2-phy";
                        dr_mode = "host";
@@ -252,5 +275,25 @@
                        #size-cells = <1>;
                        ranges = <0 0xd9000000 0x20000>;
                };
+
+               bootrom: bootrom@d9040000 {
+                       compatible = "amlogic,meson-mx-bootrom", "syscon";
+                       reg = <0xd9040000 0x10000>;
+               };
+
+               secbus: secbus@da000000 {
+                       compatible = "simple-bus";
+                       reg = <0xda000000 0x6000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0x0 0xda000000 0x6000>;
+
+                       efuse: nvmem@0 {
+                               compatible = "amlogic,meson6-efuse";
+                               reg = <0x0 0x2000>;
+                               #address-cells = <1>;
+                               #size-cells = <1>;
+                       };
+               };
        };
 }; /* end of / */