Re: Moving board patches from DSS2 to linux-omap

Tomi Valkeinen
2010-02-11T12:02:12Z

On Thu, 2010-02-11 at 12:50 +0100, ext Mike Rapoport wrote:
> Tomi Valkeinen wrote:
> > Hi,
> >
> > As discussed previously, board file changes in DSS2 tree cause conflicts
> > with linux-omap easily. There are currently three board file patches in
> > DSS2's for-next branch:
> >
> > 722a97e4594b2041bbf18d95a913ba6dfaca87f2 omap3: cm-t35: add DSS2 display support
> > 7a56267e775e469c64521179ccc958c8bb661dbf OMAP: AM3517: Enable DSS2 for AM3517EVM board
> > 40e4e67c6dabcb9897b6823cce2297d6c3e78bbd OMAP: Enable DSS2 for OMAP3EVM board
> >
> > The problem here is of course that DSS2 tree may contain unmerged panel
> > drivers, and those board file changes try to use these new panel
> > drivers.
>
> Well, the panel drivers are referenced by name in the board files, so merging board
> file changes through linux-omap tree should not create merge conflicts and compile
> problems. There just won't be display until DSS2 tree is merged. Or am I missing
> something?

Yes, that is correct. This makes adding new boards and panels a bit more
complicated, but should remove most conflicts that happen between
linux-omap and dss2 trees.

Tomi