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

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

diff --git a/arch/arm/boot/dts/sun5i.dtsi b/arch/arm/boot/dts/sun5i.dtsi
index 5175f9cc9bed0f4f6169c1ef9387ffa74044b0b5..98cc00341b005486a800394797696ea4675a060a 100644 (file)
--- a/arch/arm/boot/dts/sun5i.dtsi
+++ b/arch/arm/boot/dts/sun5i.dtsi
@@ -272,6 +272,7 @@
                                        tcon0_out_tve0: endpoint@1 {
                                                reg = <1>;
                                                remote-endpoint = <&tve0_in_tcon0>;
+                                               allwinner,tcon-channel = <1>;
                                        };
                                };
                        };
@@ -355,6 +356,15 @@
                        status = "disabled";
                };
 
+               crypto: crypto-engine@01c15000 {
+                       compatible = "allwinner,sun5i-a13-crypto",
+                                    "allwinner,sun4i-a10-crypto";
+                       reg = <0x01c15000 0x1000>;
+                       interrupts = <54>;
+                       clocks = <&ccu CLK_AHB_SS>, <&ccu CLK_SS>;
+                       clock-names = "ahb", "mod";
+               };
+
                spi2: spi@01c17000 {
                        compatible = "allwinner,sun4i-a10-spi";
                        reg = <0x01c17000 0x1000>;