linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] ARM: OMAP: DSS hwmod/reset fixes for 3.2
Date: Fri, 4 Nov 2011 17:35:50 -0700	[thread overview]
Message-ID: <20111105003550.GM31337@atomide.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1110061806150.4611@utopia.booyaka.com>

* Paul Walmsley <paul@pwsan.com> [111006 16:33]:
> Hi Tony,
> 
> The following changes since commit be73246058737beec52ae232bcab7776332a9e06:
> 
>   ARM: OMAP2+: Remove custom init_irq for remaining boards (2011-09-26 17:50:37 -0700)
> 
> are available in the git repository at:
>   git://git.pwsan.com/linux-2.6 hwmod_dss_fixes_3.2

Looks like you should take a look at the merge conflicts with
this one, maybe rebase it on 994c0e992522c123298b4a91b72f5e67ba2d1123.

Regards,

Tony
 
> Archit Taneja (1):
>       ARM: OMAP2PLUS: DSS: Ensure DSS works correctly if display is enabled in bootloader
> 
> Tomi Valkeinen (9):
>       ARM: OMAP2xxx: HWMOD: Fix DSS reset
>       ARM: OMAP2xxx: HWMOD: fix DSS clock data
>       ARM: OMAP3: HWMOD: Fix DSS reset
>       ARM: OMAP3: HWMOD: fix DSS clock data
>       ARM: OMAP4: HWMOD: remove extra clocks
>       ARM: OMAP4: HWMOD: Add HWMOD_CONTROL_OPT_CLKS_IN_RESET for dss_core
>       ARM: OMAP4: HWMOD: fix DSS clock data
>       ARM: OMAP2/3: HWMOD: Add SYSS_HAS_RESET_STATUS for dss
>       ARM: OMAP: HWMOD: Unify DSS resets for OMAPs
> 
>  arch/arm/mach-omap2/Makefile                       |    5 +-
>  arch/arm/mach-omap2/display.c                      |  160 ++++++++++++++++++++
>  arch/arm/mach-omap2/display.h                      |   29 ++++
>  arch/arm/mach-omap2/omap_hwmod_2420_data.c         |   17 ++-
>  arch/arm/mach-omap2/omap_hwmod_2430_data.c         |   17 ++-
>  .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c |    5 +-
>  arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |   37 ++++-
>  arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |   24 ++--
>  arch/arm/mach-omap2/omap_hwmod_common_data.c       |    4 +
>  arch/arm/mach-omap2/omap_hwmod_common_data.h       |    4 +
>  arch/arm/plat-omap/include/plat/common.h           |    3 +
>  include/video/omapdss.h                            |    7 -
>  12 files changed, 277 insertions(+), 35 deletions(-)
>  create mode 100644 arch/arm/mach-omap2/display.h

  reply	other threads:[~2011-11-05  0:35 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-07  0:07 [GIT PULL] ARM: OMAP: DSS hwmod/reset fixes for 3.2 Paul Walmsley
2011-11-05  0:35 ` Tony Lindgren [this message]
2011-11-08  7:50   ` Paul Walmsley
2011-11-08 10:08     ` Tomi Valkeinen
2011-11-08 10:33       ` Paul Walmsley
2011-11-08 12:14         ` Tomi Valkeinen
2011-11-14 20:46           ` Tony Lindgren
2011-11-14 21:40             ` Paul Walmsley
2011-11-14 22:04               ` Tony Lindgren
2011-11-15  7:06                 ` Tomi Valkeinen
2011-11-19  0:06                   ` Tony Lindgren

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111105003550.GM31337@atomide.com \
    --to=tony@atomide.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).