V3S contains crypto engine that is compatible with "sun4i-ss". Tested-by: Martin Cerveny <m.cerveny@xxxxxxxxxxxx> Signed-off-by: Martin Cerveny <m.cerveny@xxxxxxxxxxxx> --- .../bindings/crypto/allwinner,sun4i-a10-crypto.yaml | 5 ++++- arch/arm/boot/dts/sun8i-v3s.dtsi | 10 ++++++++++ drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c | 7 +++++++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml b/Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml index fc823572b..180efd13a 100644 --- a/Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml +++ b/Documentation/devicetree/bindings/crypto/allwinner,sun4i-a10-crypto.yaml @@ -25,6 +25,7 @@ properties: - const: allwinner,sun4i-a10-crypto - items: - const: allwinner,sun8i-a33-crypto + - const: allwinner,sun8i-v3s-crypto reg: maxItems: 1 @@ -59,7 +60,9 @@ if: properties: compatible: contains: - const: allwinner,sun6i-a31-crypto + oneOf: + - const: allwinner,sun6i-a31-crypto + - const: allwinner,sun8i-v3s-crypto then: required: diff --git a/arch/arm/boot/dts/sun8i-v3s.dtsi b/arch/arm/boot/dts/sun8i-v3s.dtsi index e5312869c..4fec84c40 100644 --- a/arch/arm/boot/dts/sun8i-v3s.dtsi +++ b/arch/arm/boot/dts/sun8i-v3s.dtsi @@ -234,6 +234,16 @@ #size-cells = <0>; }; + crypto: crypto@1c15000 { + compatible = "allwinner,sun8i-v3s-crypto"; + reg = <0x01c15000 0x1000>; + interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&ccu CLK_BUS_CE>, <&ccu CLK_CE>; + clock-names = "ahb", "mod"; + resets = <&ccu RST_BUS_CE>; + reset-names = "ahb"; + }; + usb_otg: usb@1c19000 { compatible = "allwinner,sun8i-h3-musb"; reg = <0x01c19000 0x0400>; diff --git a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c index a2b67f7f8..d24496cac 100644 --- a/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c +++ b/drivers/crypto/allwinner/sun4i-ss/sun4i-ss-core.c @@ -31,6 +31,10 @@ static const struct ss_variant ss_a33_variant = { .sha1_in_be = true, }; +static const struct ss_variant ss_v3s_variant = { + .sha1_in_be = true, +}; + static struct sun4i_ss_alg_template ss_algs[] = { { .type = CRYPTO_ALG_TYPE_AHASH, .mode = SS_OP_MD5, @@ -505,6 +509,9 @@ static const struct of_device_id a20ss_crypto_of_match_table[] = { { .compatible = "allwinner,sun8i-a33-crypto", .data = &ss_a33_variant }, + { .compatible = "allwinner,sun8i-v3s-crypto", + .data = &ss_v3s_variant + }, {} }; MODULE_DEVICE_TABLE(of, a20ss_crypto_of_match_table); -- 2.17.1