RE: Moving board patches from DSS2 to linux-omap
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@vger.kernel.org Subject: RE: Moving board patches from DSS2 to linux-omap -Original Message- From: Tomi Valkeinen [mailto:tomi.valkei...@nokia.com] Sent: Friday, February 12, 2010 4:14 PM To: ext Tony Lindgren Cc: ext Mike Rapoport; Hiremath, Vaibhav; linux- o...@vger.kernel.org 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.valkei...@nokia.com [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 majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: Moving board patches from DSS2 to linux-omap
-Original Message- From: Tomi Valkeinen [mailto:tomi.valkei...@nokia.com] Sent: Friday, February 12, 2010 4:14 PM To: ext Tony Lindgren Cc: ext Mike Rapoport; Hiremath, Vaibhav; linux-omap@vger.kernel.org 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.valkei...@nokia.com [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. Do you need any help here? Do you want me to separate defconfig patches for you? Thanks, Vaibhav Tomi -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: Moving board patches from DSS2 to linux-omap
-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@vger.kernel.org Subject: RE: Moving board patches from DSS2 to linux-omap -Original Message- From: Tomi Valkeinen [mailto:tomi.valkei...@nokia.com] Sent: Friday, February 12, 2010 4:14 PM To: ext Tony Lindgren Cc: ext Mike Rapoport; Hiremath, Vaibhav; linux- o...@vger.kernel.org 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.valkei...@nokia.com [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? Thanks, Vaibhav Do you need any help here? Do you want me to separate defconfig patches for you? Thanks, Vaibhav Tomi -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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.valkei...@nokia.com [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. Tomi -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Moving board patches from DSS2 to linux-omap
* Tomi Valkeinen tomi.valkei...@nokia.com [100212 02:38]: On Thu, 2010-02-11 at 19:52 +0100, ext Tony Lindgren wrote: * Tomi Valkeinen tomi.valkei...@nokia.com [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. Great, thanks, I've pulled it into omap-for-linus branch. Note that we need to wait for Russell to merge the arm changes first and then I need merge with that before I can send a pull request because of the addruart changes that affect most of our multi-omap patches. So you may want to send the defconfig changes as a separate fix later on if that allows you to keep your dss2 mergeable without having to worry about the merging of arm and omap trees. Regards, Tony -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Moving board patches from DSS2 to linux-omap
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? Now, I don't think there's a perfect solution for this, but I think a working solution would be to put all board file changes to linux-omap tree (with the exception of some rare changes that don't compile without new DSS2 patches), but leave the kernel config unchanged. This way the board file contains references to new panel drivers, but as DSS2 nor the panel drivers are enabled in the Kconfig, the board file code is not used and everything should work as before. Then either I can have Kconfig patches in my tree, which are less likely to conflict, or the Kconfig changes can be done after both linux-omap and dss2 patches have been merged. How does this sound? Tomi Ps. I haven't actually tried those board file patches on top of linux-omap, but I don't see anything there that would cause compilation to fail. -- Sincerely yours, Mike. -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Moving board patches from DSS2 to linux-omap
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 -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Moving board patches from DSS2 to linux-omap
* Tomi Valkeinen tomi.valkei...@nokia.com [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. In general, omap-for-linus should be static for Linus to pull, while omap for-next still changes based on the comments. 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. Sure I'll can pull whatever Tomi thinks is OK. Just please make sure that before I pull, all the dss2 board-*.c patches have been reviewed on both linux-omap and linux-arm-kernel lists. We should probably also start merging Tomi's drivers/video/omap branch into omap master branch on regular basis for testing. Regards, Tony -- To unsubscribe from this list: send the line unsubscribe linux-omap in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
