Re: [PATCH 00/25] OMAPDSS: DT preparation patches v2
On Wed, 2012-05-09 at 08:45 -0700, Tony Lindgren wrote: * Tomi Valkeinen tomi.valkei...@ti.com [120509 01:12]: Below is the pull request for board file related changes. Tested on panda 4430sdp. Thanks, I've merged that into clenaup-dss branch and will send it along with other still pending cleanup branches. How should I manage my tree related to this... Should I rebase my original DT preparation series on top of this new branch, or can I just ignore the new branch for now, as long as I merge it at some point before sending a pull request to mainline? Yes you need to rebase on this now. And not touch these commits. Otherwise we'll end up with duplicate commits in the mainline tree, which is a big no-no. If something shows up that needs fixing in this series, it must now be separate patches on top of this series. When doing pull requests we both just have to make note that there's a dependency to this branch, and it will find it's way to mainline via arm-soc pull request. Or if no conflicts need sorting out, then it will just get merged with your pull request. Hmm, I'm still not totally sure how to proceed. What do you mean with make a note? I understand that I can't change the commits, but is it ok for me to now merge the for-l-o-3.5 branch into my master branch (which is my stable branch, for which I'll send a pull request)? If the same commits are both in my tree and in l-o (or arm-soc), doesn't it mean that the commits seem to come into Linus's tree from whoever happens to send their pull request first? Then again, does it matter.. And if there are conflicts in the board files between for-l-o-3.5 and some other commits, and you or Arnd resolve those for l-o or arm-soc, what happens when the same, but unresolved, commits come from my pull request? Sorry if this should be obvious, but I haven't done such merging before and I'd rather not mess it up =). Tomi signature.asc Description: This is a digitally signed message part
Re: [PATCH 00/25] OMAPDSS: DT preparation patches v2
* Tomi Valkeinen tomi.valkei...@ti.com [120510 00:15]: On Wed, 2012-05-09 at 08:45 -0700, Tony Lindgren wrote: * Tomi Valkeinen tomi.valkei...@ti.com [120509 01:12]: Below is the pull request for board file related changes. Tested on panda 4430sdp. Thanks, I've merged that into clenaup-dss branch and will send it along with other still pending cleanup branches. How should I manage my tree related to this... Should I rebase my original DT preparation series on top of this new branch, or can I just ignore the new branch for now, as long as I merge it at some point before sending a pull request to mainline? Yes you need to rebase on this now. And not touch these commits. Otherwise we'll end up with duplicate commits in the mainline tree, which is a big no-no. If something shows up that needs fixing in this series, it must now be separate patches on top of this series. When doing pull requests we both just have to make note that there's a dependency to this branch, and it will find it's way to mainline via arm-soc pull request. Or if no conflicts need sorting out, then it will just get merged with your pull request. Hmm, I'm still not totally sure how to proceed. What do you mean with make a note? Well let's say I had some conflicting platform data clean up patches, I would pull in your branch, then when sending a pull request I would mention that it depends on your branch being pulled in. I understand that I can't change the commits, but is it ok for me to now merge the for-l-o-3.5 branch into my master branch (which is my stable branch, for which I'll send a pull request)? Yes. But I suggest you first add add that panda xm gpio fix into your for-l-o-3.5 and that way it's safer for me to merge too. If the same commits are both in my tree and in l-o (or arm-soc), doesn't it mean that the commits seem to come into Linus's tree from whoever happens to send their pull request first? Then again, does it matter.. Yes, that's OK. And if there are conflicts in the board files between for-l-o-3.5 and some other commits, and you or Arnd resolve those for l-o or arm-soc, what happens when the same, but unresolved, commits come from my pull request? Well in that case it makes sense to get the arm-soc changes merged first, who wants to resolve conflicts multiple times? Of course more branches can be pulled into both trees as needed too. Sorry if this should be obvious, but I haven't done such merging before and I'd rather not mess it up =). Yeah np :) 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: [PATCH 00/25] OMAPDSS: DT preparation patches v2
On Mon, 2012-05-07 at 10:46 -0700, Tony Lindgren wrote:
Hi,
* Tomi Valkeinen tomi.valkei...@ti.com [120503 07:01]:
Hi,
I started cleaning up and restructuring omapdss for device tree, and here's
the
first set of patches from that ordeal. There's nothing DT specific in these
patches, but they are mostly generic cleanups that make sense even without
DT.
This is the second version of these patches, the previous version can be
found
from: http://www.spinics.net/lists/linux-fbdev/msg05667.html
The first 21 patches, which were in the previous version, have only gotten
minor cleanups (and, of course, more testing). The last 4 patches are new.
The
most important of those patches is the DSI pin config patch, which makes it
possible for the panel driver to configure the DSI pins it needs.
This series can also be found from:
git://gitorious.org/linux-omap-dss2/linux.git work/devtree-base
Nice clean up. Can you please put the first 12 arch/arm/*omap*/* touching
patches (and the drivers/video dependencies needed) into a separate branch
and send me a pull request. That is assuming those patches are now immutable.
Then I can pull it into cleanup-dss branch that we both can merge as
needed.
Below is the pull request for board file related changes. Tested on
panda 4430sdp.
How should I manage my tree related to this... Should I rebase my
original DT preparation series on top of this new branch, or can I just
ignore the new branch for now, as long as I merge it at some point
before sending a pull request to mainline?
Tomi
The following changes since commit 66f75a5d028beaf67c931435fdc3e7823125730c:
Linux 3.4-rc4 (2012-04-21 14:47:52 -0700)
are available in the git repository at:
git://gitorious.org/linux-omap-dss2/linux.git for-l-o-3.5
for you to fetch changes up to e4a9e94cc58ed6e4efb02b80be3a9bf57f448d07:
OMAPDSS: DSI: implement generic DSI pin config (2012-05-09 10:53:05 +0300)
Tomi Valkeinen (6):
OMAPDSS: panel-dvi: add PD gpio handling
OMAP: board-files: remove custom PD GPIO handling for DVI output
OMAPDSS: TFP410: rename dvi - tfp410
OMAPDSS: TFP410: rename dvi files to tfp410
OMAPDSS: Taal: move reset gpio handling to taal driver
OMAPDSS: DSI: implement generic DSI pin config
arch/arm/mach-omap2/board-3430sdp.c| 38 +-
arch/arm/mach-omap2/board-4430sdp.c| 37 ++
arch/arm/mach-omap2/board-am3517evm.c | 25 +---
arch/arm/mach-omap2/board-cm-t35.c | 30 +
arch/arm/mach-omap2/board-devkit8000.c | 30 +
arch/arm/mach-omap2/board-igep0020.c | 32 +
arch/arm/mach-omap2/board-omap3beagle.c| 37 +-
arch/arm/mach-omap2/board-omap3evm.c | 29 +
arch/arm/mach-omap2/board-omap3stalker.c | 29 +
arch/arm/mach-omap2/board-omap4panda.c | 39 +-
arch/arm/mach-omap2/board-overo.c | 25 +---
drivers/video/omap2/displays/Kconfig |8 +-
drivers/video/omap2/displays/Makefile |2 +-
drivers/video/omap2/displays/panel-taal.c | 22
.../omap2/displays/{panel-dvi.c = panel-tfp410.c} | 134 +++-
drivers/video/omap2/dss/dsi.c | 133 +--
include/video/omap-panel-nokia-dsi.h |3 +
.../{omap-panel-dvi.h = omap-panel-tfp410.h} | 18 ++-
include/video/omapdss.h| 28 ++--
19 files changed, 251 insertions(+), 448 deletions(-)
rename drivers/video/omap2/displays/{panel-dvi.c = panel-tfp410.c} (63%)
rename include/video/{omap-panel-dvi.h = omap-panel-tfp410.h} (63%)
signature.asc
Description: This is a digitally signed message part
Re: [PATCH 00/25] OMAPDSS: DT preparation patches v2
* Tomi Valkeinen tomi.valkei...@ti.com [120509 01:12]:
Below is the pull request for board file related changes. Tested on
panda 4430sdp.
Thanks, I've merged that into clenaup-dss branch and will send it
along with other still pending cleanup branches.
How should I manage my tree related to this... Should I rebase my
original DT preparation series on top of this new branch, or can I just
ignore the new branch for now, as long as I merge it at some point
before sending a pull request to mainline?
Yes you need to rebase on this now. And not touch these commits.
Otherwise we'll end up with duplicate commits in the mainline tree,
which is a big no-no. If something shows up that needs fixing in this
series, it must now be separate patches on top of this series.
When doing pull requests we both just have to make note that there's
a dependency to this branch, and it will find it's way to mainline
via arm-soc pull request. Or if no conflicts need sorting out, then
it will just get merged with your pull request.
Regards,
Tony
Tomi
The following changes since commit 66f75a5d028beaf67c931435fdc3e7823125730c:
Linux 3.4-rc4 (2012-04-21 14:47:52 -0700)
are available in the git repository at:
git://gitorious.org/linux-omap-dss2/linux.git for-l-o-3.5
for you to fetch changes up to e4a9e94cc58ed6e4efb02b80be3a9bf57f448d07:
OMAPDSS: DSI: implement generic DSI pin config (2012-05-09 10:53:05 +0300)
Tomi Valkeinen (6):
OMAPDSS: panel-dvi: add PD gpio handling
OMAP: board-files: remove custom PD GPIO handling for DVI output
OMAPDSS: TFP410: rename dvi - tfp410
OMAPDSS: TFP410: rename dvi files to tfp410
OMAPDSS: Taal: move reset gpio handling to taal driver
OMAPDSS: DSI: implement generic DSI pin config
arch/arm/mach-omap2/board-3430sdp.c| 38 +-
arch/arm/mach-omap2/board-4430sdp.c| 37 ++
arch/arm/mach-omap2/board-am3517evm.c | 25 +---
arch/arm/mach-omap2/board-cm-t35.c | 30 +
arch/arm/mach-omap2/board-devkit8000.c | 30 +
arch/arm/mach-omap2/board-igep0020.c | 32 +
arch/arm/mach-omap2/board-omap3beagle.c| 37 +-
arch/arm/mach-omap2/board-omap3evm.c | 29 +
arch/arm/mach-omap2/board-omap3stalker.c | 29 +
arch/arm/mach-omap2/board-omap4panda.c | 39 +-
arch/arm/mach-omap2/board-overo.c | 25 +---
drivers/video/omap2/displays/Kconfig |8 +-
drivers/video/omap2/displays/Makefile |2 +-
drivers/video/omap2/displays/panel-taal.c | 22
.../omap2/displays/{panel-dvi.c = panel-tfp410.c} | 134
+++-
drivers/video/omap2/dss/dsi.c | 133 +--
include/video/omap-panel-nokia-dsi.h |3 +
.../{omap-panel-dvi.h = omap-panel-tfp410.h} | 18 ++-
include/video/omapdss.h| 28 ++--
19 files changed, 251 insertions(+), 448 deletions(-)
rename drivers/video/omap2/displays/{panel-dvi.c = panel-tfp410.c} (63%)
rename include/video/{omap-panel-dvi.h = omap-panel-tfp410.h} (63%)
--
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: [PATCH 00/25] OMAPDSS: DT preparation patches v2
On Mon, 2012-05-07 at 10:46 -0700, Tony Lindgren wrote: Hi, * Tomi Valkeinen tomi.valkei...@ti.com [120503 07:01]: Hi, I started cleaning up and restructuring omapdss for device tree, and here's the first set of patches from that ordeal. There's nothing DT specific in these patches, but they are mostly generic cleanups that make sense even without DT. This is the second version of these patches, the previous version can be found from: http://www.spinics.net/lists/linux-fbdev/msg05667.html The first 21 patches, which were in the previous version, have only gotten minor cleanups (and, of course, more testing). The last 4 patches are new. The most important of those patches is the DSI pin config patch, which makes it possible for the panel driver to configure the DSI pins it needs. This series can also be found from: git://gitorious.org/linux-omap-dss2/linux.git work/devtree-base Nice clean up. Can you please put the first 12 arch/arm/*omap*/* touching patches (and the drivers/video dependencies needed) into a separate branch and send me a pull request. That is assuming those patches are now immutable. Then I can pull it into cleanup-dss branch that we both can merge as needed. Ok, I'll see how it goes. Do I have your ack for the board file changes? Do you want to have patches that touch only arch/arm/mach-omap2/display.c, but not the board files? That's a dss specific file, and I don't expect anyone else to make changes to it, so chances for conflicts should be quite minimal. Tomi signature.asc Description: This is a digitally signed message part
Re: [PATCH 00/25] OMAPDSS: DT preparation patches v2
* Tomi Valkeinen tomi.valkei...@ti.com [120508 01:48]: On Mon, 2012-05-07 at 10:46 -0700, Tony Lindgren wrote: Hi, * Tomi Valkeinen tomi.valkei...@ti.com [120503 07:01]: Hi, I started cleaning up and restructuring omapdss for device tree, and here's the first set of patches from that ordeal. There's nothing DT specific in these patches, but they are mostly generic cleanups that make sense even without DT. This is the second version of these patches, the previous version can be found from: http://www.spinics.net/lists/linux-fbdev/msg05667.html The first 21 patches, which were in the previous version, have only gotten minor cleanups (and, of course, more testing). The last 4 patches are new. The most important of those patches is the DSI pin config patch, which makes it possible for the panel driver to configure the DSI pins it needs. This series can also be found from: git://gitorious.org/linux-omap-dss2/linux.git work/devtree-base Nice clean up. Can you please put the first 12 arch/arm/*omap*/* touching patches (and the drivers/video dependencies needed) into a separate branch and send me a pull request. That is assuming those patches are now immutable. Then I can pull it into cleanup-dss branch that we both can merge as needed. Ok, I'll see how it goes. Do I have your ack for the board file changes? Acked-by: Tony Lindgren t...@atomide.com Do you want to have patches that touch only arch/arm/mach-omap2/display.c, but not the board files? That's a dss specific file, and I don't expect anyone else to make changes to it, so chances for conflicts should be quite minimal. Yes probably board-*.c files are enough to avoid annoying merge conflicts. 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: [PATCH 00/25] OMAPDSS: DT preparation patches v2
Hi, * Tomi Valkeinen tomi.valkei...@ti.com [120503 07:01]: Hi, I started cleaning up and restructuring omapdss for device tree, and here's the first set of patches from that ordeal. There's nothing DT specific in these patches, but they are mostly generic cleanups that make sense even without DT. This is the second version of these patches, the previous version can be found from: http://www.spinics.net/lists/linux-fbdev/msg05667.html The first 21 patches, which were in the previous version, have only gotten minor cleanups (and, of course, more testing). The last 4 patches are new. The most important of those patches is the DSI pin config patch, which makes it possible for the panel driver to configure the DSI pins it needs. This series can also be found from: git://gitorious.org/linux-omap-dss2/linux.git work/devtree-base Nice clean up. Can you please put the first 12 arch/arm/*omap*/* touching patches (and the drivers/video dependencies needed) into a separate branch and send me a pull request. That is assuming those patches are now immutable. Then I can pull it into cleanup-dss branch that we both can merge as needed. 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
[PATCH 00/25] OMAPDSS: DT preparation patches v2
Hi, I started cleaning up and restructuring omapdss for device tree, and here's the first set of patches from that ordeal. There's nothing DT specific in these patches, but they are mostly generic cleanups that make sense even without DT. This is the second version of these patches, the previous version can be found from: http://www.spinics.net/lists/linux-fbdev/msg05667.html The first 21 patches, which were in the previous version, have only gotten minor cleanups (and, of course, more testing). The last 4 patches are new. The most important of those patches is the DSI pin config patch, which makes it possible for the panel driver to configure the DSI pins it needs. This series can also be found from: git://gitorious.org/linux-omap-dss2/linux.git work/devtree-base Tomi Tomi Valkeinen (25): OMAPDSS: panel-dvi: add PD gpio handling OMAP: board-files: remove custom PD GPIO handling for DVI output OMAPDSS: TFP410: rename dvi - tfp410 OMAPDSS: TFP410: rename dvi files to tfp410 OMAPDSS: TFP410: pdata rewrite OMAPDSS: DSI: use dsi_get_dsidev_id(dsidev) instead of dsidev-id OMAPDSS: Taal: move reset gpio handling to taal driver OMAPDSS: clean up the omapdss platform data mess OMAPDSS: remove return from platform_driver_unreg OMAPDSS: use platform_driver_probe for core/dispc/dss OMAPDSS: create custom pdevs for DSS omap_devices OMAPDSS: create DPI SDI devices OMAPDSS: create DPI SDI drivers OMAPDSS: remove uses of dss_runtime_get/put OMAPDSS: handle output-driver reg/unreg more dynamically OMAPDSS: move the creation of debugfs files OMAPDSS: use platform_driver_probe for dsi/hdmi/rfbi/venc/dpi/sdi OMAPDSS: add __init __exit OMAPFB: add __init __exit OMAPDSS: change default_device handling OMAPDSS: interface drivers register their panel devices OMAPDSS: init omap_dss_devices internally OMAPDSS: DSI: implement generic DSI pin config OMAPDSS: DSI: improve DSI module id handling OMAPDSS: separate pdata based initialization arch/arm/mach-omap2/board-3430sdp.c | 38 +-- arch/arm/mach-omap2/board-4430sdp.c | 37 +-- arch/arm/mach-omap2/board-am3517evm.c | 25 +- arch/arm/mach-omap2/board-cm-t35.c | 30 +-- arch/arm/mach-omap2/board-devkit8000.c | 30 +-- arch/arm/mach-omap2/board-igep0020.c| 32 +-- arch/arm/mach-omap2/board-omap3beagle.c | 37 +-- arch/arm/mach-omap2/board-omap3evm.c| 29 +- arch/arm/mach-omap2/board-omap3stalker.c| 29 +- arch/arm/mach-omap2/board-omap4panda.c | 39 +-- arch/arm/mach-omap2/board-overo.c | 25 +- arch/arm/mach-omap2/display.c | 175 ++-- drivers/video/omap2/displays/Kconfig|8 +- drivers/video/omap2/displays/Makefile |2 +- drivers/video/omap2/displays/panel-dvi.c| 363 - drivers/video/omap2/displays/panel-taal.c | 22 ++ drivers/video/omap2/displays/panel-tfp410.c | 385 +++ drivers/video/omap2/dss/core.c | 239 ++--- drivers/video/omap2/dss/dispc.c | 50 ++-- drivers/video/omap2/dss/display.c | 40 --- drivers/video/omap2/dss/dpi.c | 68 +++-- drivers/video/omap2/dss/dsi.c | 281 ++- drivers/video/omap2/dss/dss.c | 44 ++- drivers/video/omap2/dss/dss.h | 113 ++-- drivers/video/omap2/dss/hdmi.c | 86 +++--- drivers/video/omap2/dss/rfbi.c | 60 +++-- drivers/video/omap2/dss/sdi.c | 61 - drivers/video/omap2/dss/venc.c | 62 +++-- drivers/video/omap2/omapfb/omapfb-main.c|9 +- include/video/omap-panel-dvi.h | 37 --- include/video/omap-panel-nokia-dsi.h|3 + include/video/omap-panel-tfp410.h | 35 +++ include/video/omapdss.h | 33 +-- 33 files changed, 1220 insertions(+), 1307 deletions(-) delete mode 100644 drivers/video/omap2/displays/panel-dvi.c create mode 100644 drivers/video/omap2/displays/panel-tfp410.c delete mode 100644 include/video/omap-panel-dvi.h create mode 100644 include/video/omap-panel-tfp410.h -- 1.7.9.5 -- 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
