* [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window
@ 2012-11-27 1:06 Tony Lindgren
2012-11-27 1:06 ` [GIT PULL 3/3] omap late multiplatform cleanup " Tony Lindgren
` (5 more replies)
0 siblings, 6 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-11-27 1:06 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
----------------------------------------------------------------
Timer clean-up to get us closer to moving timer code to drivers,
and to get rid of CONFIG_OMAP_32K_TIMER and rely on the board
or devicetree provided timer configuration.
Note that these changes are on top of the recent timer fixes.
----------------------------------------------------------------
Igor Grinberg (2):
ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
ARM: OMAP3: cm-t3517: use GPTIMER for system clock
Jon Hunter (8):
ARM: OMAP: Clean-up dmtimer reset code
ARM: OMAP: Define omap_dm_timer_prepare function as static
ARM: OMAP: Don't store timers physical address
ARM: OMAP2+: Remove unnecessary local variable in timer code
ARM: OMAP: Remove unnecessary omap_dm_timer structure declaration
ARM: OMAP: Add platform data header for DMTIMERs
ARM: OMAP: Remove unnecessary inclusion of dmtimer.h
ARM: OMAP2+: Fix compiler warning for 32k timer
Tony Lindgren (1):
Merge branch 'cleanup-timer' of git://github.com/jonhunter/linux into omap-for-v3.8/timer
arch/arm/mach-omap1/timer.c | 1 +
arch/arm/mach-omap1/timer32k.c | 1 -
arch/arm/mach-omap2/board-cm-t3517.c | 2 +-
arch/arm/mach-omap2/common.h | 1 +
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 -
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 1 -
arch/arm/mach-omap2/pm-debug.c | 1 -
arch/arm/mach-omap2/timer.c | 167 +++++++++++++----------------
arch/arm/plat-omap/Kconfig | 6 ++
arch/arm/plat-omap/dmtimer.c | 54 ++++++----
arch/arm/plat-omap/include/plat/dmtimer.h | 80 ++++----------
drivers/staging/tidspbridge/core/ue_deh.c | 1 -
include/linux/platform_data/dmtimer-omap.h | 31 ++++++
13 files changed, 168 insertions(+), 179 deletions(-)
create mode 100644 include/linux/platform_data/dmtimer-omap.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 2/3] omap late prcm changes for v3.8 merge window
2012-11-27 1:06 [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window Tony Lindgren
2012-11-27 1:06 ` [GIT PULL 3/3] omap late multiplatform cleanup " Tony Lindgren
2012-11-27 1:06 ` Tony Lindgren
@ 2012-11-27 1:06 ` Tony Lindgren
2012-11-27 1:06 ` Tony Lindgren
` (2 subsequent siblings)
5 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-11-27 1:06 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 558a0780b0a04862a678f7823215424b4e5501f9:
Merge tag 'omap-cleanup-c-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/clock (2012-11-13 13:32:24 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/devel-prcm-signed
for you to fetch changes up to 8b9c1ac2e11a9fb3a5a8860fb7570ff7633aa7f7:
Merge tag 'omap-devel-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/devel-pcrm (2012-11-26 12:32:50 -0800)
----------------------------------------------------------------
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
558a0780b0a04862a678f7823215424b4e5501f9 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.
----------------------------------------------------------------
Paul Walmsley (1):
ARM: OMAP2+: PRM: initialize some PRM functions early
Peter Ujfalusi (2):
ARM: OMAP2+: hwmod: Add possibility to count hwmod resources based on type
ARM: OMAP2+: omap_device: Correct resource handling for DT boot
Rajendra Nayak (1):
ARM: OMAP2+: hwmod: Add support for per hwmod/module context lost count
Tony Lindgren (1):
Merge tag 'omap-devel-a-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/devel-pcrm
arch/arm/mach-omap2/io.c | 8 ++++
arch/arm/mach-omap2/omap_device.c | 87 +++++++++++++++++++++++++--------------
arch/arm/mach-omap2/omap_hwmod.c | 82 +++++++++++++++++++++++++++++-------
arch/arm/mach-omap2/omap_hwmod.h | 12 ++++--
arch/arm/mach-omap2/prm.h | 11 ++++-
arch/arm/mach-omap2/prm2xxx.c | 3 +-
arch/arm/mach-omap2/prm2xxx.h | 3 +-
arch/arm/mach-omap2/prm3xxx.c | 17 ++++----
arch/arm/mach-omap2/prm3xxx.h | 1 +
arch/arm/mach-omap2/prm44xx.c | 49 ++++++++++++++++++----
arch/arm/mach-omap2/prm44xx.h | 1 +
arch/arm/mach-omap2/prm_common.c | 45 ++++++++++++++++++++
12 files changed, 249 insertions(+), 70 deletions(-)
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 3/3] omap late multiplatform cleanup for v3.8 merge window
2012-11-27 1:06 [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window Tony Lindgren
2012-11-27 1:06 ` [GIT PULL 3/3] omap late multiplatform cleanup " Tony Lindgren
@ 2012-11-27 1:06 ` Tony Lindgren
2012-11-27 1:06 ` [GIT PULL 2/3] omap late prcm changes " Tony Lindgren
` (3 subsequent siblings)
5 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-11-27 1:06 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 0f9cb211ba5db93d488fe6b154138231fdd0e22d:
Merge tag 'v3.7-rc7' into next/cleanup (2012-11-25 21:34:34 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-multiplatform-v2-signed
for you to fetch changes up to 5ebb428d045ea9b908864547819786d5bcebad05:
ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h (2012-11-26 13:19:23 -0800)
----------------------------------------------------------------
Remaining patches to allow omap2+ to build with multiplatform
enabled. Unfortunately the DMA header patch had to be redone
to avoid adding new multiplatform specific include paths, the
other patches are just trivial compile fixes.
Note that this does not yet contain the necessary Kconfig
changes as we are still waiting for some drivers to get
fixed up first.
----------------------------------------------------------------
Tony Lindgren (3):
watchdog: OMAP: fixup for ARM multiplatform support
ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support
ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h
arch/arm/mach-omap1/board-h2.c | 2 +-
arch/arm/mach-omap1/board-h3.c | 2 +-
arch/arm/mach-omap1/board-palmte.c | 2 +-
arch/arm/mach-omap1/board-palmtt.c | 2 +-
arch/arm/mach-omap1/board-palmz71.c | 2 +-
arch/arm/mach-omap1/board-sx1.c | 2 +-
arch/arm/mach-omap1/dma.c | 2 +-
arch/arm/mach-omap1/io.c | 2 +-
arch/arm/mach-omap1/lcd_dma.c | 2 +-
arch/arm/mach-omap1/mcbsp.c | 2 +-
arch/arm/mach-omap1/pm.c | 2 +-
arch/arm/mach-omap2/board-3430sdp.c | 2 +-
arch/arm/mach-omap2/board-h4.c | 2 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
arch/arm/mach-omap2/board-rx51.c | 2 +-
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/dma.c | 2 +-
arch/arm/mach-omap2/io.c | 2 +-
arch/arm/mach-omap2/mcbsp.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +-
.../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 3 +-
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
arch/arm/mach-omap2/pm24xx.c | 2 +-
arch/arm/mach-omap2/pm34xx.c | 3 +-
arch/arm/mach-omap2/serial.c | 2 +-
arch/arm/plat-omap/dma.c | 2 +-
arch/arm/plat-omap/include/plat-omap/dma-omap.h | 377 ---------------------
drivers/crypto/omap-aes.c | 2 +-
drivers/crypto/omap-sham.c | 2 +-
drivers/dma/omap-dma.c | 2 -
drivers/media/platform/omap/omap_vout.c | 2 +-
drivers/media/platform/omap/omap_vout_vrfb.c | 2 +-
drivers/media/platform/omap3isp/ispstat.h | 2 +-
drivers/media/platform/soc_camera/omap1_camera.c | 2 +-
drivers/mtd/nand/omap2.c | 1 -
drivers/mtd/onenand/omap2.c | 2 +-
drivers/usb/gadget/omap_udc.c | 2 +-
drivers/usb/musb/tusb6010_omap.c | 2 +-
drivers/video/omap/lcdc.c | 2 +-
drivers/video/omap/omapfb_main.c | 2 +-
drivers/video/omap/sossi.c | 2 +-
drivers/watchdog/omap_wdt.c | 2 -
include/linux/omap-dma.h | 366 ++++++++++++++++++++
sound/soc/omap/mcbsp.c | 4 +-
sound/soc/omap/mcbsp.h | 6 +
sound/soc/omap/omap-mcbsp.c | 5 +-
49 files changed, 417 insertions(+), 430 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat-omap/dma-omap.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 2/3] omap late prcm changes for v3.8 merge window
2012-11-27 1:06 [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window Tony Lindgren
` (2 preceding siblings ...)
2012-11-27 1:06 ` [GIT PULL 2/3] omap late prcm changes " Tony Lindgren
@ 2012-11-27 1:06 ` Tony Lindgren
[not found] ` <50b4120b.d088e50a.742e.ffffd3d3SMTPIN_ADDED_MISSING@mx.google.com>
[not found] ` <50b41208.4989e50a.26c2.ffffba54SMTPIN_ADDED_MISSING@mx.google.com>
5 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-11-27 1:06 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 558a0780b0a04862a678f7823215424b4e5501f9:
Merge tag 'omap-cleanup-c-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/clock (2012-11-13 13:32:24 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/devel-prcm-signed
for you to fetch changes up to 8b9c1ac2e11a9fb3a5a8860fb7570ff7633aa7f7:
Merge tag 'omap-devel-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/devel-pcrm (2012-11-26 12:32:50 -0800)
----------------------------------------------------------------
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
558a0780b0a04862a678f7823215424b4e5501f9 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.
----------------------------------------------------------------
Paul Walmsley (1):
ARM: OMAP2+: PRM: initialize some PRM functions early
Peter Ujfalusi (2):
ARM: OMAP2+: hwmod: Add possibility to count hwmod resources based on type
ARM: OMAP2+: omap_device: Correct resource handling for DT boot
Rajendra Nayak (1):
ARM: OMAP2+: hwmod: Add support for per hwmod/module context lost count
Tony Lindgren (1):
Merge tag 'omap-devel-a-for-3.8' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.8/devel-pcrm
arch/arm/mach-omap2/io.c | 8 ++++
arch/arm/mach-omap2/omap_device.c | 87 +++++++++++++++++++++++++--------------
arch/arm/mach-omap2/omap_hwmod.c | 82 +++++++++++++++++++++++++++++-------
arch/arm/mach-omap2/omap_hwmod.h | 12 ++++--
arch/arm/mach-omap2/prm.h | 11 ++++-
arch/arm/mach-omap2/prm2xxx.c | 3 +-
arch/arm/mach-omap2/prm2xxx.h | 3 +-
arch/arm/mach-omap2/prm3xxx.c | 17 ++++----
arch/arm/mach-omap2/prm3xxx.h | 1 +
arch/arm/mach-omap2/prm44xx.c | 49 ++++++++++++++++++----
arch/arm/mach-omap2/prm44xx.h | 1 +
arch/arm/mach-omap2/prm_common.c | 45 ++++++++++++++++++++
12 files changed, 249 insertions(+), 70 deletions(-)
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 3/3] omap late multiplatform cleanup for v3.8 merge window
2012-11-27 1:06 [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window Tony Lindgren
@ 2012-11-27 1:06 ` Tony Lindgren
2012-11-27 1:06 ` Tony Lindgren
` (4 subsequent siblings)
5 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-11-27 1:06 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 0f9cb211ba5db93d488fe6b154138231fdd0e22d:
Merge tag 'v3.7-rc7' into next/cleanup (2012-11-25 21:34:34 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-multiplatform-v2-signed
for you to fetch changes up to 5ebb428d045ea9b908864547819786d5bcebad05:
ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h (2012-11-26 13:19:23 -0800)
----------------------------------------------------------------
Remaining patches to allow omap2+ to build with multiplatform
enabled. Unfortunately the DMA header patch had to be redone
to avoid adding new multiplatform specific include paths, the
other patches are just trivial compile fixes.
Note that this does not yet contain the necessary Kconfig
changes as we are still waiting for some drivers to get
fixed up first.
----------------------------------------------------------------
Tony Lindgren (3):
watchdog: OMAP: fixup for ARM multiplatform support
ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support
ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h
arch/arm/mach-omap1/board-h2.c | 2 +-
arch/arm/mach-omap1/board-h3.c | 2 +-
arch/arm/mach-omap1/board-palmte.c | 2 +-
arch/arm/mach-omap1/board-palmtt.c | 2 +-
arch/arm/mach-omap1/board-palmz71.c | 2 +-
arch/arm/mach-omap1/board-sx1.c | 2 +-
arch/arm/mach-omap1/dma.c | 2 +-
arch/arm/mach-omap1/io.c | 2 +-
arch/arm/mach-omap1/lcd_dma.c | 2 +-
arch/arm/mach-omap1/mcbsp.c | 2 +-
arch/arm/mach-omap1/pm.c | 2 +-
arch/arm/mach-omap2/board-3430sdp.c | 2 +-
arch/arm/mach-omap2/board-h4.c | 2 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
arch/arm/mach-omap2/board-rx51.c | 2 +-
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/dma.c | 2 +-
arch/arm/mach-omap2/io.c | 2 +-
arch/arm/mach-omap2/mcbsp.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +-
.../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 3 +-
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
arch/arm/mach-omap2/pm24xx.c | 2 +-
arch/arm/mach-omap2/pm34xx.c | 3 +-
arch/arm/mach-omap2/serial.c | 2 +-
arch/arm/plat-omap/dma.c | 2 +-
arch/arm/plat-omap/include/plat-omap/dma-omap.h | 377 ---------------------
drivers/crypto/omap-aes.c | 2 +-
drivers/crypto/omap-sham.c | 2 +-
drivers/dma/omap-dma.c | 2 -
drivers/media/platform/omap/omap_vout.c | 2 +-
drivers/media/platform/omap/omap_vout_vrfb.c | 2 +-
drivers/media/platform/omap3isp/ispstat.h | 2 +-
drivers/media/platform/soc_camera/omap1_camera.c | 2 +-
drivers/mtd/nand/omap2.c | 1 -
drivers/mtd/onenand/omap2.c | 2 +-
drivers/usb/gadget/omap_udc.c | 2 +-
drivers/usb/musb/tusb6010_omap.c | 2 +-
drivers/video/omap/lcdc.c | 2 +-
drivers/video/omap/omapfb_main.c | 2 +-
drivers/video/omap/sossi.c | 2 +-
drivers/watchdog/omap_wdt.c | 2 -
include/linux/omap-dma.h | 366 ++++++++++++++++++++
sound/soc/omap/mcbsp.c | 4 +-
sound/soc/omap/mcbsp.h | 6 +
sound/soc/omap/omap-mcbsp.c | 5 +-
49 files changed, 417 insertions(+), 430 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat-omap/dma-omap.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL 3/3] omap late multiplatform cleanup for v3.8 merge window
[not found] ` <50b4120b.d088e50a.742e.ffffd3d3SMTPIN_ADDED_MISSING@mx.google.com>
@ 2012-11-30 6:53 ` Olof Johansson
0 siblings, 0 replies; 27+ messages in thread
From: Olof Johansson @ 2012-11-30 6:53 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
On Mon, Nov 26, 2012 at 05:06:12PM -0800, Tony Lindgren wrote:
> The following changes since commit 0f9cb211ba5db93d488fe6b154138231fdd0e22d:
>
> Merge tag 'v3.7-rc7' into next/cleanup (2012-11-25 21:34:34 -0800)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-multiplatform-v2-signed
>
> for you to fetch changes up to 5ebb428d045ea9b908864547819786d5bcebad05:
>
> ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h (2012-11-26 13:19:23 -0800)
Tony,
Did you mean to base this branch on next/cleanup? We normally try to avoid
having vendor branches based on our common next/* branches, since it adds
dependencies that makes it hard to rebuild our branch if needed for some
reason.
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 3/3] omap late multiplatform cleanup for v3.8 merge window
@ 2012-11-30 6:53 ` Olof Johansson
0 siblings, 0 replies; 27+ messages in thread
From: Olof Johansson @ 2012-11-30 6:53 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 26, 2012 at 05:06:12PM -0800, Tony Lindgren wrote:
> The following changes since commit 0f9cb211ba5db93d488fe6b154138231fdd0e22d:
>
> Merge tag 'v3.7-rc7' into next/cleanup (2012-11-25 21:34:34 -0800)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-multiplatform-v2-signed
>
> for you to fetch changes up to 5ebb428d045ea9b908864547819786d5bcebad05:
>
> ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h (2012-11-26 13:19:23 -0800)
Tony,
Did you mean to base this branch on next/cleanup? We normally try to avoid
having vendor branches based on our common next/* branches, since it adds
dependencies that makes it hard to rebuild our branch if needed for some
reason.
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL 2/3] omap late prcm changes for v3.8 merge window
[not found] ` <50b41208.4989e50a.26c2.ffffba54SMTPIN_ADDED_MISSING@mx.google.com>
@ 2012-11-30 6:54 ` Olof Johansson
0 siblings, 0 replies; 27+ messages in thread
From: Olof Johansson @ 2012-11-30 6:54 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap, linux-arm-kernel, Arnd Bergmann
On Mon, Nov 26, 2012 at 05:06:12PM -0800, Tony Lindgren wrote:
> The following changes since commit 558a0780b0a04862a678f7823215424b4e5501f9:
>
> Merge tag 'omap-cleanup-c-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/clock (2012-11-13 13:32:24 -0800)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/devel-prcm-signed
>
> for you to fetch changes up to 8b9c1ac2e11a9fb3a5a8860fb7570ff7633aa7f7:
>
> Merge tag 'omap-devel-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/devel-pcrm (2012-11-26 12:32:50 -0800)
Thanks, pulled. Dependencies are getting to be a bit complex for omap stuff at
this point, so I merged it into a new next/pm2 branch. It's not unlikely that
we will combine next/pm, next/clock and next/pm2 into one branch before merging
upstream, since there are lots of internal dependencies between those.
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 2/3] omap late prcm changes for v3.8 merge window
@ 2012-11-30 6:54 ` Olof Johansson
0 siblings, 0 replies; 27+ messages in thread
From: Olof Johansson @ 2012-11-30 6:54 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 26, 2012 at 05:06:12PM -0800, Tony Lindgren wrote:
> The following changes since commit 558a0780b0a04862a678f7823215424b4e5501f9:
>
> Merge tag 'omap-cleanup-c-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/clock (2012-11-13 13:32:24 -0800)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/devel-prcm-signed
>
> for you to fetch changes up to 8b9c1ac2e11a9fb3a5a8860fb7570ff7633aa7f7:
>
> Merge tag 'omap-devel-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/devel-pcrm (2012-11-26 12:32:50 -0800)
Thanks, pulled. Dependencies are getting to be a bit complex for omap stuff at
this point, so I merged it into a new next/pm2 branch. It's not unlikely that
we will combine next/pm, next/clock and next/pm2 into one branch before merging
upstream, since there are lots of internal dependencies between those.
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL 3/3] omap late multiplatform cleanup for v3.8 merge window
2012-11-30 6:53 ` Olof Johansson
@ 2012-11-30 17:26 ` Tony Lindgren
-1 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-11-30 17:26 UTC (permalink / raw)
To: Olof Johansson; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
* Olof Johansson <olof@lixom.net> [121129 22:55]:
> On Mon, Nov 26, 2012 at 05:06:12PM -0800, Tony Lindgren wrote:
> > The following changes since commit 0f9cb211ba5db93d488fe6b154138231fdd0e22d:
> >
> > Merge tag 'v3.7-rc7' into next/cleanup (2012-11-25 21:34:34 -0800)
> >
> > are available in the git repository at:
> >
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-multiplatform-v2-signed
> >
> > for you to fetch changes up to 5ebb428d045ea9b908864547819786d5bcebad05:
> >
> > ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h (2012-11-26 13:19:23 -0800)
>
> Tony,
>
> Did you mean to base this branch on next/cleanup? We normally try to avoid
> having vendor branches based on our common next/* branches, since it adds
> dependencies that makes it hard to rebuild our branch if needed for some
> reason.
Sorry I should have asked before. I wanted to base this on something
that compiles for with multiplatform support and is bootable with
minimal patching and does not produce new merge conflicts.
But I only need the resulting branch for testing, so as long as we
the resulting arm-soc/for-next branch is usable for me until -rc1
is out, I'll be happy.
For merging, the dependencies for these three patches are:
omap-for-v3.8/cleanup-fixes-part2-v2-signed (all the header clean-up)
omap-for-v3.8/devel-prcm-signed (needed the wdt changes)
So I've merged those two to use as a base, the patches on top
are the same. Hope that works for you better.
It's now missing the common clock changes, but that's OK as the
branch does not yet enable the multiplatform support. Updated pull
request below.
BTW, note that "[GIT PULL] omap iommu clean-up dependency branch for
v3.8 merge window" is still pending it seems?
Regards,
Tony
The following changes since commit 2589d056122f6dcb405d411eae872aac8cf9da1b:
Merge tag 'tags/omap-for-v3.8/devel-prcm-signed' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-30 08:40:31 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed
for you to fetch changes up to 45c3eb7d3a07eb08d1b5b0f5983a996d41610b84:
ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h (2012-11-30 08:41:50 -0800)
----------------------------------------------------------------
Remaining patches to allow omap2+ to build with multiplatform
enabled. Unfortunately the DMA header patch had to be redone
to avoid adding new multiplatform specific include paths, the
other patches are just trivial compile fixes.
Note that this does not yet contain the necessary Kconfig
changes as we are still waiting for some drivers to get
fixed up first.
----------------------------------------------------------------
Tony Lindgren (3):
watchdog: OMAP: fixup for ARM multiplatform support
ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support
ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h
arch/arm/mach-omap1/board-h2.c | 2 +-
arch/arm/mach-omap1/board-h3.c | 2 +-
arch/arm/mach-omap1/board-palmte.c | 2 +-
arch/arm/mach-omap1/board-palmtt.c | 2 +-
arch/arm/mach-omap1/board-palmz71.c | 2 +-
arch/arm/mach-omap1/board-sx1.c | 2 +-
arch/arm/mach-omap1/dma.c | 2 +-
arch/arm/mach-omap1/io.c | 2 +-
arch/arm/mach-omap1/lcd_dma.c | 2 +-
arch/arm/mach-omap1/mcbsp.c | 2 +-
arch/arm/mach-omap1/pm.c | 2 +-
arch/arm/mach-omap2/board-3430sdp.c | 2 +-
arch/arm/mach-omap2/board-h4.c | 2 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
arch/arm/mach-omap2/board-rx51.c | 2 +-
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/dma.c | 2 +-
arch/arm/mach-omap2/io.c | 2 +-
arch/arm/mach-omap2/mcbsp.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +-
.../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 3 +-
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
arch/arm/mach-omap2/pm24xx.c | 2 +-
arch/arm/mach-omap2/pm34xx.c | 3 +-
arch/arm/mach-omap2/serial.c | 2 +-
arch/arm/plat-omap/dma.c | 2 +-
arch/arm/plat-omap/include/plat-omap/dma-omap.h | 377 ---------------------
drivers/crypto/omap-aes.c | 2 +-
drivers/crypto/omap-sham.c | 2 +-
drivers/dma/omap-dma.c | 2 -
drivers/media/platform/omap/omap_vout.c | 2 +-
drivers/media/platform/omap/omap_vout_vrfb.c | 2 +-
drivers/media/platform/omap3isp/ispstat.h | 2 +-
drivers/media/platform/soc_camera/omap1_camera.c | 2 +-
drivers/mtd/nand/omap2.c | 1 -
drivers/mtd/onenand/omap2.c | 2 +-
drivers/usb/gadget/omap_udc.c | 2 +-
drivers/usb/musb/tusb6010_omap.c | 2 +-
drivers/video/omap/lcdc.c | 2 +-
drivers/video/omap/omapfb_main.c | 2 +-
drivers/video/omap/sossi.c | 2 +-
drivers/watchdog/omap_wdt.c | 2 -
include/linux/omap-dma.h | 366 ++++++++++++++++++++
sound/soc/omap/mcbsp.c | 4 +-
sound/soc/omap/mcbsp.h | 6 +
sound/soc/omap/omap-mcbsp.c | 5 +-
49 files changed, 417 insertions(+), 430 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat-omap/dma-omap.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 3/3] omap late multiplatform cleanup for v3.8 merge window
@ 2012-11-30 17:26 ` Tony Lindgren
0 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-11-30 17:26 UTC (permalink / raw)
To: linux-arm-kernel
* Olof Johansson <olof@lixom.net> [121129 22:55]:
> On Mon, Nov 26, 2012 at 05:06:12PM -0800, Tony Lindgren wrote:
> > The following changes since commit 0f9cb211ba5db93d488fe6b154138231fdd0e22d:
> >
> > Merge tag 'v3.7-rc7' into next/cleanup (2012-11-25 21:34:34 -0800)
> >
> > are available in the git repository at:
> >
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-multiplatform-v2-signed
> >
> > for you to fetch changes up to 5ebb428d045ea9b908864547819786d5bcebad05:
> >
> > ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h (2012-11-26 13:19:23 -0800)
>
> Tony,
>
> Did you mean to base this branch on next/cleanup? We normally try to avoid
> having vendor branches based on our common next/* branches, since it adds
> dependencies that makes it hard to rebuild our branch if needed for some
> reason.
Sorry I should have asked before. I wanted to base this on something
that compiles for with multiplatform support and is bootable with
minimal patching and does not produce new merge conflicts.
But I only need the resulting branch for testing, so as long as we
the resulting arm-soc/for-next branch is usable for me until -rc1
is out, I'll be happy.
For merging, the dependencies for these three patches are:
omap-for-v3.8/cleanup-fixes-part2-v2-signed (all the header clean-up)
omap-for-v3.8/devel-prcm-signed (needed the wdt changes)
So I've merged those two to use as a base, the patches on top
are the same. Hope that works for you better.
It's now missing the common clock changes, but that's OK as the
branch does not yet enable the multiplatform support. Updated pull
request below.
BTW, note that "[GIT PULL] omap iommu clean-up dependency branch for
v3.8 merge window" is still pending it seems?
Regards,
Tony
The following changes since commit 2589d056122f6dcb405d411eae872aac8cf9da1b:
Merge tag 'tags/omap-for-v3.8/devel-prcm-signed' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-30 08:40:31 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed
for you to fetch changes up to 45c3eb7d3a07eb08d1b5b0f5983a996d41610b84:
ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h (2012-11-30 08:41:50 -0800)
----------------------------------------------------------------
Remaining patches to allow omap2+ to build with multiplatform
enabled. Unfortunately the DMA header patch had to be redone
to avoid adding new multiplatform specific include paths, the
other patches are just trivial compile fixes.
Note that this does not yet contain the necessary Kconfig
changes as we are still waiting for some drivers to get
fixed up first.
----------------------------------------------------------------
Tony Lindgren (3):
watchdog: OMAP: fixup for ARM multiplatform support
ASoC: OMAP: mcbsp fixes for enabling ARM multiplatform support
ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h
arch/arm/mach-omap1/board-h2.c | 2 +-
arch/arm/mach-omap1/board-h3.c | 2 +-
arch/arm/mach-omap1/board-palmte.c | 2 +-
arch/arm/mach-omap1/board-palmtt.c | 2 +-
arch/arm/mach-omap1/board-palmz71.c | 2 +-
arch/arm/mach-omap1/board-sx1.c | 2 +-
arch/arm/mach-omap1/dma.c | 2 +-
arch/arm/mach-omap1/io.c | 2 +-
arch/arm/mach-omap1/lcd_dma.c | 2 +-
arch/arm/mach-omap1/mcbsp.c | 2 +-
arch/arm/mach-omap1/pm.c | 2 +-
arch/arm/mach-omap2/board-3430sdp.c | 2 +-
arch/arm/mach-omap2/board-h4.c | 2 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
arch/arm/mach-omap2/board-rx51.c | 2 +-
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/dma.c | 2 +-
arch/arm/mach-omap2/io.c | 2 +-
arch/arm/mach-omap2/mcbsp.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +-
.../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 3 +-
arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
arch/arm/mach-omap2/pm24xx.c | 2 +-
arch/arm/mach-omap2/pm34xx.c | 3 +-
arch/arm/mach-omap2/serial.c | 2 +-
arch/arm/plat-omap/dma.c | 2 +-
arch/arm/plat-omap/include/plat-omap/dma-omap.h | 377 ---------------------
drivers/crypto/omap-aes.c | 2 +-
drivers/crypto/omap-sham.c | 2 +-
drivers/dma/omap-dma.c | 2 -
drivers/media/platform/omap/omap_vout.c | 2 +-
drivers/media/platform/omap/omap_vout_vrfb.c | 2 +-
drivers/media/platform/omap3isp/ispstat.h | 2 +-
drivers/media/platform/soc_camera/omap1_camera.c | 2 +-
drivers/mtd/nand/omap2.c | 1 -
drivers/mtd/onenand/omap2.c | 2 +-
drivers/usb/gadget/omap_udc.c | 2 +-
drivers/usb/musb/tusb6010_omap.c | 2 +-
drivers/video/omap/lcdc.c | 2 +-
drivers/video/omap/omapfb_main.c | 2 +-
drivers/video/omap/sossi.c | 2 +-
drivers/watchdog/omap_wdt.c | 2 -
include/linux/omap-dma.h | 366 ++++++++++++++++++++
sound/soc/omap/mcbsp.c | 4 +-
sound/soc/omap/mcbsp.h | 6 +
sound/soc/omap/omap-mcbsp.c | 5 +-
49 files changed, 417 insertions(+), 430 deletions(-)
delete mode 100644 arch/arm/plat-omap/include/plat-omap/dma-omap.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL 2/3] omap late prcm changes for v3.8 merge window
2012-11-30 6:54 ` Olof Johansson
@ 2012-11-30 17:30 ` Tony Lindgren
-1 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-11-30 17:30 UTC (permalink / raw)
To: Olof Johansson; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
* Olof Johansson <olof@lixom.net> [121129 22:56]:
> On Mon, Nov 26, 2012 at 05:06:12PM -0800, Tony Lindgren wrote:
> > The following changes since commit 558a0780b0a04862a678f7823215424b4e5501f9:
> >
> > Merge tag 'omap-cleanup-c-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/clock (2012-11-13 13:32:24 -0800)
> >
> > are available in the git repository at:
> >
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/devel-prcm-signed
> >
> > for you to fetch changes up to 8b9c1ac2e11a9fb3a5a8860fb7570ff7633aa7f7:
> >
> > Merge tag 'omap-devel-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/devel-pcrm (2012-11-26 12:32:50 -0800)
>
> Thanks, pulled. Dependencies are getting to be a bit complex for omap stuff at
> this point, so I merged it into a new next/pm2 branch. It's not unlikely that
> we will combine next/pm, next/clock and next/pm2 into one branch before merging
> upstream, since there are lots of internal dependencies between those.
Yes thanks, only fixes coming up for omaps until -rc1 is tagged.
Regards,
Tony
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 2/3] omap late prcm changes for v3.8 merge window
@ 2012-11-30 17:30 ` Tony Lindgren
0 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-11-30 17:30 UTC (permalink / raw)
To: linux-arm-kernel
* Olof Johansson <olof@lixom.net> [121129 22:56]:
> On Mon, Nov 26, 2012 at 05:06:12PM -0800, Tony Lindgren wrote:
> > The following changes since commit 558a0780b0a04862a678f7823215424b4e5501f9:
> >
> > Merge tag 'omap-cleanup-c-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/clock (2012-11-13 13:32:24 -0800)
> >
> > are available in the git repository at:
> >
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/devel-prcm-signed
> >
> > for you to fetch changes up to 8b9c1ac2e11a9fb3a5a8860fb7570ff7633aa7f7:
> >
> > Merge tag 'omap-devel-a-for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8/devel-pcrm (2012-11-26 12:32:50 -0800)
>
> Thanks, pulled. Dependencies are getting to be a bit complex for omap stuff at
> this point, so I merged it into a new next/pm2 branch. It's not unlikely that
> we will combine next/pm, next/clock and next/pm2 into one branch before merging
> upstream, since there are lots of internal dependencies between those.
Yes thanks, only fixes coming up for omaps until -rc1 is tagged.
Regards,
Tony
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL 3/3] omap late multiplatform cleanup for v3.8 merge window
2012-11-30 17:26 ` Tony Lindgren
@ 2012-12-01 5:55 ` Olof Johansson
-1 siblings, 0 replies; 27+ messages in thread
From: Olof Johansson @ 2012-12-01 5:55 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
On Fri, Nov 30, 2012 at 9:26 AM, Tony Lindgren <tony@atomide.com> wrote:
> * Olof Johansson <olof@lixom.net> [121129 22:55]:
>> On Mon, Nov 26, 2012 at 05:06:12PM -0800, Tony Lindgren wrote:
>> > The following changes since commit 0f9cb211ba5db93d488fe6b154138231fdd0e22d:
>> >
>> > Merge tag 'v3.7-rc7' into next/cleanup (2012-11-25 21:34:34 -0800)
>> >
>> > are available in the git repository at:
>> >
>> >
>> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-multiplatform-v2-signed
>> >
>> > for you to fetch changes up to 5ebb428d045ea9b908864547819786d5bcebad05:
>> >
>> > ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h (2012-11-26 13:19:23 -0800)
>>
>> Tony,
>>
>> Did you mean to base this branch on next/cleanup? We normally try to avoid
>> having vendor branches based on our common next/* branches, since it adds
>> dependencies that makes it hard to rebuild our branch if needed for some
>> reason.
>
> Sorry I should have asked before. I wanted to base this on something
> that compiles for with multiplatform support and is bootable with
> minimal patching and does not produce new merge conflicts.
>
> But I only need the resulting branch for testing, so as long as we
> the resulting arm-soc/for-next branch is usable for me until -rc1
> is out, I'll be happy.
>
> For merging, the dependencies for these three patches are:
>
> omap-for-v3.8/cleanup-fixes-part2-v2-signed (all the header clean-up)
> omap-for-v3.8/devel-prcm-signed (needed the wdt changes)
>
> So I've merged those two to use as a base, the patches on top
> are the same. Hope that works for you better.
Yep, that's better!
> It's now missing the common clock changes, but that's OK as the
> branch does not yet enable the multiplatform support. Updated pull
> request below.
>
> BTW, note that "[GIT PULL] omap iommu clean-up dependency branch for
> v3.8 merge window" is still pending it seems?
Done, thanks for the reminder.
> The following changes since commit 2589d056122f6dcb405d411eae872aac8cf9da1b:
>
> Merge tag 'tags/omap-for-v3.8/devel-prcm-signed' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-30 08:40:31 -0800)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed
>
Pulled in, I had two minor conflicts to resolve resulting in two
one-line differences in the diff stat (removed an empty line between
some includes).
I ended up pulling this into next/pm2, since that's where the last of
the prereqs was and we'll likely reshuffle some of those late branches
before merging anyway.
Thanks,
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 3/3] omap late multiplatform cleanup for v3.8 merge window
@ 2012-12-01 5:55 ` Olof Johansson
0 siblings, 0 replies; 27+ messages in thread
From: Olof Johansson @ 2012-12-01 5:55 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Nov 30, 2012 at 9:26 AM, Tony Lindgren <tony@atomide.com> wrote:
> * Olof Johansson <olof@lixom.net> [121129 22:55]:
>> On Mon, Nov 26, 2012 at 05:06:12PM -0800, Tony Lindgren wrote:
>> > The following changes since commit 0f9cb211ba5db93d488fe6b154138231fdd0e22d:
>> >
>> > Merge tag 'v3.7-rc7' into next/cleanup (2012-11-25 21:34:34 -0800)
>> >
>> > are available in the git repository at:
>> >
>> >
>> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-multiplatform-v2-signed
>> >
>> > for you to fetch changes up to 5ebb428d045ea9b908864547819786d5bcebad05:
>> >
>> > ARM: OMAP: Move plat-omap/dma-omap.h to include/linux/omap-dma.h (2012-11-26 13:19:23 -0800)
>>
>> Tony,
>>
>> Did you mean to base this branch on next/cleanup? We normally try to avoid
>> having vendor branches based on our common next/* branches, since it adds
>> dependencies that makes it hard to rebuild our branch if needed for some
>> reason.
>
> Sorry I should have asked before. I wanted to base this on something
> that compiles for with multiplatform support and is bootable with
> minimal patching and does not produce new merge conflicts.
>
> But I only need the resulting branch for testing, so as long as we
> the resulting arm-soc/for-next branch is usable for me until -rc1
> is out, I'll be happy.
>
> For merging, the dependencies for these three patches are:
>
> omap-for-v3.8/cleanup-fixes-part2-v2-signed (all the header clean-up)
> omap-for-v3.8/devel-prcm-signed (needed the wdt changes)
>
> So I've merged those two to use as a base, the patches on top
> are the same. Hope that works for you better.
Yep, that's better!
> It's now missing the common clock changes, but that's OK as the
> branch does not yet enable the multiplatform support. Updated pull
> request below.
>
> BTW, note that "[GIT PULL] omap iommu clean-up dependency branch for
> v3.8 merge window" is still pending it seems?
Done, thanks for the reminder.
> The following changes since commit 2589d056122f6dcb405d411eae872aac8cf9da1b:
>
> Merge tag 'tags/omap-for-v3.8/devel-prcm-signed' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-30 08:40:31 -0800)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed
>
Pulled in, I had two minor conflicts to resolve resulting in two
one-line differences in the diff stat (removed an empty line between
some includes).
I ended up pulling this into next/pm2, since that's where the last of
the prereqs was and we'll likely reshuffle some of those late branches
before merging anyway.
Thanks,
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL 3/3] omap late multiplatform cleanup for v3.8 merge window
2012-12-01 5:55 ` Olof Johansson
@ 2012-12-01 18:33 ` Tony Lindgren
-1 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-12-01 18:33 UTC (permalink / raw)
To: Olof Johansson; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
* Olof Johansson <olof@lixom.net> [121130 21:57]:
> On Fri, Nov 30, 2012 at 9:26 AM, Tony Lindgren <tony@atomide.com> wrote:
> >
> > BTW, note that "[GIT PULL] omap iommu clean-up dependency branch for
> > v3.8 merge window" is still pending it seems?
>
> Done, thanks for the reminder.
OK thanks.
>
> > The following changes since commit 2589d056122f6dcb405d411eae872aac8cf9da1b:
> >
> > Merge tag 'tags/omap-for-v3.8/devel-prcm-signed' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-30 08:40:31 -0800)
> >
> > are available in the git repository at:
> >
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed
> >
>
> Pulled in, I had two minor conflicts to resolve resulting in two
> one-line differences in the diff stat (removed an empty line between
> some includes).
>
> I ended up pulling this into next/pm2, since that's where the last of
> the prereqs was and we'll likely reshuffle some of those late branches
> before merging anyway.
OK thanks.
Regards,
Tony
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 3/3] omap late multiplatform cleanup for v3.8 merge window
@ 2012-12-01 18:33 ` Tony Lindgren
0 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-12-01 18:33 UTC (permalink / raw)
To: linux-arm-kernel
* Olof Johansson <olof@lixom.net> [121130 21:57]:
> On Fri, Nov 30, 2012 at 9:26 AM, Tony Lindgren <tony@atomide.com> wrote:
> >
> > BTW, note that "[GIT PULL] omap iommu clean-up dependency branch for
> > v3.8 merge window" is still pending it seems?
>
> Done, thanks for the reminder.
OK thanks.
>
> > The following changes since commit 2589d056122f6dcb405d411eae872aac8cf9da1b:
> >
> > Merge tag 'tags/omap-for-v3.8/devel-prcm-signed' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3 (2012-11-30 08:40:31 -0800)
> >
> > are available in the git repository at:
> >
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed
> >
>
> Pulled in, I had two minor conflicts to resolve resulting in two
> one-line differences in the diff stat (removed an empty line between
> some includes).
>
> I ended up pulling this into next/pm2, since that's where the last of
> the prereqs was and we'll likely reshuffle some of those late branches
> before merging anyway.
OK thanks.
Regards,
Tony
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window
2012-11-30 8:04 ` Santosh Shilimkar
@ 2012-11-30 17:28 ` Tony Lindgren
-1 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-11-30 17:28 UTC (permalink / raw)
To: Santosh Shilimkar
Cc: Olof Johansson, Arnd Bergmann, linux-arm-kernel, linux-omap,
Igor Grinberg
* Santosh Shilimkar <santosh.shilimkar@ti.com> [121130 00:06]:
> Olof,
>
> On Friday 30 November 2012 12:48 PM, Olof Johansson wrote:
> >On Mon, Nov 26, 2012 at 05:06:11PM -0800, Tony Lindgren wrote:
> >>The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
> >>
> >> Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
> >>
> >>are available in the git repository at:
> >>
> >>
> >> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
> >>
> >>for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
> >>
> >> ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
> >
> >By the way, I had to apply the following fixup on top of this (in next/cleanup)
> >to fix a compilation failure. Seems to be caused by "ARM: OMAP2+: timer: remove
> >CONFIG_OMAP_32K_TIMER" from Igor.
Yes thanks.
> There was similar patch [1] like yours from Jon to fix above build
> break.
There's also few more fixes that I'll queue once these pending
branches are merged.
Regards,
Tony
> [1] http://www.spinics.net/lists/linux-omap/msg83260.html
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window
@ 2012-11-30 17:28 ` Tony Lindgren
0 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-11-30 17:28 UTC (permalink / raw)
To: linux-arm-kernel
* Santosh Shilimkar <santosh.shilimkar@ti.com> [121130 00:06]:
> Olof,
>
> On Friday 30 November 2012 12:48 PM, Olof Johansson wrote:
> >On Mon, Nov 26, 2012 at 05:06:11PM -0800, Tony Lindgren wrote:
> >>The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
> >>
> >> Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
> >>
> >>are available in the git repository at:
> >>
> >>
> >> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
> >>
> >>for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
> >>
> >> ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
> >
> >By the way, I had to apply the following fixup on top of this (in next/cleanup)
> >to fix a compilation failure. Seems to be caused by "ARM: OMAP2+: timer: remove
> >CONFIG_OMAP_32K_TIMER" from Igor.
Yes thanks.
> There was similar patch [1] like yours from Jon to fix above build
> break.
There's also few more fixes that I'll queue once these pending
branches are merged.
Regards,
Tony
> [1] http://www.spinics.net/lists/linux-omap/msg83260.html
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window
2012-11-30 7:18 ` Olof Johansson
@ 2012-11-30 8:04 ` Santosh Shilimkar
-1 siblings, 0 replies; 27+ messages in thread
From: Santosh Shilimkar @ 2012-11-30 8:04 UTC (permalink / raw)
To: Olof Johansson
Cc: Tony Lindgren, linux-omap, linux-arm-kernel, Arnd Bergmann,
Igor Grinberg
Olof,
On Friday 30 November 2012 12:48 PM, Olof Johansson wrote:
> On Mon, Nov 26, 2012 at 05:06:11PM -0800, Tony Lindgren wrote:
>> The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
>>
>> Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
>>
>> are available in the git repository at:
>>
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
>>
>> for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
>>
>> ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
>
> By the way, I had to apply the following fixup on top of this (in next/cleanup)
> to fix a compilation failure. Seems to be caused by "ARM: OMAP2+: timer: remove
> CONFIG_OMAP_32K_TIMER" from Igor.
>
There was similar patch [1] like yours from Jon to fix above build
break.
Regards
santosh
[1] http://www.spinics.net/lists/linux-omap/msg83260.html
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window
@ 2012-11-30 8:04 ` Santosh Shilimkar
0 siblings, 0 replies; 27+ messages in thread
From: Santosh Shilimkar @ 2012-11-30 8:04 UTC (permalink / raw)
To: linux-arm-kernel
Olof,
On Friday 30 November 2012 12:48 PM, Olof Johansson wrote:
> On Mon, Nov 26, 2012 at 05:06:11PM -0800, Tony Lindgren wrote:
>> The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
>>
>> Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
>>
>> are available in the git repository at:
>>
>>
>> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
>>
>> for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
>>
>> ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
>
> By the way, I had to apply the following fixup on top of this (in next/cleanup)
> to fix a compilation failure. Seems to be caused by "ARM: OMAP2+: timer: remove
> CONFIG_OMAP_32K_TIMER" from Igor.
>
There was similar patch [1] like yours from Jon to fix above build
break.
Regards
santosh
[1] http://www.spinics.net/lists/linux-omap/msg83260.html
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window
[not found] <50b41207.c188e50a.6d1e.ffffd469SMTPIN_ADDED_BROKEN@mx.google.com>
@ 2012-11-30 7:18 ` Olof Johansson
2012-11-30 7:18 ` Olof Johansson
1 sibling, 0 replies; 27+ messages in thread
From: Olof Johansson @ 2012-11-30 7:18 UTC (permalink / raw)
To: Tony Lindgren; +Cc: linux-omap, linux-arm-kernel, Arnd Bergmann, Igor Grinberg
On Mon, Nov 26, 2012 at 05:06:11PM -0800, Tony Lindgren wrote:
> The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
>
> Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
>
> for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
>
> ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
By the way, I had to apply the following fixup on top of this (in next/cleanup)
to fix a compilation failure. Seems to be caused by "ARM: OMAP2+: timer: remove
CONFIG_OMAP_32K_TIMER" from Igor.
Also, add __init annotation to remove 12 section mismatches (and take off the
explicit inline since __init + inline doesn't make sense -- the compiler should
do the right thing anyway).
-Olof
>From 73f14f6d007df1596da7cea9113084acfe846b8f Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Thu, 29 Nov 2012 23:05:32 -0800
Subject: [PATCH] ARM: omap: fix typo on timer cleanup
Fix 32 vs 32k typo:
arch/arm/mach-omap2/timer.c: In function 'omap4_local_timer_init':
arch/arm/mach-omap2/timer.c:633:2: error: implicit declaration of function 'omap4_sync32_timer_init' [-Werror=implicit-function-declaration]
arch/arm/mach-omap2/timer.c: At top level:
arch/arm/mach-omap2/timer.c:610:2: warning: 'omap4_sync32k_timer_init' defined but not used [-Wunused-function]
Also, mark the omap4_local_timer_init() stub as __init (and take off
the explicit inline and let the compiler do the work instead).
Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Igor Grinberg <grinberg@compulab.co.il>
---
arch/arm/mach-omap2/timer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index b9cff72..7016637 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -628,9 +628,9 @@ static void __init omap4_local_timer_init(void)
}
}
#else /* CONFIG_LOCAL_TIMERS */
-static inline void omap4_local_timer_init(void)
+static void __init omap4_local_timer_init(void)
{
- omap4_sync32_timer_init();
+ omap4_sync32k_timer_init();
}
#endif /* CONFIG_LOCAL_TIMERS */
OMAP_SYS_TIMER(4, local);
--
1.7.10.1.488.g05fbf7a
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window
@ 2012-11-30 7:18 ` Olof Johansson
0 siblings, 0 replies; 27+ messages in thread
From: Olof Johansson @ 2012-11-30 7:18 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 26, 2012 at 05:06:11PM -0800, Tony Lindgren wrote:
> The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
>
> Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
>
> for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
>
> ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
By the way, I had to apply the following fixup on top of this (in next/cleanup)
to fix a compilation failure. Seems to be caused by "ARM: OMAP2+: timer: remove
CONFIG_OMAP_32K_TIMER" from Igor.
Also, add __init annotation to remove 12 section mismatches (and take off the
explicit inline since __init + inline doesn't make sense -- the compiler should
do the right thing anyway).
-Olof
>From 73f14f6d007df1596da7cea9113084acfe846b8f Mon Sep 17 00:00:00 2001
From: Olof Johansson <olof@lixom.net>
Date: Thu, 29 Nov 2012 23:05:32 -0800
Subject: [PATCH] ARM: omap: fix typo on timer cleanup
Fix 32 vs 32k typo:
arch/arm/mach-omap2/timer.c: In function 'omap4_local_timer_init':
arch/arm/mach-omap2/timer.c:633:2: error: implicit declaration of function 'omap4_sync32_timer_init' [-Werror=implicit-function-declaration]
arch/arm/mach-omap2/timer.c: At top level:
arch/arm/mach-omap2/timer.c:610:2: warning: 'omap4_sync32k_timer_init' defined but not used [-Wunused-function]
Also, mark the omap4_local_timer_init() stub as __init (and take off
the explicit inline and let the compiler do the work instead).
Signed-off-by: Olof Johansson <olof@lixom.net>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Igor Grinberg <grinberg@compulab.co.il>
---
arch/arm/mach-omap2/timer.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index b9cff72..7016637 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -628,9 +628,9 @@ static void __init omap4_local_timer_init(void)
}
}
#else /* CONFIG_LOCAL_TIMERS */
-static inline void omap4_local_timer_init(void)
+static void __init omap4_local_timer_init(void)
{
- omap4_sync32_timer_init();
+ omap4_sync32k_timer_init();
}
#endif /* CONFIG_LOCAL_TIMERS */
OMAP_SYS_TIMER(4, local);
--
1.7.10.1.488.g05fbf7a
^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window
[not found] <50b41207.c188e50a.6d1e.ffffd469SMTPIN_ADDED_BROKEN@mx.google.com>
@ 2012-11-30 6:34 ` Olof Johansson
2012-11-30 7:18 ` Olof Johansson
1 sibling, 0 replies; 27+ messages in thread
From: Olof Johansson @ 2012-11-30 6:34 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, linux-arm-kernel, linux-omap
On Mon, Nov 26, 2012 at 05:06:11PM -0800, Tony Lindgren wrote:
> The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
>
> Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
>
> for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
>
> ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
>
Thanks, pulled into next/cleanup.
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window
@ 2012-11-30 6:34 ` Olof Johansson
0 siblings, 0 replies; 27+ messages in thread
From: Olof Johansson @ 2012-11-30 6:34 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 26, 2012 at 05:06:11PM -0800, Tony Lindgren wrote:
> The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
>
> Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
>
> are available in the git repository at:
>
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
>
> for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
>
> ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
>
Thanks, pulled into next/cleanup.
-Olof
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window
@ 2012-11-27 1:06 Tony Lindgren
0 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-11-27 1:06 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-arm-kernel, linux-omap
The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
----------------------------------------------------------------
Timer clean-up to get us closer to moving timer code to drivers,
and to get rid of CONFIG_OMAP_32K_TIMER and rely on the board
or devicetree provided timer configuration.
Note that these changes are on top of the recent timer fixes.
----------------------------------------------------------------
Igor Grinberg (2):
ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
ARM: OMAP3: cm-t3517: use GPTIMER for system clock
Jon Hunter (8):
ARM: OMAP: Clean-up dmtimer reset code
ARM: OMAP: Define omap_dm_timer_prepare function as static
ARM: OMAP: Don't store timers physical address
ARM: OMAP2+: Remove unnecessary local variable in timer code
ARM: OMAP: Remove unnecessary omap_dm_timer structure declaration
ARM: OMAP: Add platform data header for DMTIMERs
ARM: OMAP: Remove unnecessary inclusion of dmtimer.h
ARM: OMAP2+: Fix compiler warning for 32k timer
Tony Lindgren (1):
Merge branch 'cleanup-timer' of git://github.com/jonhunter/linux into omap-for-v3.8/timer
arch/arm/mach-omap1/timer.c | 1 +
arch/arm/mach-omap1/timer32k.c | 1 -
arch/arm/mach-omap2/board-cm-t3517.c | 2 +-
arch/arm/mach-omap2/common.h | 1 +
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 -
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 1 -
arch/arm/mach-omap2/pm-debug.c | 1 -
arch/arm/mach-omap2/timer.c | 167 +++++++++++++----------------
arch/arm/plat-omap/Kconfig | 6 ++
arch/arm/plat-omap/dmtimer.c | 54 ++++++----
arch/arm/plat-omap/include/plat/dmtimer.h | 80 ++++----------
drivers/staging/tidspbridge/core/ue_deh.c | 1 -
include/linux/platform_data/dmtimer-omap.h | 31 ++++++
13 files changed, 168 insertions(+), 179 deletions(-)
create mode 100644 include/linux/platform_data/dmtimer-omap.h
^ permalink raw reply [flat|nested] 27+ messages in thread
* [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window
@ 2012-11-27 1:06 Tony Lindgren
0 siblings, 0 replies; 27+ messages in thread
From: Tony Lindgren @ 2012-11-27 1:06 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
The following changes since commit 9dc57643738f9fbe45c10cc062903d5dfda5bdd9:
Merge branch 'fixes-timer' of github.com:jonhunter/linux into omap-for-v3.8/timer (2012-11-13 13:52:38 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.8/cleanup-timer-signed
for you to fetch changes up to 26f01998b0657a61167a819f1c37cb9f9e9d674b:
ARM: OMAP3: cm-t3517: use GPTIMER for system clock (2012-11-21 10:20:43 -0800)
----------------------------------------------------------------
Timer clean-up to get us closer to moving timer code to drivers,
and to get rid of CONFIG_OMAP_32K_TIMER and rely on the board
or devicetree provided timer configuration.
Note that these changes are on top of the recent timer fixes.
----------------------------------------------------------------
Igor Grinberg (2):
ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
ARM: OMAP3: cm-t3517: use GPTIMER for system clock
Jon Hunter (8):
ARM: OMAP: Clean-up dmtimer reset code
ARM: OMAP: Define omap_dm_timer_prepare function as static
ARM: OMAP: Don't store timers physical address
ARM: OMAP2+: Remove unnecessary local variable in timer code
ARM: OMAP: Remove unnecessary omap_dm_timer structure declaration
ARM: OMAP: Add platform data header for DMTIMERs
ARM: OMAP: Remove unnecessary inclusion of dmtimer.h
ARM: OMAP2+: Fix compiler warning for 32k timer
Tony Lindgren (1):
Merge branch 'cleanup-timer' of git://github.com/jonhunter/linux into omap-for-v3.8/timer
arch/arm/mach-omap1/timer.c | 1 +
arch/arm/mach-omap1/timer32k.c | 1 -
arch/arm/mach-omap2/board-cm-t3517.c | 2 +-
arch/arm/mach-omap2/common.h | 1 +
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 -
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 1 -
arch/arm/mach-omap2/pm-debug.c | 1 -
arch/arm/mach-omap2/timer.c | 167 +++++++++++++----------------
arch/arm/plat-omap/Kconfig | 6 ++
arch/arm/plat-omap/dmtimer.c | 54 ++++++----
arch/arm/plat-omap/include/plat/dmtimer.h | 80 ++++----------
drivers/staging/tidspbridge/core/ue_deh.c | 1 -
include/linux/platform_data/dmtimer-omap.h | 31 ++++++
13 files changed, 168 insertions(+), 179 deletions(-)
create mode 100644 include/linux/platform_data/dmtimer-omap.h
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2012-12-01 18:34 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-11-27 1:06 [GIT PULL 1/3] omap late timer clean-up (and a warning fix) for v3.8 merge window Tony Lindgren
2012-11-27 1:06 ` [GIT PULL 3/3] omap late multiplatform cleanup " Tony Lindgren
2012-11-27 1:06 ` Tony Lindgren
2012-11-27 1:06 ` [GIT PULL 2/3] omap late prcm changes " Tony Lindgren
2012-11-27 1:06 ` Tony Lindgren
[not found] ` <50b4120b.d088e50a.742e.ffffd3d3SMTPIN_ADDED_MISSING@mx.google.com>
2012-11-30 6:53 ` [GIT PULL 3/3] omap late multiplatform cleanup " Olof Johansson
2012-11-30 6:53 ` Olof Johansson
2012-11-30 17:26 ` Tony Lindgren
2012-11-30 17:26 ` Tony Lindgren
2012-12-01 5:55 ` Olof Johansson
2012-12-01 5:55 ` Olof Johansson
2012-12-01 18:33 ` Tony Lindgren
2012-12-01 18:33 ` Tony Lindgren
[not found] ` <50b41208.4989e50a.26c2.ffffba54SMTPIN_ADDED_MISSING@mx.google.com>
2012-11-30 6:54 ` [GIT PULL 2/3] omap late prcm changes " Olof Johansson
2012-11-30 6:54 ` Olof Johansson
2012-11-30 17:30 ` Tony Lindgren
2012-11-30 17:30 ` Tony Lindgren
[not found] <50b41207.c188e50a.6d1e.ffffd469SMTPIN_ADDED_BROKEN@mx.google.com>
2012-11-30 6:34 ` [GIT PULL 1/3] omap late timer clean-up (and a warning fix) " Olof Johansson
2012-11-30 6:34 ` Olof Johansson
2012-11-30 7:18 ` Olof Johansson
2012-11-30 7:18 ` Olof Johansson
2012-11-30 8:04 ` Santosh Shilimkar
2012-11-30 8:04 ` Santosh Shilimkar
2012-11-30 17:28 ` Tony Lindgren
2012-11-30 17:28 ` Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2012-11-27 1:06 Tony Lindgren
2012-11-27 1:06 Tony Lindgren
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.