Commit d2687b89 authored Mar 25, 2020 by Arnd Bergmann

Merge tag 'sunxi-fixes-for-5.6-2' of...

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/20200313060727.GA23962@wens.csie.org


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents aafd0173 00cef5e4

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,8 @@ properties:
		- items:
		- const: allwinner,sun7i-a20-crypto
		- const: allwinner,sun4i-a10-crypto
		- items:
		- const: allwinner,sun8i-a33-crypto

		reg:
		maxItems: 1

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -215,7 +215,7 @@
		};

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

Admin message