Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into...

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

diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi
index da801964a25783a5f11d1aa22afe1cd1e2cc9da9..6283d7912f71b8e826117f3edd3bd26c67c059bc 100644 (file)
--- a/arch/arm/boot/dts/armada-385.dtsi
+++ b/arch/arm/boot/dts/armada-385.dtsi
@@ -16,11 +16,13 @@
 
 / {
        model = "Marvell Armada 385 family SoC";
-       compatible = "marvell,armada385", "marvell,armada38x";
+       compatible = "marvell,armada385", "marvell,armada380";
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
+               enable-method = "marvell,armada-380-smp";
+
                cpu@0 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";