Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/arch/arm/boot/dts/sama5d3xcm.dtsi b/arch/arm/boot/dts/sama5d3xcm.dtsi
index 1f8050813a5485c76fecd41c3eef93b54bdcf80a..31ed9e3bb649ab9a6af644d58a36576bc0d3cabd 100644 (file)
--- a/arch/arm/boot/dts/sama5d3xcm.dtsi
+++ b/arch/arm/boot/dts/sama5d3xcm.dtsi
@@ -47,8 +47,6 @@
                        atmel,has-pmecc;
                        atmel,pmecc-cap = <4>;
                        atmel,pmecc-sector-size = <512>;
-                       atmel,has-nfc;
-                       atmel,use-nfc-sram;
                        nand-on-flash-bbt;
                        status = "okay";