Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi
index b67ede515bcdeb9decd615aac0a7b30b0951a30d..548441384d2a39488d7daffef79ed6c707576a86 100644 (file)
--- a/arch/arm/boot/dts/meson.dtsi
+++ b/arch/arm/boot/dts/meson.dtsi
@@ -150,5 +150,25 @@
                        interrupts = <0 15 1>;
                        status = "disabled";
                };
+
+               spifc: spi@c1108c80 {
+                       compatible = "amlogic,meson6-spifc";
+                       reg = <0xc1108c80 0x80>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       clocks = <&clk81>;
+                       status = "disabled";
+               };
+
+               ethmac: ethernet@c9410000 {
+                       compatible = "amlogic,meson6-dwmac", "snps,dwmac";
+                       reg = <0xc9410000 0x10000
+                              0xc1108108 0x4>;
+                       interrupts = <0 8 1>;
+                       interrupt-names = "macirq";
+                       clocks = <&clk81>;
+                       clock-names = "stmmaceth";
+                       status = "disabled";
+               };
        };
 }; /* end of / */