Merge branch 'misc.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index 93aa55970bd7a28bdede575b6da0a88daa352568..96bee776e1456b2e8787390bbcadbaecfb8563cd 100644 (file)
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -1019,7 +1019,8 @@
                };
 
                crypto: crypto-engine@01c15000 {
-                       compatible = "allwinner,sun4i-a10-crypto";
+                       compatible = "allwinner,sun7i-a20-crypto",
+                                    "allwinner,sun4i-a10-crypto";
                        reg = <0x01c15000 0x1000>;
                        interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
                        clocks = <&ahb_gates 5>, <&ss_clk>;
@@ -1190,12 +1191,6 @@
                                bias-pull-up;
                        };
 
-                       mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
-                               pins = "PH1";
-                               function = "gpio_in";
-                               bias-pull-up;
-                       };
-
                        mmc2_pins_a: mmc2@0 {
                                pins = "PC6", "PC7", "PC8",
                                       "PC9", "PC10", "PC11";