mbox

[GIT,PULL,v2] DaVinci DM644x video display support

Message ID DF0F476B391FA8409C78302C7BA518B6317F13DB@DBDE01.ent.ti.com
State New
Headers show

Pull-request

git://gitorious.org/linux-davinci/linux-davinci.git v3.4/features

Message

Sekhar Nori March 11, 2012, 7:36 a.m. UTC
Hi Arnd, Olof,

Can you please pull these two patches adding support
for DaVinci DM644x V4L2 display support for v3.4.

These patches heavily depend on the clean-up series sent
earlier. I have re-generated the pull request against
v3.4/cleanup branch of my tree (already pulled earlier
and unchanged since) as suggested by Olof.

Let me know if this works for you.

Thanks,
Sekhar

The following changes since commit 12db9588ff811ae43a476b1234b27323055ab3ad:
  Manjunath Hadli (1):
        ARM: davinci: dm644x: don't force vpfe registeration on all boards

are available in the git repository at:

  git://gitorious.org/linux-davinci/linux-davinci.git v3.4/features

Manjunath Hadli (2):
      ARM: davinci: dm644x: add support for v4l2 video display
      ARM: davinci: dm644x evm: add support for VPBE display

 arch/arm/mach-davinci/board-dm644x-evm.c |  109 +++++++++++++++++++-
 arch/arm/mach-davinci/davinci.h          |    8 ++-
 arch/arm/mach-davinci/dm644x.c           |  166 +++++++++++++++++++++++++++---
 3 files changed, 268 insertions(+), 15 deletions(-)

Comments

Sekhar Nori March 15, 2012, 6:06 p.m. UTC | #1
Hi Arnd, Olof,

On Sun, Mar 11, 2012 at 13:06:55, Nori, Sekhar wrote:
> Hi Arnd, Olof,
> 
> Can you please pull these two patches adding support
> for DaVinci DM644x V4L2 display support for v3.4.
> 
> These patches heavily depend on the clean-up series sent
> earlier. I have re-generated the pull request against
> v3.4/cleanup branch of my tree (already pulled earlier
> and unchanged since) as suggested by Olof.
> 
> Let me know if this works for you.

If there is no further feedback, can you please pull
these patches?

Thanks,
Sekhar
Sekhar Nori March 16, 2012, 4:59 p.m. UTC | #2
Hi Arnd,

On Fri, Mar 16, 2012 at 02:06:35, Arnd Bergmann wrote:
> On Sunday 11 March 2012, Nori, Sekhar wrote:
> > Hi Arnd, Olof,
> > 
> > Can you please pull these two patches adding support
> > for DaVinci DM644x V4L2 display support for v3.4.
> > 
> > These patches heavily depend on the clean-up series sent
> > earlier. I have re-generated the pull request against
> > v3.4/cleanup branch of my tree (already pulled earlier
> > and unchanged since) as suggested by Olof.
> > 
> > Let me know if this works for you.
> 
> Looks good, applied to the next/drivers branch now.
> Sorry for missing the pull request earlier, that was my fault
> and I should have pulled it already.
> 
> I got a small merge conflict, see the resolution below.

Thanks for pulling this. The merge conflict resolution
was correct.

Regards,
Sekhar