On Sat, 2010-02-13 at 11:43 +0100, ext Hiremath, Vaibhav wrote: > > -----Original Message----- > > From: Hiremath, Vaibhav > > Sent: Saturday, February 13, 2010 4:04 PM > > To: 'Tomi Valkeinen'; ext Tony Lindgren > > Cc: ext Mike Rapoport; linux-omap@xxxxxxxxxxxxxxx > > Subject: RE: Moving board patches from DSS2 to linux-omap > > > > > > > -----Original Message----- > > > From: Tomi Valkeinen [mailto:tomi.valkeinen@xxxxxxxxx] > > > Sent: Friday, February 12, 2010 4:14 PM > > > To: ext Tony Lindgren > > > Cc: ext Mike Rapoport; Hiremath, Vaibhav; linux- > > omap@xxxxxxxxxxxxxxx > > > Subject: Re: Moving board patches from DSS2 to linux-omap > > > > > > On Thu, 2010-02-11 at 19:52 +0100, ext Tony Lindgren wrote: > > > > * Tomi Valkeinen <tomi.valkeinen@xxxxxxxxx> [100211 03:59]: > > > > > 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. > > > > > > > > OK, Tomi, can you please set up a banch against mainline -rc7 > > with > > > > whatever board-*.c dss2 patches you want me to pull? I'll pull > > > them > > > > into omap-for-linus, and rebase omap for-next on those. > > > > > > Here: > > > > > > git://gitorious.org/linux-omap-dss2/linux.git for-tony > > > > > > I removed the defconfig changes from the patches, and compile > > > tested. > > > I'll add the defconfig changes as separate patches in my tree, and > > > I'll > > > push them to Linus only after the board changes from Tony's tree > > > have > > > gone through. > > > > > [Hiremath, Vaibhav] Tomi, > > > > I have pulled in for-tony branch and validated it on OAMP3EVM (with > > omap3_defconfig) and AM3517EVM without any issues. > > > [Hiremath, Vaibhav] Missed to mention one point, > Tomi, > Probably you have not merged sharp LQ043T1DG01 panel support patch required for AM3517? > > Can you merge that patch also? I have that patch in my tree. It's been there for some time. Perhaps I forgot to email back about that... > > Do you need any help here? Do you want me to separate defconfig > > patches for you? I separated the defconfig change from the board file changes, and made separate patches from them. They are in my master branch, and they apply cleanly, so I think everything is fine. Tomi -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
