Linus Torvalds
d4c90396ed
Merge 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.3:
API:
- the AEAD interface transition is now complete.
- add top-level skcipher interface.
Drivers:
- x86-64 acceleration for chacha20/poly1305.
- add sunxi-ss Allwinner Security System crypto accelerator.
- add RSA algorithm to qat driver.
- add SRIOV support to qat driver.
- add LS1021A support to caam.
- add i.MX6 support to caam"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (163 commits)
crypto: algif_aead - fix for multiple operations on AF_ALG sockets
crypto: qat - enable legacy VFs
MPI: Fix mpi_read_buffer
crypto: qat - silence a static checker warning
crypto: vmx - Fixing opcode issue
crypto: caam - Use the preferred style for memory allocations
crypto: caam - Propagate the real error code in caam_probe
crypto: caam - Fix the error handling in caam_probe
crypto: caam - fix writing to JQCR_MS when using service interface
crypto: hash - Add AHASH_REQUEST_ON_STACK
crypto: testmgr - Use new skcipher interface
crypto: skcipher - Add top-level skcipher interface
crypto: cmac - allow usage in FIPS mode
crypto: sahara - Use dmam_alloc_coherent
crypto: caam - Add support for LS1021A
crypto: qat - Don't move data inside output buffer
crypto: vmx - Fixing GHASH Key issue on little endian
crypto: vmx - Fixing AES-CTR counter bug
crypto: null - Add missing Kconfig tristate for NULL2
crypto: nx - Add forward declaration for struct crypto_aead
...
2015-08-31 17:38:39 -07:00
Victoria Milhoan
dd503f6609
ARM: clk-imx6q: Add CAAM clock support
...
Add CAAM clock support to the i.MX6 clocking infrastructure.
Signed-off-by: Victoria Milhoan <vicki.milhoan@freescale.com >
Tested-by: Horia Geantă <horia.geanta@freescale.com >
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au >
2015-08-10 23:19:02 +08:00
Fabio Estevam
05e062f92c
clk: imx: clk-imx6q: Provide initial IPU clock settings for mx6dl
...
Currently it is not possible to use HDMI and LVDS at the same time on a
imx6dl-sabresd board.
Fix this usecase by setting IMX6QDL_CLK_PLL3_PFD1_540M to 540MHz and
also by setting it as the parent of IMX6QDL_CLK_IPU1_SEL.
Based on the configuration done in the FSL kernel.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com >
Signed-off-by: Shawn Guo <shawnguo@kernel.org >
2015-07-13 16:35:30 +08:00
Sébastien Szymanski
da946aeaea
ARM: clk-imx6q: refine sata's parent
...
According to IMX6D/Q RM, table 18-3, sata clock's parent is ahb, not ipg.
Signed-off-by: Sébastien Szymanski <sebastien.szymanski@armadeus.com >
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com >
Signed-off-by: Shawn Guo <shawn.guo@linaro.org >
2015-06-03 14:49:38 +08:00
Shawn Guo
11f6812009
ARM: imx: move clock drivers into drivers/clk
...
After the cleanup on clock drivers, they are now ready to be moved into
drivers/clk. Let's move them into drivers/clk/imx folder.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org >
Acked-by: Stephen Boyd <sboyd@codeaurora.org >
2015-06-03 14:44:33 +08:00
