From: Arnd Bergmann Date: Mon, 8 Apr 2013 16:10:13 +0000 (+0200) Subject: Merge tag 'omap-for-v3.10/crypto-signed' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c77db634f6003dd0215502a7df94166fa20d16ca;p=linux-beck.git Merge tag 'omap-for-v3.10/crypto-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc From Tony Lindgren : Omap crypto related bus level changes via Paul Walmsley : For OMAP2+ SoCs, convert the SHA/MD5 and AES accelerator integration code and data to use hwmod and omap_device. This is a prerequisite for moving the hwmod code out of arch/arm. Basic test logs are available at: http://www.pwsan.com/omap/testlogs/sham_aes_integration_devel_3.10/20130330155313/ * tag 'omap-for-v3.10/crypto-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: AM33XX: hwmod: Update and uncomment AES0 module data ARM: AM33XX: Add aes0 crypto clock data ARM: OMAP2+: Only manually add hwmod data when DT not used. ARM: OMAP2+: Remove unnecessary message when no AES IP is present ARM: OMAP3xxx: hwmod: Convert AES crypto device data to hwmod ARM: OMAP2xxx: hwmod: Convert AES crypto devcie data to hwmod ARM: AM33XX: hwmod: Update and uncomment SHA0 module data ARM: AM33XX: Add sha0 crypto clock data ARM: OMAP2+: Only manually add hwmod data when DT not used. ARM: OMAP2+: Remove unnecessary message when no SHA IP is present ARM: OMAP3xxx: hwmod: Convert SHAM crypto device data to hwmod ARM: OMAP2xxx: hwmod: Add DMA support for SHAM module ARM: OMAP2xxx: hwmod: Convert SHAM crypto device data to hwmod ARM: OMAP2+: clock data: Remove CK_* flags Signed-off-by: Arnd Bergmann --- c77db634f6003dd0215502a7df94166fa20d16ca