Skip to content

Commit d2687b8

Browse files
committed
Merge tag 'sunxi-fixes-for-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes
Allwinner Fixes for 5.6 - part 2 This follows up on the previous 5.6 fixes tag with a fix for the A33 Security System (crypto offloading hardware). The hardware was found to not be compatible with existing hardware and a new compatible was needed. The driver change was picked up right before the previous -rc6 and the DT bindings and DT changes were not picked up. The goal is to have all the changes in the same release, that is v5.6. * tag 'sunxi-fixes-for-5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: ARM: dts: sun8i: a33: add the new SS compatible dt-bindings: crypto: add new compatible for A33 SS Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents aafd017 + 00cef5e commit d2687b8

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ properties:
2323
- items:
2424
- const: allwinner,sun7i-a20-crypto
2525
- const: allwinner,sun4i-a10-crypto
26+
- items:
27+
- const: allwinner,sun8i-a33-crypto
2628

2729
reg:
2830
maxItems: 1

arch/arm/boot/dts/sun8i-a33.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@
215215
};
216216

217217
crypto: crypto-engine@1c15000 {
218-
compatible = "allwinner,sun4i-a10-crypto";
218+
compatible = "allwinner,sun8i-a33-crypto";
219219
reg = <0x01c15000 0x1000>;
220220
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
221221
clocks = <&ccu CLK_BUS_SS>, <&ccu CLK_SS>;

0 commit comments

Comments
 (0)