From: Kevin Hilman Date: Fri, 18 Oct 2013 14:50:11 +0000 (-0700) Subject: Merge tag 'omap-for-v3.13/am43xx-hwmod-signed' of git://git.kernel.org/pub/scm/linux... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=abcba009e517a6d68d980eb468fe83f573cac01a;p=linux-beck.git Merge tag 'omap-for-v3.13/am43xx-hwmod-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc From Tony Lindgren: Changes needed for am43xx for the hwmod data. This will be the last new set of hwmod data for any SoC as future SoCs will use a driver and device tree based approach. But before that can be dealt with, we need to first sort out the pending driver/clk issues. Queued by Paul Walmsley : Add hwmod and PRCM data for the TI AM43xx family of SoCs. Under normal circumstances, these patches would not be merged. The hwmod and PRCM data should be moved out either to DT data or to drivers/. Also, the current implementation trades off lines of diff by dynamically rewriting static data at runtime, which is a bad practice - it causes future maintenance headaches. However, after speaking with my upstream, it sounds like it's better to merge these patches in their current state, due to long term considerations. Basic test logs are here: http://www.pwsan.com/omap/testlogs/am43xx_support_v3.13/20131015213706/ Due to the lack of an AM43xx board and any available public documentation, it's impossible for me to review or test that platform in any meaningful way. But at least the tests above verify that the patches don't affect existing platforms - particularly AM33xx. * tag 'omap-for-v3.13/am43xx-hwmod-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2: hwmod: Add qspi data for am437x. ARM: OMAP2+: hwmod: Add USB hwmod data for AM437x. ARM: OMAP2+: AM43x PRCM init ARM: OMAP2+: AM43x: PRCM kbuild ARM: OMAP2+: hwmod: AM43x operations ARM: OMAP2+: hwmod: AM43x support ARM: OMAP2+: CM: AM43x clockdomain data ARM: OMAP2+: PM: AM43x powerdomain data ARM: OMAP2+: PRCM: AM43x definitions ARM: OMAP2+: hwmod: AM335x: remove static register offs ARM: OMAP2+: hwmod: AM335x: runtime register update ARM: OMAP2+: hwmod: AM335x/AM43x: move common data ARM: OMAP2+: CM: cm_inst offset s16->u16 Signed-off-by: Kevin Hilman --- abcba009e517a6d68d980eb468fe83f573cac01a