| Message ID | 521DAC2B.4080100@ti.com |
|---|---|
| State | New |
| Headers | show |
* Tomi Valkeinen <tomi.valkeinen@ti.com> [130828 00:59]: > Hi, > > Here's a pull request for the board file changes to take the new display > drivers into use. OK great. > If there's an "early" pull request going to Linus during the merge window, it'd > be nice to have these in that request. That would give me time to send a pull > request to Linus containing removal of the old, no longer used, drivers. Nice to see that this is not conflicting with anything in linux next :) I suggest you keep this branch immutable in case it need to be merged to arm-soc tree, and merge it yourself along with the DSS patches. That way you don't have a dependency to arm-soc for removal of the old drivers. I've cc:ed Kevin and Olof so they too are aware of this too. Regards, Tony > The following changes since commit b36f4be3de1b123d8601de062e7dbfc904f305fb: > > Linux 3.11-rc6 (2013-08-18 14:36:53 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git 3.12/linux-omap > > for you to fetch changes up to d7b8eafbf513e414fa09dde61630b93be93a23a1: > > ARM: OMAP2+: Remove old display drivers from omap2plus_defconfig (2013-08-28 10:23:22 +0300) > > ---------------------------------------------------------------- > Tomi Valkeinen (20): > ARM: OMAP2+: Remove legacy DSS initialization for omap4 > ARM: OMAP2+: Add selected display drivers to omap2plus_defconfig > ARM: OMAP: dss-common: use new display drivers > ARM: OMAP: 4430SDP: remove picodlp device data > ARM: OMAP: overo: use new display drivers > ARM: OMAP: rx51: use new display drivers > ARM: OMAP: beagle: use new display drivers > ARM: OMAP: devkit8000: use new display drivers > ARM: OMAP: 2430SDP: use new display drivers > ARM: OMAP: LDP: use new display drivers > ARM: OMAP: omap3stalker: use new display drivers > ARM: OMAP: igep0020: use new display drivers > ARM: OMAP: cm-t35: use new display drivers > ARM: OMAP: H4: use new display drivers > ARM: OMAP: 3430SDP: use new display drivers > ARM: OMAP: OMAP3EVM: use new display drivers > ARM: OMAP: Pandora: use new display drivers > ARM: OMAP: Zoom: use new display drivers > ARM: OMAP: AM3517EVM: use new display drivers > ARM: OMAP2+: Remove old display drivers from omap2plus_defconfig > > arch/arm/configs/omap2plus_defconfig | 12 +- > arch/arm/mach-omap2/board-2430sdp.c | 57 ++++--- > arch/arm/mach-omap2/board-3430sdp.c | 83 +++++---- > arch/arm/mach-omap2/board-am3517evm.c | 113 +++++++++---- > arch/arm/mach-omap2/board-cm-t35.c | 100 +++++++---- > arch/arm/mach-omap2/board-devkit8000.c | 96 +++++++---- > arch/arm/mach-omap2/board-h4.c | 48 ++++-- > arch/arm/mach-omap2/board-igep0020.c | 36 ++-- > arch/arm/mach-omap2/board-ldp.c | 68 +++++--- > arch/arm/mach-omap2/board-omap3beagle.c | 56 +++--- > arch/arm/mach-omap2/board-omap3evm.c | 87 ++++++---- > arch/arm/mach-omap2/board-omap3pandora.c | 48 +++--- > arch/arm/mach-omap2/board-omap3stalker.c | 61 ++++--- > arch/arm/mach-omap2/board-overo.c | 160 +++++++++++------- > arch/arm/mach-omap2/board-rx51-peripherals.c | 12 ++ > arch/arm/mach-omap2/board-rx51-video.c | 35 ++-- > arch/arm/mach-omap2/board-zoom-display.c | 30 ++-- > arch/arm/mach-omap2/dss-common.c | 244 ++++++++++++--------------- > arch/arm/mach-omap2/dss-common.h | 2 - > 19 files changed, 787 insertions(+), 561 deletions(-) >
On 29/08/13 09:19, Tony Lindgren wrote: > * Tomi Valkeinen <tomi.valkeinen@ti.com> [130828 00:59]: >> Hi, >> >> Here's a pull request for the board file changes to take the new display >> drivers into use. > > OK great. > >> If there's an "early" pull request going to Linus during the merge window, it'd >> be nice to have these in that request. That would give me time to send a pull >> request to Linus containing removal of the old, no longer used, drivers. > > Nice to see that this is not conflicting with anything in linux next :) Did you add the series to your for-next branch? > I suggest you keep this branch immutable in case it need to be merged to arm-soc > tree, and merge it yourself along with the DSS patches. That way you I do feel a bit uneasy with merging lots of arch changes via fbdev tree, but yes, I guess I can do that. Is that an "ack" from you for all the patches? If I do merge it via fbdev, I want to have at least acked-by in the commits. If that was an ack, I'll add them, but it means I need to update the branch. > don't have a dependency to arm-soc for removal of the old drivers. The dependency is run-time dependency, so the removal series does not need to be based on this. As long as this series is merged first, things should work. Tomi
* Tomi Valkeinen <tomi.valkeinen@ti.com> [130828 23:33]: > On 29/08/13 09:19, Tony Lindgren wrote: > > * Tomi Valkeinen <tomi.valkeinen@ti.com> [130828 00:59]: > >> Hi, > >> > >> Here's a pull request for the board file changes to take the new display > >> drivers into use. > > > > OK great. > > > >> If there's an "early" pull request going to Linus during the merge window, it'd > >> be nice to have these in that request. That would give me time to send a pull > >> request to Linus containing removal of the old, no longer used, drivers. > > > > Nice to see that this is not conflicting with anything in linux next :) > > Did you add the series to your for-next branch? No, I don't currently have for-next branch as it's done via arm-soc. But I did a test merge with both linux next and arm-soc for-next branches plus all the pending branches I have and did not see any conflicts. > > I suggest you keep this branch immutable in case it need to be merged to arm-soc > > tree, and merge it yourself along with the DSS patches. That way you > > I do feel a bit uneasy with merging lots of arch changes via fbdev tree, > but yes, I guess I can do that. Is that an "ack" from you for all the > patches? If I do merge it via fbdev, I want to have at least acked-by in > the commits. If that was an ack, I'll add them, but it means I need to > update the branch. I would not start messing with the patches at this point to add acks as then your branch is no longer immutable. If you prefer, then it's best that Kevin and Olof merge take this pull request directly. > > don't have a dependency to arm-soc for removal of the old drivers. > > The dependency is run-time dependency, so the removal series does not > need to be based on this. As long as this series is merged first, things > should work. OK, that's good. The only issue is that we're pretty much out of time right now for v3.12 merge window. Regards, Tony
On 29/08/13 09:35, Tony Lindgren wrote: > * Tomi Valkeinen <tomi.valkeinen@ti.com> [130828 23:33]: >> On 29/08/13 09:19, Tony Lindgren wrote: >>> * Tomi Valkeinen <tomi.valkeinen@ti.com> [130828 00:59]: >>> I suggest you keep this branch immutable in case it need to be merged to arm-soc >>> tree, and merge it yourself along with the DSS patches. That way you >> >> I do feel a bit uneasy with merging lots of arch changes via fbdev tree, >> but yes, I guess I can do that. Is that an "ack" from you for all the >> patches? If I do merge it via fbdev, I want to have at least acked-by in >> the commits. If that was an ack, I'll add them, but it means I need to >> update the branch. > > I would not start messing with the patches at this point to add acks > as then your branch is no longer immutable. If you prefer, then it's > best that Kevin and Olof merge take this pull request directly. Well, the branch was just created yesterday anyway, as I rebased on -rc6 as you requested. I created a new branch with acks, 3.12/linux-omap-acked. I'll keep the old branch in place. >>> don't have a dependency to arm-soc for removal of the old drivers. >> >> The dependency is run-time dependency, so the removal series does not >> need to be based on this. As long as this series is merged first, things >> should work. > > OK, that's good. The only issue is that we're pretty much out of time > right now for v3.12 merge window. Yep. Well, maybe it's easier if I try to merge this via fbdev. The problem there is that the fbdev maintainer has been inactive more or less for the whole summer, so how the pull requests will be managed is a bit unclear. But my guess is that I will be handling fbdev, which makes merging this series via fbdev easier. Tomi
* Tomi Valkeinen <tomi.valkeinen@ti.com> [130829 00:05]: > On 29/08/13 09:35, Tony Lindgren wrote: > > * Tomi Valkeinen <tomi.valkeinen@ti.com> [130828 23:33]: > >> On 29/08/13 09:19, Tony Lindgren wrote: > >>> * Tomi Valkeinen <tomi.valkeinen@ti.com> [130828 00:59]: > > >>> I suggest you keep this branch immutable in case it need to be merged to arm-soc > >>> tree, and merge it yourself along with the DSS patches. That way you > >> > >> I do feel a bit uneasy with merging lots of arch changes via fbdev tree, > >> but yes, I guess I can do that. Is that an "ack" from you for all the > >> patches? If I do merge it via fbdev, I want to have at least acked-by in > >> the commits. If that was an ack, I'll add them, but it means I need to > >> update the branch. > > > > I would not start messing with the patches at this point to add acks > > as then your branch is no longer immutable. If you prefer, then it's > > best that Kevin and Olof merge take this pull request directly. > > Well, the branch was just created yesterday anyway, as I rebased on -rc6 > as you requested. > > I created a new branch with acks, 3.12/linux-omap-acked. I'll keep the > old branch in place. Oh OK, please remove the old branch ASAP so Kevin or Olof won't accidentally pulls it! > >>> don't have a dependency to arm-soc for removal of the old drivers. > >> > >> The dependency is run-time dependency, so the removal series does not > >> need to be based on this. As long as this series is merged first, things > >> should work. > > > > OK, that's good. The only issue is that we're pretty much out of time > > right now for v3.12 merge window. > > Yep. Well, maybe it's easier if I try to merge this via fbdev. The > problem there is that the fbdev maintainer has been inactive more or > less for the whole summer, so how the pull requests will be managed is a > bit unclear. But my guess is that I will be handling fbdev, which makes > merging this series via fbdev easier. Sounds good to me. Regards, Tony
Hi, Here's a pull request for the board file changes to take the new display drivers into use. If there's an "early" pull request going to Linus during the merge window, it'd be nice to have these in that request. That would give me time to send a pull request to Linus containing removal of the old, no longer used, drivers. Tomi The following changes since commit b36f4be3de1b123d8601de062e7dbfc904f305fb: Linux 3.11-rc6 (2013-08-18 14:36:53 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git 3.12/linux-omap for you to fetch changes up to d7b8eafbf513e414fa09dde61630b93be93a23a1: ARM: OMAP2+: Remove old display drivers from omap2plus_defconfig (2013-08-28 10:23:22 +0300) ---------------------------------------------------------------- Tomi Valkeinen (20): ARM: OMAP2+: Remove legacy DSS initialization for omap4 ARM: OMAP2+: Add selected display drivers to omap2plus_defconfig ARM: OMAP: dss-common: use new display drivers ARM: OMAP: 4430SDP: remove picodlp device data ARM: OMAP: overo: use new display drivers ARM: OMAP: rx51: use new display drivers ARM: OMAP: beagle: use new display drivers ARM: OMAP: devkit8000: use new display drivers ARM: OMAP: 2430SDP: use new display drivers ARM: OMAP: LDP: use new display drivers ARM: OMAP: omap3stalker: use new display drivers ARM: OMAP: igep0020: use new display drivers ARM: OMAP: cm-t35: use new display drivers ARM: OMAP: H4: use new display drivers ARM: OMAP: 3430SDP: use new display drivers ARM: OMAP: OMAP3EVM: use new display drivers ARM: OMAP: Pandora: use new display drivers ARM: OMAP: Zoom: use new display drivers ARM: OMAP: AM3517EVM: use new display drivers ARM: OMAP2+: Remove old display drivers from omap2plus_defconfig arch/arm/configs/omap2plus_defconfig | 12 +- arch/arm/mach-omap2/board-2430sdp.c | 57 ++++--- arch/arm/mach-omap2/board-3430sdp.c | 83 +++++---- arch/arm/mach-omap2/board-am3517evm.c | 113 +++++++++---- arch/arm/mach-omap2/board-cm-t35.c | 100 +++++++---- arch/arm/mach-omap2/board-devkit8000.c | 96 +++++++---- arch/arm/mach-omap2/board-h4.c | 48 ++++-- arch/arm/mach-omap2/board-igep0020.c | 36 ++-- arch/arm/mach-omap2/board-ldp.c | 68 +++++--- arch/arm/mach-omap2/board-omap3beagle.c | 56 +++--- arch/arm/mach-omap2/board-omap3evm.c | 87 ++++++---- arch/arm/mach-omap2/board-omap3pandora.c | 48 +++--- arch/arm/mach-omap2/board-omap3stalker.c | 61 ++++--- arch/arm/mach-omap2/board-overo.c | 160 +++++++++++------- arch/arm/mach-omap2/board-rx51-peripherals.c | 12 ++ arch/arm/mach-omap2/board-rx51-video.c | 35 ++-- arch/arm/mach-omap2/board-zoom-display.c | 30 ++-- arch/arm/mach-omap2/dss-common.c | 244 ++++++++++++--------------- arch/arm/mach-omap2/dss-common.h | 2 - 19 files changed, 787 insertions(+), 561 deletions(-)