linux-surface/kernel/arch/arm/boot/dts/sun5i.dtsi.rej
2017-09-04 22:31:27 -04:00

27 lines
762 B
Plaintext

--- scripts/dtc/include-prefixes/arm/sun5i.dtsi 2017-08-30 04:32:30.000000000 -0400
+++ scripts/dtc/include-prefixes/arm/sun5i.dtsi 2017-09-03 16:56:17.000000000 -0400
@@ -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>;