Reorganize R8A7779/Marzen USB code
v3 cover Reorganize R8A7779/Marzen USB code
Hello.
Here's the set of 9 patches against the Simon Horman's 'renesas.git' repo,
'renesas-next-20130410' tag. It was created to fix the shortcomings in the R8A7779/Marzen USB platform code and R8A7779 USB common PHY driver, and so spans both arch/arm/mach-shmobile/ and drivers/usb/ subtrees (some patches have to touch both subtrees). The patches were conceived with the complete bisectability goal in mind.
[1/9] ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code [2/9] ehci-platform: add pre_setup() method to platform data
[3/9] ARM: shmobile: R8A7779: setup EHCI internal buffer
[4/9] rcar-phy: remove EHCI internal buffer setup
[5/9] ARM: shmobile: R8A7779: remove USB PHY 2nd memory resource [6/9] rcar-phy: correct base address
[7/9] rcar-phy: add platform data
[8/9] ARM: shmobile: Marzen: pass platform data to USB PHY device [9/9] rcar-phy: handle platform data
I'm not sure thru which tree this patchset should be merged, however it turns
out that it's too late now to push it thru Felipe Balbi's USB tree for 3.10 (which would have been most convenient probably), and it's probably too late to merge thru Simon's tree for 3.10 too. So it now have to be postponed to 3.11, unfortunately...
WBR, Sergei
v3 cover Reorganize R8A7779/Marzen USB code
Quoted 19 lines · Sergei Shtylyov
Hello.
Here's the set of 9 patches against the Simon Horman's 'renesas.git' repo,
'renesas-next-20130410' tag. It was created to fix the shortcomings in the R8A7779/Marzen USB platform code and R8A7779 USB common PHY driver, and so spans botharch/arm/mach-shmobile/anddrivers/usb/subtrees (some patches have to touch both subtrees). The patches were conceived with the complete bisectability goal in mind.[1/9] ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code [2/9] ehci-platform: add
pre_setup()method to platform data
[3/9] ARM: shmobile: R8A7779: setup EHCI internal buffer
[4/9] rcar-phy: remove EHCI internal buffer setup
[5/9] ARM: shmobile: R8A7779: remove USB PHY 2nd memory resource [6/9] rcar-phy: correct base address
[7/9] rcar-phy: add platform data
[8/9] ARM: shmobile: Marzen: pass platform data to USB PHY device [9/9] rcar-phy: handle platform data
Quoted 5 lines
I'm not sure thru which tree this patchset should be merged, however it turns
out that it's too late now to push it thru Felipe Balbi's USB tree for 3.10 (which would have been most convenient probably), and it's probably too late to merge thru Simon's tree for 3.10 too. So it now have to be postponed to 3.11, unfortunately...
Felipe, how would you prefer to handle this? I'm happy for you to take it or to take it myself.
v3 cover Reorganize R8A7779/Marzen USB code
Hi,
Quoted 20 lines · Simon Horman
Quoted 19 lines · Sergei Shtylyov
Hello.
Here's the set of 9 patches against the Simon Horman's 'renesas.git' repo,
'renesas-next-20130410' tag. It was created to fix the shortcomings in the R8A7779/Marzen USB platform code and R8A7779 USB common PHY driver, and so spans botharch/arm/mach-shmobile/anddrivers/usb/subtrees (some patches have to touch both subtrees). The patches were conceived with the complete bisectability goal in mind.[1/9] ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code [2/9] ehci-platform: add
pre_setup()method to platform data
[3/9] ARM: shmobile: R8A7779: setup EHCI internal buffer
[4/9] rcar-phy: remove EHCI internal buffer setup
[5/9] ARM: shmobile: R8A7779: remove USB PHY 2nd memory resource [6/9] rcar-phy: correct base address
[7/9] rcar-phy: add platform data
[8/9] ARM: shmobile: Marzen: pass platform data to USB PHY device [9/9] rcar-phy: handle platform data
Quoted 8 lines
Quoted 5 lines
I'm not sure thru which tree this patchset should be merged, however it turns
out that it's too late now to push it thru Felipe Balbi's USB tree for 3.10 (which would have been most convenient probably), and it's probably too late to merge thru Simon's tree for 3.10 too. So it now have to be postponed to 3.11, unfortunately...Felipe, how would you prefer to handle this? I'm happy for you to take it or to take it myself.
please take it yourself, just keep in mind there will be conflicts, I will go over the patches now and give my Acked-by so you can queue them up.
cheers
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130410/70dc1ec8/attachment.sig>
v3 cover Reorganize R8A7779/Marzen USB code
Quoted 29 lines · Felipe Balbi
Hi,
Quoted 26 lines · Simon Horman
Quoted 24 lines · Sergei Shtylyov
Hello.
Here's the set of 9 patches against the Simon Horman's 'renesas.git' repo,
'renesas-next-20130410' tag. It was created to fix the shortcomings in the R8A7779/Marzen USB platform code and R8A7779 USB common PHY driver, and so spans botharch/arm/mach-shmobile/anddrivers/usb/subtrees (some patches have to touch both subtrees). The patches were conceived with the complete bisectability goal in mind.[1/9] ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code [2/9] ehci-platform: add
pre_setup()method to platform data
[3/9] ARM: shmobile: R8A7779: setup EHCI internal buffer
[4/9] rcar-phy: remove EHCI internal buffer setup
[5/9] ARM: shmobile: R8A7779: remove USB PHY 2nd memory resource [6/9] rcar-phy: correct base address
[7/9] rcar-phy: add platform data
[8/9] ARM: shmobile: Marzen: pass platform data to USB PHY device [9/9] rcar-phy: handle platform dataI'm not sure thru which tree this patchset should be merged, however it turns
out that it's too late now to push it thru Felipe Balbi's USB tree for 3.10 (which would have been most convenient probably), and it's probably too late to merge thru Simon's tree for 3.10 too. So it now have to be postponed to 3.11, unfortunately...
Quoted 6 lines
Quoted 2 lines
Felipe, how would you prefer to handle this? I'm happy for you to take it or to take it myself.
please take it yourself, just keep in mind there will be conflicts, I will go over the patches now and give my Acked-by so you can queue them up.
Thanks
v3 cover Reorganize R8A7779/Marzen USB code
Quoted 30 lines · Simon Horman
Quoted 29 lines · Felipe Balbi
Hi,
Quoted 26 lines · Simon Horman
Quoted 24 lines · Sergei Shtylyov
Hello.
Here's the set of 9 patches against the Simon Horman's 'renesas.git' repo,
'renesas-next-20130410' tag. It was created to fix the shortcomings in the R8A7779/Marzen USB platform code and R8A7779 USB common PHY driver, and so spans botharch/arm/mach-shmobile/anddrivers/usb/subtrees (some patches have to touch both subtrees). The patches were conceived with the complete bisectability goal in mind.[1/9] ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code [2/9] ehci-platform: add
pre_setup()method to platform data
[3/9] ARM: shmobile: R8A7779: setup EHCI internal buffer
[4/9] rcar-phy: remove EHCI internal buffer setup
[5/9] ARM: shmobile: R8A7779: remove USB PHY 2nd memory resource [6/9] rcar-phy: correct base address
[7/9] rcar-phy: add platform data
[8/9] ARM: shmobile: Marzen: pass platform data to USB PHY device [9/9] rcar-phy: handle platform dataI'm not sure thru which tree this patchset should be merged, however it turns
out that it's too late now to push it thru Felipe Balbi's USB tree for 3.10 (which would have been most convenient probably), and it's probably too late to merge thru Simon's tree for 3.10 too. So it now have to be postponed to 3.11, unfortunately...
Quoted 8 lines
Quoted 6 lines
Quoted 2 lines
Felipe, how would you prefer to handle this? I'm happy for you to take it or to take it myself.
please take it yourself, just keep in mind there will be conflicts, I will go over the patches now and give my Acked-by so you can queue them up.
Thanks
Sergei, it looks like patches 1-7 are clear.
Do you want me to start queueing them up.
Or would you rather wait for the issue with patch 6 to be resolved?
v3 cover Reorganize R8A7779/Marzen USB code
Hello.
Quoted 26 lines · Simon Horman
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 17 lines
Here's the set of 9 patches against the Simon Horman's 'renesas.git' repo,
'renesas-next-20130410' tag. It was created to fix the shortcomings in the R8A7779/Marzen USB platform code and R8A7779 USB common PHY driver, and so spans botharch/arm/mach-shmobile/anddrivers/usb/subtrees (some patches have to touch both subtrees). The patches were conceived with the complete bisectability goal in mind.[1/9] ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code [2/9] ehci-platform: add
pre_setup()method to platform data
[3/9] ARM: shmobile: R8A7779: setup EHCI internal buffer
[4/9] rcar-phy: remove EHCI internal buffer setup
[5/9] ARM: shmobile: R8A7779: remove USB PHY 2nd memory resource [6/9] rcar-phy: correct base address
[7/9] rcar-phy: add platform data
[8/9] ARM: shmobile: Marzen: pass platform data to USB PHY device [9/9] rcar-phy: handle platform dataQuoted 5 lines
I'm not sure thru which tree this patchset should be merged, however it turns
out that it's too late now to push it thru Felipe Balbi's USB tree for 3.10 (which would have been most convenient probably), and it's probably too late to merge thru Simon's tree for 3.10 too. So it now have to be postponed to 3.11, unfortunately...Felipe, how would you prefer to handle this? I'm happy for you to take it or to take it myself.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
please take it yourself, just keep in mind there will be conflicts, I will go over the patches now and give my Acked-by so you can queue them up.
Thanks
Sergei, it looks like patches 1-7 are clear.
#7 & #9 have been refused by Felipe (hence #8 isn't good too).
Quoted 1 line
Do you want me to start queueing them up.
I was going to repost the whole series soon, adding ACK from Alan to the
patch #2 and resolving issues with patches #7..#9. It's worth waiting for that to happen I think.
Quoted 1 line
Or would you rather wait for the issue with patch 6 to be resolved?
There's no special issue with patch #6 other than the PHY driver files
being renamed in Felipe's tree -- but that concerns all patches touching drivers/usb/phy/rcar-phy.c (some of which precede #6).
I don't know how the rename conflict will be handled (this is really bad
coincidence), perhaps I still should have done this patchset against Felipe's 'next' branch and pushed it thru his tree. If the patches will be queued for 3.11 anyway, maybe it's worth doing that -- I'm still of the opinion that his tree would be the one most fitting for this patchset.
WBR, Sergei
v3 cover Reorganize R8A7779/Marzen USB code
Hi,
Quoted 48 lines · Sergei Shtylyov
Hello.
Quoted 26 lines · Simon Horman
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 17 lines
Here's the set of 9 patches against the Simon Horman's 'renesas.git' repo,
'renesas-next-20130410' tag. It was created to fix the shortcomings in the R8A7779/Marzen USB platform code and R8A7779 USB common PHY driver, and so spans botharch/arm/mach-shmobile/anddrivers/usb/subtrees (some patches have to touch both subtrees). The patches were conceived with the complete bisectability goal in mind.[1/9] ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code [2/9] ehci-platform: add
pre_setup()method to platform data
[3/9] ARM: shmobile: R8A7779: setup EHCI internal buffer
[4/9] rcar-phy: remove EHCI internal buffer setup
[5/9] ARM: shmobile: R8A7779: remove USB PHY 2nd memory resource [6/9] rcar-phy: correct base address
[7/9] rcar-phy: add platform data
[8/9] ARM: shmobile: Marzen: pass platform data to USB PHY device [9/9] rcar-phy: handle platform dataQuoted 5 lines
I'm not sure thru which tree this patchset should be merged, however it turns
out that it's too late now to push it thru Felipe Balbi's USB tree for 3.10 (which would have been most convenient probably), and it's probably too late to merge thru Simon's tree for 3.10 too. So it now have to be postponed to 3.11, unfortunately...Felipe, how would you prefer to handle this? I'm happy for you to take it or to take it myself.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
please take it yourself, just keep in mind there will be conflicts, I will go over the patches now and give my Acked-by so you can queue them up.
Thanks
Sergei, it looks like patches 1-7 are clear.
#7 & #9 have been refused by Felipe (hence #8 isn't good too).
Quoted 1 line
Do you want me to start queueing them up.
I was going to repost the whole series soon, adding ACK from Alan
to the patch #2 and resolving issues with patches #7..#9. It's worth waiting for that to happen I think.Quoted 1 line
Or would you rather wait for the issue with patch 6 to be resolved?
Quoted 9 lines
There's no special issue with patch #6 other than the PHY driver
files being renamed in Felipe's tree -- but that concerns all patches touchingdrivers/usb/phy/rcar-phy.c(some of which precede #6).
I don't know how the rename conflict will be handled (this is
really bad coincidence), perhaps I still should have done this patchset against Felipe's 'next' branch and pushed it thru his tree. If the patches will be queued for 3.11 anyway, maybe it's worth doing that -- I'm still of the opinion that his tree would be the one most fitting for this patchset.
git can handle renames well, don't worry. Conflict will be easy to resolve.
Signature · 8 lines
balbi -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130411/0702ce2d/attachment.sig>
v3 cover Reorganize R8A7779/Marzen USB code
Hello.
Quoted 54 lines · Felipe Balbi
Quoted 44 lines
Quoted 26 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 17 lines
Here's the set of 9 patches against the Simon Horman's 'renesas.git' repo,
'renesas-next-20130410' tag. It was created to fix the shortcomings in the R8A7779/Marzen USB platform code and R8A7779 USB common PHY driver, and so spans botharch/arm/mach-shmobile/anddrivers/usb/subtrees (some patches have to touch both subtrees). The patches were conceived with the complete bisectability goal in mind.[1/9] ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code [2/9] ehci-platform: add
pre_setup()method to platform data
[3/9] ARM: shmobile: R8A7779: setup EHCI internal buffer
[4/9] rcar-phy: remove EHCI internal buffer setup
[5/9] ARM: shmobile: R8A7779: remove USB PHY 2nd memory resource [6/9] rcar-phy: correct base address
[7/9] rcar-phy: add platform data
[8/9] ARM: shmobile: Marzen: pass platform data to USB PHY device [9/9] rcar-phy: handle platform dataQuoted 5 lines
I'm not sure thru which tree this patchset should be merged, however it turns
out that it's too late now to push it thru Felipe Balbi's USB tree for 3.10 (which would have been most convenient probably), and it's probably too late to merge thru Simon's tree for 3.10 too. So it now have to be postponed to 3.11, unfortunately...Felipe, how would you prefer to handle this? I'm happy for you to take it or to take it myself.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
please take it yourself, just keep in mind there will be conflicts, I will go over the patches now and give my Acked-by so you can queue them up.
Thanks
Sergei, it looks like patches 1-7 are clear.
#7 & #9 have been refused by Felipe (hence #8 isn't good too).
Quoted 1 line
Do you want me to start queueing them up.
I was going to repost the whole series soon, adding ACK from Alan
to the patch #2 and resolving issues with patches #7..#9. It's worth waiting for that to happen I think.Quoted 1 line
Or would you rather wait for the issue with patch 6 to be resolved?
Quoted 9 lines
There's no special issue with patch #6 other than the PHY driver
files being renamed in Felipe's tree -- but that concerns all patches touchingdrivers/usb/phy/rcar-phy.c(some of which precede #6).
I don't know how the rename conflict will be handled (this is
really bad coincidence), perhaps I still should have done this patchset against Felipe's 'next' branch and pushed it thru his tree. If the patches will be queued for 3.11 anyway, maybe it's worth doing that -- I'm still of the opinion that his tree would be the one most fitting for this patchset.
Quoted 2 lines
git can handle renames well, don't worry. Conflict will be easy to resolve.
I'm adding a header file to include/linux/usb/ which now should probably
be renamed too, after the driver, to 'phy-rcar-usb.h'. I prbably should rename it now, in anticipation, or the one who would resolve the conflict, won't figure it out to do it. Or perhaps indeed patches #1..#6 can be merged now, and the rest postponed...
WBR, Sergei
v3 cover Reorganize R8A7779/Marzen USB code
In reply to Sergei ShtylyovQuoted 38 lines · Sergei Shtylyov
Hello.
Quoted 26 lines · Simon Horman
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 17 lines
Here's the set of 9 patches against the Simon Horman's 'renesas.git' repo,
'renesas-next-20130410' tag. It was created to fix the shortcomings in the R8A7779/Marzen USB platform code and R8A7779 USB common PHY driver, and so spans botharch/arm/mach-shmobile/anddrivers/usb/subtrees (some patches have to touch both subtrees). The patches were conceived with the complete bisectability goal in mind.[1/9] ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code [2/9] ehci-platform: add
pre_setup()method to platform data
[3/9] ARM: shmobile: R8A7779: setup EHCI internal buffer
[4/9] rcar-phy: remove EHCI internal buffer setup
[5/9] ARM: shmobile: R8A7779: remove USB PHY 2nd memory resource [6/9] rcar-phy: correct base address
[7/9] rcar-phy: add platform data
[8/9] ARM: shmobile: Marzen: pass platform data to USB PHY device [9/9] rcar-phy: handle platform dataQuoted 5 lines
I'm not sure thru which tree this patchset should be merged, however it turns
out that it's too late now to push it thru Felipe Balbi's USB tree for 3.10 (which would have been most convenient probably), and it's probably too late to merge thru Simon's tree for 3.10 too. So it now have to be postponed to 3.11, unfortunately...Felipe, how would you prefer to handle this? I'm happy for you to take it or to take it myself.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
please take it yourself, just keep in mind there will be conflicts, I will go over the patches now and give my Acked-by so you can queue them up.
Thanks
Sergei, it looks like patches 1-7 are clear.
Quoted 7 lines
#7 & #9 have been refused by Felipe (hence #8 isn't good too).
Quoted 1 line
Do you want me to start queueing them up.
I was going to repost the whole series soon, adding ACK from Alan
to the patch #2 and resolving issues with patches #7..#9. It's worth waiting for that to happen I think.
I am quite happy to wait.
One minor comment - there is no need to repost just to fix this - could you consider using lower-case for the socs for consistency with the common practice in patch subject lines.
e.g.: ARM: shmobile: r8a7779: setup EHCI
Quoted 6 lines
Quoted 1 line
Or would you rather wait for the issue with patch 6 to be resolved?
There's no special issue with patch #6 other than the PHY driver
files being renamed in Felipe's tree -- but that concerns all patches touchingdrivers/usb/phy/rcar-phy.c(some of which precede #6).
Sorry, I made an error. I meant #8 and in turn #9.
Quoted 6 lines
I don't know how the rename conflict will be handled (this is
really bad coincidence), perhaps I still should have done this patchset against Felipe's 'next' branch and pushed it thru his tree. If the patches will be queued for 3.11 anyway, maybe it's worth doing that -- I'm still of the opinion that his tree would be the one most fitting for this patchset.
It seems that git will handle it :)
v3 cover Reorganize R8A7779/Marzen USB code
Hello.
Quoted 25 lines · Simon Horman
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 20 lines
Quoted 12 lines
Here's the set of 9 patches against the Simon Horman's 'renesas.git' repo,
'renesas-next-20130410' tag. It was created to fix the shortcomings in the R8A7779/Marzen USB platform code and R8A7779 USB common PHY driver, and so spans botharch/arm/mach-shmobile/anddrivers/usb/subtrees (some patches have to touch both subtrees). The patches were conceived with the complete bisectability goal in mind.
[1/9] ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code [2/9] ehci-platform: addpre_setup()method to platform data
[3/9] ARM: shmobile: R8A7779: setup EHCI internal buffer
[4/9] rcar-phy: remove EHCI internal buffer setup
[5/9] ARM: shmobile: R8A7779: remove USB PHY 2nd memory resource [6/9] rcar-phy: correct base addressQuoted 8 lines
[7/9] rcar-phy: add platform data
[8/9] ARM: shmobile: Marzen: pass platform data to USB PHY device [9/9] rcar-phy: handle platform data
I'm not sure thru which tree this patchset should be merged, however it turns
out that it's too late now to push it thru Felipe Balbi's USB tree for 3.10 (which would have been most convenient probably), and it's probably too late to merge thru Simon's tree for 3.10 too. So it now have to be postponed to 3.11, unfortunately...Quoted 2 lines
Felipe, how would you prefer to handle this? I'm happy for you to take it or to take it myself.
please take it yourself, just keep in mind there will be conflicts, I will go over the patches now and give my Acked-by so you can queue them up.
Quoted 6 lines
Quoted 6 lines
Quoted 2 lines
Quoted 1 line
Thanks
Sergei, it looks like patches 1-7 are clear.
#7 & #9 have been refused by Felipe (hence #8 isn't good too).
Quoted 1 line
Do you want me to start queueing them up.
I was going to repost the whole series soon, adding ACK from Alan
It's not as soon as I had hoped but I hope I would be able to do it
in several hours...
Quoted 9 lines
Quoted 2 lines
to the patch #2 and resolving issues with patches #7..#9. It's worth waiting for that to happen I think.
I am quite happy to wait.
One minor comment - there is no need to repost just to fix this - could you consider using lower-case for the socs for consistency with the common practice in patch subject lines.
e.g.: ARM: shmobile: r8a7779: setup EHCI
Alright, although I have a kind of idiosyncrasy to lowercasing
otherwise
uppercase names.
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines
Or would you rather wait for the issue with patch 6 to be resolved?
There's no special issue with patch #6 other than the PHY driver
files being renamed in Felipe's tree -- but that concerns all patches touchingdrivers/usb/phy/rcar-phy.c(some of which precede #6).Sorry, I made an error. I meant #8 and in turn #9.
The issues start at patch #7 actually, where the platform data
represenation seemed inappropriate to Felipe.
Quoted 8 lines
Quoted 7 lines
I don't know how the rename conflict will be handled (this is
really bad coincidence), perhaps I still should have done this patchset against Felipe's 'next' branch and pushed it thru his tree. If the patches will be queued for 3.11 anyway, maybe it's worth doing that -- I'm still of the opinion that his tree would be the one most fitting for this patchset.It seems that git will handle it :)
Well, let's hope. There's still an issue with header file name it
wouldn't be able to handle but I'll probably leave it as is, as the other PHY files in include/linux/usb/ didn't get renamed in the big rename.
WBR, Sergei