Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / arm / boot / dts / kirkwood-ts219.dtsi

diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index b9325d45be78a732c9f3bef765661b4046c09f9b..0c9a94cd666c597dab629b8a9a7908f02e82abd6 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -1,5 +1,3 @@
-/include/ "kirkwood.dtsi"
-
 / {
        model = "QNAP TS219 family";
        compatible = "qnap,ts219", "marvell,kirkwood";
@@ -37,6 +35,11 @@
                        pinctrl-0 = <&pmx_uart1>;
                        pinctrl-names = "default";
                };
+               poweroff@12100 {
+                       compatible = "qnap,power-off";
+                       reg = <0x12000 0x100>;
+                       clocks = <&gate_clk 7>;
+               };
                spi@10600 {
                        status = "okay";
                        pinctrl-0 = <&pmx_spi>;
@@ -84,5 +87,12 @@
                        status = "okay";
                        nr-ports = <2>;
                };
+               pcie-controller {
+                       status = "okay";
+
+                       pcie@1,0 {
+                               status = "okay";
+                       };
+               };
        };
 };