Merge tag 'tags/omap-for-v3.8/devel-prcm-signed' into...
Merge tag 'tags/omap-for-v3.8/devel-prcm-signed' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 omap prcm changes via Paul Walmsley <paul@pwsan.com>: Some miscellaneous OMAP hwmod changes for 3.8, along with a PRM change needed for one of the hwmod patches to function. Basic test logs for this branch on top of Tony's omap-for-v3.8/clock branch at commit 558a0780 are here: http://www.pwsan.com/omap/testlogs/hwmod_devel_a_3.8/20121121161522/ However, omap-for-v3.8/clock at 558a0780 does not include some fixes that are needed for a successful test. With several reverts, fixes, and workarounds applied, the following test logs were obtained: http://www.pwsan.com/omap/testlogs/TEST_hwmod_devel_a_3.8/20121121162719/ which indicate that the series tests cleanly. Conflicts: arch/arm/mach-omap2/cm33xx.c arch/arm/mach-omap2/io.c arch/arm/mach-omap2/prm_common.c
No related branches found
No related tags found
Showing
- arch/arm/mach-omap1/common.h 2 additions, 0 deletionsarch/arm/mach-omap1/common.h
- arch/arm/mach-omap1/devices.c 18 additions, 3 deletionsarch/arm/mach-omap1/devices.c
- arch/arm/mach-omap1/reset.c 39 additions, 2 deletionsarch/arm/mach-omap1/reset.c
- arch/arm/mach-omap2/Kconfig 5 additions, 0 deletionsarch/arm/mach-omap2/Kconfig
- arch/arm/mach-omap2/Makefile 68 additions, 53 deletionsarch/arm/mach-omap2/Makefile
- arch/arm/mach-omap2/am33xx.h 1 addition, 0 deletionsarch/arm/mach-omap2/am33xx.h
- arch/arm/mach-omap2/board-2430sdp.c 1 addition, 1 deletionarch/arm/mach-omap2/board-2430sdp.c
- arch/arm/mach-omap2/board-3430sdp.c 1 addition, 1 deletionarch/arm/mach-omap2/board-3430sdp.c
- arch/arm/mach-omap2/board-3630sdp.c 1 addition, 1 deletionarch/arm/mach-omap2/board-3630sdp.c
- arch/arm/mach-omap2/board-4430sdp.c 1 addition, 1 deletionarch/arm/mach-omap2/board-4430sdp.c
- arch/arm/mach-omap2/board-am3517crane.c 1 addition, 1 deletionarch/arm/mach-omap2/board-am3517crane.c
- arch/arm/mach-omap2/board-am3517evm.c 1 addition, 1 deletionarch/arm/mach-omap2/board-am3517evm.c
- arch/arm/mach-omap2/board-apollon.c 1 addition, 1 deletionarch/arm/mach-omap2/board-apollon.c
- arch/arm/mach-omap2/board-cm-t35.c 9 additions, 9 deletionsarch/arm/mach-omap2/board-cm-t35.c
- arch/arm/mach-omap2/board-cm-t3517.c 1 addition, 1 deletionarch/arm/mach-omap2/board-cm-t3517.c
- arch/arm/mach-omap2/board-devkit8000.c 1 addition, 1 deletionarch/arm/mach-omap2/board-devkit8000.c
- arch/arm/mach-omap2/board-generic.c 5 additions, 5 deletionsarch/arm/mach-omap2/board-generic.c
- arch/arm/mach-omap2/board-h4.c 1 addition, 1 deletionarch/arm/mach-omap2/board-h4.c
- arch/arm/mach-omap2/board-igep0020.c 2 additions, 2 deletionsarch/arm/mach-omap2/board-igep0020.c
- arch/arm/mach-omap2/board-ldp.c 1 addition, 1 deletionarch/arm/mach-omap2/board-ldp.c
Loading
Please register or sign in to comment