From: Arnd Bergmann Date: Fri, 28 Nov 2014 13:50:13 +0000 (+0100) Subject: Merge (part of) tag 'omap-for-v3.19/hwmod-and-defconfig' of git://git.kernel.org... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=df717a58a38c49cf7c6e761d35aa822344dbd1bd;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git Merge (part of) tag 'omap-for-v3.19/hwmod-and-defconfig' of git://git./linux/kernel/git/tmlind/linux-omap into next/soc SoC related changes for omaps including hwmod clean-up for DSS, and hwmod data for more UARTs and ADC. Also few defconfig changes to enable devices found on am335x and am437x. [arnd: I removed the defconfig changes from the branch in order to cherry-pick them onto the next/defconfig branch, but I did not change the other commits] * commit '29c4ce17bcad': ARM: dts: cm-t3x30: add keypad support ARM: OMAP2+: hwmod: AM43x: add hwmod support for ADC on AM43xx ARM: DRA7: hwmod data: Add missing UART hwmod data ARM: dts: omap4.dtsi: remove dss_fck ARM: OMAP4: fix RFBI iclk ARM: OMAP4: hwmod: use MODULEMODE properly ARM: OMAP4: hwmod: set DSS submodule parent hwmods ARM: OMAP5: hwmod: set DSS submodule parent hwmods ARM: OMAP2+: hwmod: add parent_hwmod support Signed-off-by: Arnd Bergmann --- df717a58a38c49cf7c6e761d35aa822344dbd1bd