Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a0387a8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto updates from Herbert Xu:
 "Here is the crypto update for 4.12:

  API:
   - Add batch registration for acomp/scomp
   - Change acomp testing to non-unique compressed result
   - Extend algorithm name limit to 128 bytes
   - Require setkey before accept(2) in algif_aead

  Algorithms:
   - Add support for deflate rfc1950 (zlib)

  Drivers:
   - Add accelerated crct10dif for powerpc
   - Add crc32 in stm32
   - Add sha384/sha512 in ccp
   - Add 3des/gcm(aes) for v5 devices in ccp
   - Add Queue Interface (QI) backend support in caam
   - Add new Exynos RNG driver
   - Add ThunderX ZIP driver
   - Add driver for hardware random generator on MT7623 SoC"

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (101 commits)
  crypto: stm32 - Fix OF module alias information
  crypto: algif_aead - Require setkey before accept(2)
  crypto: scomp - add support for deflate rfc1950 (zlib)
  crypto: scomp - allow registration of multiple scomps
  crypto: ccp - Change ISR handler method for a v5 CCP
  crypto: ccp - Change ISR handler method for a v3 CCP
  crypto: crypto4xx - rename ce_ring_contol to ce_ring_control
  crypto: testmgr - Allow ecb(cipher_null) in FIPS mode
  Revert "crypto: arm64/sha - Add constant operand modifier to ASM_EXPORT"
  crypto: ccp - Disable interrupts early on unload
  crypto: ccp - Use only the relevant interrupt bits
  hwrng: mtk - Add driver for hardware random generator on MT7623 SoC
  dt-bindings: hwrng: Add Mediatek hardware random generator bindings
  crypto: crct10dif-vpmsum - Fix missing preempt_disable()
  crypto: testmgr - replace compression known answer test
  crypto: acomp - allow registration of multiple acomps
  hwrng: n2 - Use devm_kcalloc() in n2rng_probe()
  crypto: chcr - Fix error handling related to 'chcr_alloc_shash'
  padata: get_next is never NULL
  crypto: exynos - Add new Exynos RNG driver
  ...
parents 204f144c 929562b1

Documentation/devicetree/bindings/crypto/st,stm32-crc.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
* STMicroelectronics STM32 CRC



Required properties:

- compatible: Should be "st,stm32f7-crc".

- reg: The address and length of the peripheral registers space

- clocks: The input clock of the CRC instance



Optional properties: none



Example:



crc: crc@40023000 {

	compatible = "st,stm32f7-crc";

	reg = <0x40023000 0x400>;

	clocks = <&rcc 0 12>;

};

Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt

+9 −2
Original line number Diff line number Diff line
@@ -6,9 +6,16 @@ Required properties: 
- compatible : should be "amlogic,meson-rng"

- reg : Specifies base physical address and size of the registers.



Optional properties:



- clocks : phandle to the following named clocks

- clock-names: Name of core clock, must be "core"



Example:



rng {

	compatible = "amlogic,meson-rng";

	reg = <0x0 0xc8834000 0x0 0x4>;

	clocks = <&clkc CLKID_RNG0>;

	clock-names = "core";

};

Documentation/devicetree/bindings/rng/mtk-rng.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
Device-Tree bindings for Mediatek random number generator

found in Mediatek SoC family



Required properties:

- compatible	    : Should be "mediatek,mt7623-rng"

- clocks	    : list of clock specifiers, corresponding to

		      entries in clock-names property;

- clock-names	    : Should contain "rng" entries;

- reg 		    : Specifies base physical address and size of the registers



Example:



rng: rng@1020f000 {

	compatible = "mediatek,mt7623-rng";

	reg = <0 0x1020f000 0 0x1000>;

	clocks = <&infracfg CLK_INFRA_TRNG>;

	clock-names = "rng";

};

MAINTAINERS

+17 −1
Original line number Diff line number Diff line
@@ -6242,7 +6242,7 @@ F: drivers/crypto/nx/nx_csbcpb.h 
F:	drivers/crypto/nx/nx_debugfs.h



IBM Power 842 compression accelerator

M:	Dan Streetman <ddstreet@ieee.org>

M:	Haren Myneni <haren@us.ibm.com>

S:	Supported

F:	drivers/crypto/nx/Makefile

F:	drivers/crypto/nx/Kconfig
@@ -10954,6 +10954,14 @@ L: alsa-devel@alsa-project.org (moderated for non-subscribers) 
S:	Supported

F:	sound/soc/samsung/



SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER

M:	Krzysztof Kozlowski <krzk@kernel.org>

L:	linux-crypto@vger.kernel.org

L:	linux-samsung-soc@vger.kernel.org

S:	Maintained

F:	drivers/crypto/exynos-rng.c

F:	Documentation/devicetree/bindings/rng/samsung,exynos-rng4.txt



SAMSUNG FRAMEBUFFER DRIVER

M:	Jingoo Han <jingoohan1@gmail.com>

L:	linux-fbdev@vger.kernel.org
@@ -10978,6 +10986,14 @@ F: Documentation/devicetree/bindings/regulator/samsung,s2m*.txt 
F:	Documentation/devicetree/bindings/regulator/samsung,s5m*.txt

F:	Documentation/devicetree/bindings/clock/samsung,s2mps11.txt



SAMSUNG S5P Security SubSystem (SSS) DRIVER

M:	Krzysztof Kozlowski <krzk@kernel.org>

M:	Vladimir Zapolskiy <vz@mleia.com>

L:	linux-crypto@vger.kernel.org

L:	linux-samsung-soc@vger.kernel.org

S:	Maintained

F:	drivers/crypto/s5p-sss.c



SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS

M:	Kyungmin Park <kyungmin.park@samsung.com>

M:	Sylwester Nawrocki <s.nawrocki@samsung.com>

arch/arm/boot/dts/stm32746g-eval.dts

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ 
	clock-frequency = <25000000>;

};



&crc {

	status = "okay";

};



&usart1 {

	pinctrl-0 = <&usart1_pins_a>;

	pinctrl-names = "default";