[GIT PULL]: linux-omap DSS

[GIT PULL]: linux-omap DSS

[Tomi Valkeinen]

Hi Tony,

The following mach-omap2 patches have been reviewed and are in DSS tree,
but cause easily conflicts with linux-omap tree.

Would it be possible for you to pull these into linux-omap? 

The patches are based on today's linux-omap/master.

 Tomi


The following changes since commit 35353452eb8b20c424ac4b88ad616f87fa8f5b1b:

  Linux-omap rebuilt: Changes merged for nand, onenand, boards (2011-02-17 16:25:12 -0800)

are available in the git repository at:

  git://gitorious.org/linux-omap-dss2/linux.git for-tony

Senthilvadivu Guruswamy (5):
      OMAP2420: hwmod data: add DSS DISPC RFBI VENC
      OMAP2430: hwmod data: add DSS DISPC RFBI VENC
      OMAP3: hwmod data: add DSS DISPC RFBI DSI VENC
      OMAP2, 3: DSS2: Use Regulator init with driver name
      OMAP2, 3: DSS2: board files: replace platform_device_register with omap_display_init()

Sumit Semwal (1):
      OMAP2, 3: DSS2: Create new file display.c for central dss driver registration.

 arch/arm/mach-omap2/Makefile               |    3 +
 arch/arm/mach-omap2/board-3430sdp.c        |   14 +-
 arch/arm/mach-omap2/board-am3517evm.c      |   16 +-
 arch/arm/mach-omap2/board-cm-t35.c         |   22 +--
 arch/arm/mach-omap2/board-devkit8000.c     |   10 +-
 arch/arm/mach-omap2/board-igep0020.c       |   16 +-
 arch/arm/mach-omap2/board-omap3beagle.c    |   10 +-
 arch/arm/mach-omap2/board-omap3evm.c       |   20 +--
 arch/arm/mach-omap2/board-omap3pandora.c   |   10 +-
 arch/arm/mach-omap2/board-omap3stalker.c   |   22 +--
 arch/arm/mach-omap2/board-rx51-video.c     |   15 +-
 arch/arm/mach-omap2/board-zoom-display.c   |   15 +-
 arch/arm/mach-omap2/display.c              |   45 +++
 arch/arm/mach-omap2/omap_hwmod_2420_data.c |  310 ++++++++++++++++++++
 arch/arm/mach-omap2/omap_hwmod_2430_data.c |  284 ++++++++++++++++++
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |  433 ++++++++++++++++++++++++++++
 arch/arm/plat-omap/include/plat/display.h  |   11 +
 arch/arm/plat-omap/include/plat/l3_2xxx.h  |   20 ++
 arch/arm/plat-omap/include/plat/l3_3xxx.h  |   20 ++
 arch/arm/plat-omap/include/plat/l4_2xxx.h  |   24 ++
 arch/arm/plat-omap/include/plat/l4_3xxx.h  |   10 +
 21 files changed, 1183 insertions(+), 147 deletions(-)
 create mode 100644 arch/arm/mach-omap2/display.c
 create mode 100644 arch/arm/plat-omap/include/plat/l3_2xxx.h
 create mode 100644 arch/arm/plat-omap/include/plat/l3_3xxx.h
 create mode 100644 arch/arm/plat-omap/include/plat/l4_2xxx.h

Re: [GIT PULL]: linux-omap DSS

[Tony Lindgren]

Hi,

* Tomi Valkeinen <tomi.valkeinen@ti.com> [110222 02:07]:
> Hi Tony,
> 
> The following mach-omap2 patches have been reviewed and are in DSS tree,
> but cause easily conflicts with linux-omap tree.
> 
> Would it be possible for you to pull these into linux-omap? 

Sure, but see below.
 
> The patches are based on today's linux-omap/master.

Can you please base thes on current omap-for-linus at
04aa67dec63b61c1a8b9b6d001262250f1a92130? (Just pushed it
with the omap4 hwmod fix for timer1)

I can't pull in the master branch into omap-for-linus as that
contains years of history of temporary commits.

Regards,

Tony

Re: [GIT PULL]: linux-omap DSS

[Tomi Valkeinen]

On Tue, 2011-02-22 at 13:01 -0600, Tony Lindgren wrote:
> Hi,
> 
> * Tomi Valkeinen <tomi.valkeinen@ti.com> [110222 02:07]:
> > Hi Tony,
> > 
> > The following mach-omap2 patches have been reviewed and are in DSS tree,
> > but cause easily conflicts with linux-omap tree.
> > 
> > Would it be possible for you to pull these into linux-omap? 
> 
> Sure, but see below.
>  
> > The patches are based on today's linux-omap/master.
> 
> Can you please base thes on current omap-for-linus at
> 04aa67dec63b61c1a8b9b6d001262250f1a92130? (Just pushed it
> with the omap4 hwmod fix for timer1)
> 
> I can't pull in the master branch into omap-for-linus as that
> contains years of history of temporary commits.

Ah, of course. I updated the branch

git://gitorious.org/linux-omap-dss2/linux.git for-tony

to be based on omap-for-linus. Minor conflicts in 3430sdp board file,
otherwise the commits are the same.

 Tomi

Re: [GIT PULL]: linux-omap DSS

[Tony Lindgren]

* Tomi Valkeinen <tomi.valkeinen@ti.com> [110222 23:41]:
> 
> Ah, of course. I updated the branch
> 
> git://gitorious.org/linux-omap-dss2/linux.git for-tony
> 
> to be based on omap-for-linus. Minor conflicts in 3430sdp board file,
> otherwise the commits are the same.

Thanks, pulled and pushed updated omap-for-linus and for-next.

Tony