* [GIT PULL 1/5] omap SoC related late changes for v3.9 merge window
@ 2013-02-12 18:11 Tony Lindgren
2013-02-12 18:11 ` [GIT PULL 3/5] omap pm wfi " Tony Lindgren
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Tony Lindgren @ 2013-02-12 18:11 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7:
Linux 3.8-rc6 (2013-02-01 12:08:14 +1100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/soc-signed
for you to fetch changes up to 5af044f472501c8e9bd6bb274fb3d71d07a038cd:
ARM: OMAP2: AM33XX: id: Add support for AM335x PG2.0 (2013-02-01 14:53:39 -0800)
----------------------------------------------------------------
am33xx specific updates for restart and revision detection.
Also get rid of OMAP_32K_TIMER_HZ as that no longer is needed.
----------------------------------------------------------------
AnilKumar Ch (1):
ARM: OMAP2: AM33XX: id: Add support for AM335x PG2.0
Jean-Sebastien A. Beaudry (1):
ARM: OMAP2+: AM33xx: Add SoC specific restart hook
Santosh Shilimkar (1):
ARM: OMAP2+: Get rid of custom OMAP_32K_TIMER_HZ
arch/arm/Kconfig | 1 -
arch/arm/mach-omap2/Makefile | 1 +
arch/arm/mach-omap2/am33xx-restart.c | 34 +++++++++++++++++++++++++++++++++
arch/arm/mach-omap2/board-generic.c | 1 +
arch/arm/mach-omap2/common.h | 8 ++++++++
arch/arm/mach-omap2/id.c | 14 ++++++++++++--
arch/arm/mach-omap2/soc.h | 1 +
arch/arm/plat-omap/Kconfig | 9 ---------
arch/arm/plat-omap/include/plat/timex.h | 8 --------
9 files changed, 57 insertions(+), 20 deletions(-)
create mode 100644 arch/arm/mach-omap2/am33xx-restart.c
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL 2/5] am33xx related late changes for v3.8 merge window
2013-02-12 18:11 [GIT PULL 1/5] omap SoC related late changes for v3.9 merge window Tony Lindgren
2013-02-12 18:11 ` [GIT PULL 3/5] omap pm wfi " Tony Lindgren
2013-02-12 18:11 ` [GIT PULL 4/5] omap clock " Tony Lindgren
@ 2013-02-12 18:11 ` Tony Lindgren
2013-02-12 18:11 ` [GIT PULL 5/5] omap4 pm late changes for v3.9 " Tony Lindgren
3 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2013-02-12 18:11 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7:
Linux 3.8-rc6 (2013-02-01 12:08:14 +1100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/am33xx-signed
for you to fetch changes up to 3ad4a33158b7a2589149bc5ab29a6723d755c4ba:
Merge tag 'omap-devel-a-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9/am33xx (2013-02-09 19:55:41 -0800)
----------------------------------------------------------------
am33xx updates via Paul Walmsley <paul@pwsan.com>:
Fixes and IP block support for the TI AM33xx family of SoCs. These
are prerequisites for power management and some PWM driver changes.
Basic test logs are available from:
http://www.pwsan.com/omap/testlogs/am33xx_fixes_a_3.9/20130208084835/
although it must be noted that I am unable to test these patches on
AM33xx due to an unknown problem with v3.8-rc kernels:
http://www.mail-archive.com/linux-omap at vger.kernel.org/msg83525.html
----------------------------------------------------------------
Hebbar Gururaja (2):
ARM: OMAP2+: AM33xx: hwmod: add missing HWMOD_NO_IDLEST flags
ARM: OMAP2: am33xx-hwmod: Fix "register offset NULL check" bug
Philip Avinash (2):
ARM: OMAP: AM33xx hwmod: Corrects PWM subsystem HWMOD entries
ARM: OMAP: AM33xx hwmod: Add parent-child relationship for PWM subsystem
Tony Lindgren (1):
Merge tag 'omap-devel-a-for-3.9' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.9/am33xx
Vaibhav Bedia (8):
ARM: OMAP2+: AM33XX: CM: Get rid of unnecessary header inclusions
ARM: OMAP2+: AM33XX: CM/PRM: Use __ASSEMBLER__ macros in header files
ARM: OMAP2+: AM33XX: hwmod: Register OCMC RAM hwmod
ARM: OMAP2+: AM33XX: hwmod: Update TPTC0 hwmod with the right flags
ARM: OMAP2+: AM33XX: hwmod: Fixup cpgmac0 hwmod entry
ARM: OMAP2+: AM33XX: hwmod: Update the WKUP-M3 hwmod with reset status bit
ARM: OMAP2+: AM33XX: Update the hardreset API
ARM: DTS: AM33XX: Add nodes for OCMC RAM and WKUP-M3
arch/arm/boot/dts/am33xx.dtsi | 14 +
arch/arm/mach-omap2/cm33xx.c | 3 -
arch/arm/mach-omap2/cm33xx.h | 9 +-
arch/arm/mach-omap2/omap_hwmod.c | 5 +-
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 443 ++++++++++++++++++-----------
arch/arm/mach-omap2/prm33xx.c | 11 +-
arch/arm/mach-omap2/prm33xx.h | 4 +-
7 files changed, 306 insertions(+), 183 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL 3/5] omap pm wfi late changes for v3.9 merge window
2013-02-12 18:11 [GIT PULL 1/5] omap SoC related late changes for v3.9 merge window Tony Lindgren
@ 2013-02-12 18:11 ` Tony Lindgren
2013-02-12 18:11 ` [GIT PULL 4/5] omap clock " Tony Lindgren
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2013-02-12 18:11 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 8d61d7f94522a0c023ed79d4f690f2bfc8a41d96:
Merge tag 'omap-for-v3.9/pm-signed' into omap-for-v3.9/pm-wfi-take2 (2013-02-11 09:19:44 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/pm-wfi-take2-signed-v2
for you to fetch changes up to 25e4d0f6df356ec7c2a09f6744c36a84b5537f33:
Merge branch 'omap-for-v3.9/pm-fix' into omap-for-v3.9/pm-wfi-take2 (2013-02-12 09:01:25 -0800)
----------------------------------------------------------------
omap pm wfi changes via Paul Walmsley <paul@pwsan.com>:
On OMAP2+ devices, standardize and clean up WFI entry and WFI blocking.
Basic test logs are available here:
http://www.pwsan.com/omap/testlogs/wfi_devel_a_3.9/20130208085027/
Conflicts:
arch/arm/mach-omap2/pm24xx.c
Note that this is based on earlier omap-for-v3.9/pm-signed because
of a non-trivial merge conflict. This branch also contains a fix
for c1d1cd59 ("ARM: OMAP2+: omap_device: remove obsolete pm_lats
and early_device code").
----------------------------------------------------------------
Paul Walmsley (5):
ARM: OMAP2xxx: PM: enter WFI via inline asm if CORE stays active
ARM: OMAP2+: hwmod: add support for blocking WFI when a device is active
ARM: OMAP2420: hwmod data/PM: use hwmod to block WFI when I2C active
ARM: OMAP AM3517/05: hwmod data: block WFI when EMAC active
ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default
Tony Lindgren (2):
Merge tag 'omap-devel-b-for-3.9' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.9/pm-wfi-take2
Merge branch 'omap-for-v3.9/pm-fix' into omap-for-v3.9/pm-wfi-take2
arch/arm/mach-omap2/am35xx-emac.c | 3 +--
arch/arm/mach-omap2/devices.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 7 ++++++-
arch/arm/mach-omap2/pm24xx.c | 12 ++++++------
arch/arm/mach-omap2/sleep24xx.S | 19 -------------------
arch/arm/mach-omap2/sr_device.c | 2 +-
6 files changed, 15 insertions(+), 30 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL 4/5] omap clock late changes for v3.9 merge window
2013-02-12 18:11 [GIT PULL 1/5] omap SoC related late changes for v3.9 merge window Tony Lindgren
2013-02-12 18:11 ` [GIT PULL 3/5] omap pm wfi " Tony Lindgren
@ 2013-02-12 18:11 ` Tony Lindgren
2013-02-12 18:11 ` [GIT PULL 2/5] am33xx related late changes for v3.8 " Tony Lindgren
2013-02-12 18:11 ` [GIT PULL 5/5] omap4 pm late changes for v3.9 " Tony Lindgren
3 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2013-02-12 18:11 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7:
Linux 3.8-rc6 (2013-02-01 12:08:14 +1100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/clock-signed
for you to fetch changes up to 14211e2fd223212ee6498a707e01ac45fef22b10:
Merge tag 'omap-devel-e-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9/clock (2013-02-09 19:59:34 -0800)
----------------------------------------------------------------
omap clock changes via Paul Walmsley <paul@pwsan.com>:
Some miscellaneous OMAP2+ clock fixes, mostly related to the recent
common clock framework conversion.
Basic test logs are available here:
http://www.pwsan.com/omap/testlogs/clock_devel_a_3.9/20130208120108/
----------------------------------------------------------------
Afzal Mohammed (3):
ARM: OMAP2+: dpll: am335x - avoid freqsel
ARM: OMAP2+: clock data: add DEFINE_STRUCT_CLK_FLAGS helper
ARM: OMAP AM33XX: clock data: SET_RATE_PARENT in lcd path
Laurent Pinchart (2):
ARM: OMAP3: clock: Back-propagate rate change from cam_mclk to dpll4_m5
omap3isp: Set cam_mclk rate directly
Paul Walmsley (1):
Merge branch 'clock_misc_devel_a_3.9', remote-tracking branch 'remotes/pinchart/omap3isp/clock' into clock_devel_a_3.9
Rajendra Nayak (1):
ARM: OMAP4: clock data: Add missing clkdm association for dpll_usb
Tony Lindgren (1):
Merge tag 'omap-devel-e-for-3.9' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.9/clock
arch/arm/mach-omap2/cclock33xx_data.c | 10 ++++++----
arch/arm/mach-omap2/cclock3xxx_data.c | 10 +++++++++-
arch/arm/mach-omap2/cclock44xx_data.c | 13 ++++++++++++-
arch/arm/mach-omap2/clock.h | 11 +++++++++++
arch/arm/mach-omap2/dpll3xxx.c | 5 +++--
drivers/media/platform/omap3isp/isp.c | 18 ++----------------
drivers/media/platform/omap3isp/isp.h | 8 +++-----
7 files changed, 46 insertions(+), 29 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL 5/5] omap4 pm late changes for v3.9 merge window
2013-02-12 18:11 [GIT PULL 1/5] omap SoC related late changes for v3.9 merge window Tony Lindgren
` (2 preceding siblings ...)
2013-02-12 18:11 ` [GIT PULL 2/5] am33xx related late changes for v3.8 " Tony Lindgren
@ 2013-02-12 18:11 ` Tony Lindgren
3 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2013-02-12 18:11 UTC (permalink / raw)
To: linux-arm-kernel
The following changes since commit 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7:
Linux 3.8-rc6 (2013-02-01 12:08:14 +1100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/pm-omap4-signed
for you to fetch changes up to 93b23711b7132400d4d76f31c660d27a2bb0afdb:
Merge tag 'omap-devel-d2-for-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.9/pm-omap4 (2013-02-11 09:40:45 -0800)
----------------------------------------------------------------
omap4 pm changes via Paul Walmsley <paul@pwsan.com>:
Some OMAP4 power management fixes and audio device integration
patches. This pull request contains a fix for an issue discovered during
branch integration.
Basic test logs are available at:
http://www.pwsan.com/omap/testlogs/omap4_prcm_devel_a_3.9/20130210112717/
----------------------------------------------------------------
Paul Walmsley (4):
ARM: OMAP2+: hwmod: add enable_preprogram hook
ASoC: TI AESS: add autogating-enable function, callable from architecture code
ARM: OMAP4+: AESS: enable internal auto-gating during initial setup
Merge branches 'sg_aess_reset_devel_3.9' and 'omap4_pm_fixes_a_3.9' into omap4_prcm_devel_a_3.9
Rajendra Nayak (1):
ARM: OMAP4: PM: Warn users about usage of older bootloaders
Santosh Shilimkar (1):
ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init()
Sebastien Guiriec (2):
ARM: OMAP4: hwmod data: Update AESS data with memory bank area
ARM: OMAP4: hwmod data: Enable AESS hwmod device
Tony Lindgren (1):
Merge tag 'omap-devel-d2-for-3.9' of git://git.kernel.org/.../pjw/omap-pending into omap-for-v3.9/pm-omap4
arch/arm/mach-omap2/Makefile | 2 +-
arch/arm/mach-omap2/omap_hwmod.c | 18 ++++++++++
arch/arm/mach-omap2/omap_hwmod.h | 8 +++++
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 51 +++++++++++++++++++++++++---
arch/arm/mach-omap2/omap_hwmod_reset.c | 52 +++++++++++++++++++++++++++++
arch/arm/mach-omap2/pm.c | 20 +++++------
arch/arm/mach-omap2/pm44xx.c | 21 ++++++++++--
include/sound/aess.h | 53 ++++++++++++++++++++++++++++++
8 files changed, 208 insertions(+), 17 deletions(-)
create mode 100644 arch/arm/mach-omap2/omap_hwmod_reset.c
create mode 100644 include/sound/aess.h
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL 1/5] omap SoC related late changes for v3.9 merge window
[not found] <511a85b9.8473dc0a.41ed.ffffa70dSMTPIN_ADDED_BROKEN@mx.google.com>
@ 2013-02-12 23:37 ` Olof Johansson
2013-02-13 1:11 ` Tony Lindgren
0 siblings, 1 reply; 7+ messages in thread
From: Olof Johansson @ 2013-02-12 23:37 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Feb 12, 2013 at 10:11:01AM -0800, Tony Lindgren wrote:
> The following changes since commit 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7:
>
> Linux 3.8-rc6 (2013-02-01 12:08:14 +1100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/soc-signed
Pulled 1-5 into a late/omap branch. As usual with late branches, there's no
commitment that we'll be able to merge it, but we'll do best-effort depending
on how the merge window turns out.
-Olof
^ permalink raw reply [flat|nested] 7+ messages in thread
* [GIT PULL 1/5] omap SoC related late changes for v3.9 merge window
2013-02-12 23:37 ` [GIT PULL 1/5] omap SoC related " Olof Johansson
@ 2013-02-13 1:11 ` Tony Lindgren
0 siblings, 0 replies; 7+ messages in thread
From: Tony Lindgren @ 2013-02-13 1:11 UTC (permalink / raw)
To: linux-arm-kernel
* Olof Johansson <olof@lixom.net> [130212 15:40]:
> On Tue, Feb 12, 2013 at 10:11:01AM -0800, Tony Lindgren wrote:
> > The following changes since commit 88b62b915b0b7e25870eb0604ed9a92ba4bfc9f7:
> >
> > Linux 3.8-rc6 (2013-02-01 12:08:14 +1100)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.9/soc-signed
>
> Pulled 1-5 into a late/omap branch. As usual with late branches, there's no
> commitment that we'll be able to merge it, but we'll do best-effort depending
> on how the merge window turns out.
Thanks yes totally understood.
Tony
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-02-13 1:11 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-12 18:11 [GIT PULL 1/5] omap SoC related late changes for v3.9 merge window Tony Lindgren
2013-02-12 18:11 ` [GIT PULL 3/5] omap pm wfi " Tony Lindgren
2013-02-12 18:11 ` [GIT PULL 4/5] omap clock " Tony Lindgren
2013-02-12 18:11 ` [GIT PULL 2/5] am33xx related late changes for v3.8 " Tony Lindgren
2013-02-12 18:11 ` [GIT PULL 5/5] omap4 pm late changes for v3.9 " Tony Lindgren
[not found] <511a85b9.8473dc0a.41ed.ffffa70dSMTPIN_ADDED_BROKEN@mx.google.com>
2013-02-12 23:37 ` [GIT PULL 1/5] omap SoC related " Olof Johansson
2013-02-13 1:11 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).