This branch contains more clean-up like changes and minor fixes for making

it easier to support new omap SoCs, such as omap5 and am33xx.
 
 This branch has dependencies to earlier clean-up in omap-cleanup-for-v3.6
 and  omap-devel-dmtimer-for-v3.6 branches, and also depends on the
 omap-devel-am33xx-for-v3.6 branch, and are based on a merge of these
 branches.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJP+saxAAoJEBvUPslcq6VzObcP/1Wpa5qZC7y8hc/UbQOziD2M
 NFpLOQal3mugSeFjvtNXxI6nw0fekLxlbvZ8kzYyHOdMPgkVHgJJo0H1E7olYEXK
 gZ6L2cySmQBsyoIcRvNFSCqwN3ej96+fctFEiquvTOyupZnn0fLmh3TPX68ZEdNL
 nrKR9O2xVSLuEwHL6z/BJYI1360KcoB6isDRW8udOo7lpb1jQSc1l9FyLIpwdBgl
 qWRTQlQ+kNf6DGt3iwdt7ssqz1oBeCPNvPp1+tJ9t9aarA/KfQmxFW0gf5RFwX3y
 P9kgF9SZI6HCmzbVDgqb1SA+udCND/4hxJZ3RKHwphx/MbMyIorjy6+OZ/0MJASG
 bu6f4QBZ0TfGuf/uKQEl3P4HiHm57/FKC8WbrMkGwSCE0XgC8YVV/2EYrZa0JYBg
 7f8wk5LJ15dcndvvUqn55DXU5XwglgJ/fUL+UDMUVGsIYuhdLhRKmgkDzGpQCpbO
 c8Q2w4Rvz5Zf3OoB4C8Zxh6GDbiTevae/cU7nhKb1UoN+jlmNchKmHShTvzm5txo
 zIK8Tb9W0eLr81Z7Z7m+Q3hFLuBTcmWD9Dnq/pVceP5qf8XzOQeW1Dy+lDYY+xIx
 LPdKN34JGuqaBhNykXpsA9EfIgfJXadtnaudvv/oy8etEHHTGSGJAwdeXuIIAvkD
 wN9gWFnKOE9cuFH/Hk0T
 =6Zcd
 -----END PGP SIGNATURE-----

Merge tag 'omap-cleanup-part2-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup2

From Tony Lindgren <tony@atomide.com>:
This branch contains more clean-up like changes and minor fixes for making
it easier to support new omap SoCs, such as omap5 and am33xx.

This branch has dependencies to earlier clean-up in omap-cleanup-for-v3.6
and  omap-devel-dmtimer-for-v3.6 branches, and also depends on the
omap-devel-am33xx-for-v3.6 branch, and are based on a merge of these
branches.

* tag 'omap-cleanup-part2-for-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds
  ARM: OMAP2+: dmtimer: cleanup fclk usage
  ARM: OMAP2+: Fix mismerge for omap_hwmod_get_main_clk() API
  ARM: OMAP2+: Remove unnecessary ifdef around __omap2_set_globals
  ARM: OMAP2+: am33xx: Change cpu_is_am33xx to soc_is_am33xx
  ARM: OMAP2+: am33xx: Make am33xx as a separate class
  ARM: OMAP2+: Move omap3 dpll ops to dpll3xxx.c
  ARM: OMAP2+: All OMAP2PLUS uses omap-device.o target so add one entry
  ARM: OMAP: dmtimer: use devm_ API and do some cleanup in probe()
  ARM: OMAP2+: hwmod code: add support to set dmadisable in hwmod framework
  ARM: OMAP2+: PRM/CM: Move the stubbed prm and cm functions to prcm.c file and make them __weak
  ARM: OMAP2+: hwmod: add omap_hwmod_get_main_clk() API
  ARM: OMAP3+: dpll: optimize noncore dpll locking logic
  ARM: OMAP3: control: add definition for CONTROL_CAMERA_PHY_CTRL
  ARM: OMAP2+: powerdomain code: Fix Wake-up power domain power status
  ARM: OMAP4: clockdomain/CM code: Update supported transition modes
  ARM: OMAP3/4: omap_hwmod: Add rstst_offs field to struct omap_hwmod_omap4_prcm
  ARM: OMAP2+: hwmod: Add new sysc_type3 into omap_hwmod required for am33xx

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2012-07-10 16:58:19 +02:00
commit db3c47a3af
26 changed files with 296 additions and 207 deletions