[RESEND] [PATCHv2 0/5] wl1251 device tree support
Hi John, The following patchset adds device tree support to the spi variant of the wl1251 driver, which is used in the Nokia N900. Tony requested, that you take the whole series even if that may introduce merge conflicts: > Sebastian, please resend the whole series to John and feel free to add my > acks. It's best that John picks them all up, otherwise we'll have the same > issue for v3.15. It seems that we should have just taken the merge conflict > rather than going back and forth with this. -- Sebastian Luciano Coelho (1): wl1251: split wl251 platform data to a separate structure Sebastian Reichel (4): wl1251: move power GPIO handling into the driver wl1251: spi: add vio regulator support wl1251: spi: add device tree support Documentation: dt: wireless: Add wl1251 .../devicetree/bindings/net/wireless/ti,wl1251.txt | 39 arch/arm/mach-omap2/board-omap3pandora.c | 6 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 13 +--- drivers/net/wireless/ti/wilink_platform_data.c | 37 +-- drivers/net/wireless/ti/wl1251/sdio.c | 31 +++--- drivers/net/wireless/ti/wl1251/spi.c | 71 -- drivers/net/wireless/ti/wl1251/wl1251.h| 4 +- include/linux/wl12xx.h | 24 +++- 8 files changed, 176 insertions(+), 49 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt -- 1.8.5.3 -- 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: [PATCHv2 0/5] wl1251 device tree support
* John W. Linville [140124 16:03]: > On Fri, Jan 24, 2014 at 10:53:22PM +0100, Sebastian Reichel wrote: > > On Sat, Jan 18, 2014 at 09:47:06AM -0800, Tony Lindgren wrote: > > > [...] > > > > > > The reason was for keeping things building and git bisect working. > > > > > > I do have wl1251-pdata-signed as the base for branch > > > omap-for-v3.14/omap3-board-removal. However the board removal was > > > considered too early for v3.14, so that's been postponed. This is > > > because people are still updating their systems to device tree > > > based booting. So I can redo my omap-for-v3.14/omap3-board-removal > > > against v3.14. > > > > > > So if you want to, feel free to pick all the wl12xx patches to your > > > wireless tree. AFAIK my omap-for-v3.14/omap3-board-removal is the > > > only other user for those patches, and that I can redo that on > > > v3.14. > > > > > > So for the arch/arm/*omap* touching patches, feel free to add: > > > > > > Acked-by: Tony Lindgren > > > > Another ping. If this does not go into 3.14 via wireless tree > > it will become complicated for 3.15 again. > > It's too late for new networking features in 3.14. Why wouldn't Tony > send it via his tree? It's mostly drivers/net/wireless related to patch the wl12xx driver further. > At any rate, I don't have the patches. If you still want them through > the wireless tree (for 3.15) then you'll need to resend them. Sebastian, please resend the whole series to John and feel free to add my acks. It's best that John picks them all up, otherwise we'll have the same issue for v3.15. It seems that we should have just taken the merge conflict rather than going back and forth with this. Cheers, 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: [PATCHv2 0/5] wl1251 device tree support
On Fri, Jan 24, 2014 at 10:53:22PM +0100, Sebastian Reichel wrote: > On Sat, Jan 18, 2014 at 09:47:06AM -0800, Tony Lindgren wrote: > > [...] > > > > The reason was for keeping things building and git bisect working. > > > > I do have wl1251-pdata-signed as the base for branch > > omap-for-v3.14/omap3-board-removal. However the board removal was > > considered too early for v3.14, so that's been postponed. This is > > because people are still updating their systems to device tree > > based booting. So I can redo my omap-for-v3.14/omap3-board-removal > > against v3.14. > > > > So if you want to, feel free to pick all the wl12xx patches to your > > wireless tree. AFAIK my omap-for-v3.14/omap3-board-removal is the > > only other user for those patches, and that I can redo that on > > v3.14. > > > > So for the arch/arm/*omap* touching patches, feel free to add: > > > > Acked-by: Tony Lindgren > > Another ping. If this does not go into 3.14 via wireless tree > it will become complicated for 3.15 again. It's too late for new networking features in 3.14. Why wouldn't Tony send it via his tree? At any rate, I don't have the patches. If you still want them through the wireless tree (for 3.15) then you'll need to resend them. John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- 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: [PATCHv2 0/5] wl1251 device tree support
On Sat, Jan 18, 2014 at 09:47:06AM -0800, Tony Lindgren wrote: > [...] > > The reason was for keeping things building and git bisect working. > > I do have wl1251-pdata-signed as the base for branch > omap-for-v3.14/omap3-board-removal. However the board removal was > considered too early for v3.14, so that's been postponed. This is > because people are still updating their systems to device tree > based booting. So I can redo my omap-for-v3.14/omap3-board-removal > against v3.14. > > So if you want to, feel free to pick all the wl12xx patches to your > wireless tree. AFAIK my omap-for-v3.14/omap3-board-removal is the > only other user for those patches, and that I can redo that on > v3.14. > > So for the arch/arm/*omap* touching patches, feel free to add: > > Acked-by: Tony Lindgren Another ping. If this does not go into 3.14 via wireless tree it will become complicated for 3.15 again. -- Sebastian signature.asc Description: Digital signature
Re: [PATCHv2 0/5] wl1251 device tree support
* John W. Linville [140117 11:32]: > On Fri, Jan 17, 2014 at 09:44:16AM -0800, Tony Lindgren wrote: > > * John W. Linville [140117 07:17]: > > > On Fri, Jan 17, 2014 at 02:45:15AM +0100, Sebastian Reichel wrote: > > > > On Mon, Jan 06, 2014 at 11:57:09PM +0100, Sebastian Reichel wrote: > > > > > Hi John, > > > > > > > > > > > The following patchset adds device tree support to > > > > > > the spi variant of the wl1251 driver. > > > > > > > > > > > > Luciano Coelho (1): > > > > > > wl1251: split wl251 platform data to a separate structure > > > > > > > > > > > > Sebastian Reichel (4): > > > > > > wl1251: move power GPIO handling into the driver > > > > > > wl1251: spi: add vio regulator support > > > > > > wl1251: spi: add device tree support > > > > > > Documentation: dt: wireless: Add wl1251 > > > > > > > > > > What's the status of this patchset? Tony prepared an immutable > > > > > branch for patches 1+2 [0]. I think the other patches are also ok > > > > > (at least there were no more complains from the DT binding > > > > > maintainers). It would be nice to have wl1251 DT support in 3.14. > > > > > > > > > > [0] http://www.spinics.net/lists/linux-omap/msg101165.html > > > > > > > > > > -- Sebastian > > > > > > > > ping? I can't see it on wireless-next. > > > > > > I can't pull it because the branch is based on a later source than > > > that of wireless-next. > > > > Hmm I thought v3.13-rc1 was the base we agreed on the immutable branch. > > Care to explain what the issue is merging it in? > > I think I was clear -- "the branch is based on a later source than > that of wireless-next". OK so it's the.. > > AFAIK merging it fast forwards your branch to v3.13-rc1 and then > > you just need to do the pull request against v3.13-rc1. > > It's not a forward, it's a merge. And I don't want to do that in > the wireless-next tree right now. ..merge part that you have problem. Fine with me. > Are you sending that branch for 3.14? Is there some reason that I > have to have it in wireless-next? The reason was for keeping things building and git bisect working. I do have wl1251-pdata-signed as the base for branch omap-for-v3.14/omap3-board-removal. However the board removal was considered too early for v3.14, so that's been postponed. This is because people are still updating their systems to device tree based booting. So I can redo my omap-for-v3.14/omap3-board-removal against v3.14. So if you want to, feel free to pick all the wl12xx patches to your wireless tree. AFAIK my omap-for-v3.14/omap3-board-removal is the only other user for those patches, and that I can redo that on v3.14. So for the arch/arm/*omap* touching patches, feel free to add: Acked-by: Tony Lindgren -- 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: [PATCHv2 0/5] wl1251 device tree support
On Fri, Jan 17, 2014 at 09:44:16AM -0800, Tony Lindgren wrote: > * John W. Linville [140117 07:17]: > > On Fri, Jan 17, 2014 at 02:45:15AM +0100, Sebastian Reichel wrote: > > > On Mon, Jan 06, 2014 at 11:57:09PM +0100, Sebastian Reichel wrote: > > > > Hi John, > > > > > > > > > The following patchset adds device tree support to > > > > > the spi variant of the wl1251 driver. > > > > > > > > > > Luciano Coelho (1): > > > > > wl1251: split wl251 platform data to a separate structure > > > > > > > > > > Sebastian Reichel (4): > > > > > wl1251: move power GPIO handling into the driver > > > > > wl1251: spi: add vio regulator support > > > > > wl1251: spi: add device tree support > > > > > Documentation: dt: wireless: Add wl1251 > > > > > > > > What's the status of this patchset? Tony prepared an immutable > > > > branch for patches 1+2 [0]. I think the other patches are also ok > > > > (at least there were no more complains from the DT binding > > > > maintainers). It would be nice to have wl1251 DT support in 3.14. > > > > > > > > [0] http://www.spinics.net/lists/linux-omap/msg101165.html > > > > > > > > -- Sebastian > > > > > > ping? I can't see it on wireless-next. > > > > I can't pull it because the branch is based on a later source than > > that of wireless-next. > > Hmm I thought v3.13-rc1 was the base we agreed on the immutable branch. > Care to explain what the issue is merging it in? I think I was clear -- "the branch is based on a later source than that of wireless-next". > AFAIK merging it fast forwards your branch to v3.13-rc1 and then > you just need to do the pull request against v3.13-rc1. It's not a forward, it's a merge. And I don't want to do that in the wireless-next tree right now. Are you sending that branch for 3.14? Is there some reason that I have to have it in wireless-next? John -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- 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: [PATCHv2 0/5] wl1251 device tree support
* John W. Linville [140117 07:17]: > On Fri, Jan 17, 2014 at 02:45:15AM +0100, Sebastian Reichel wrote: > > On Mon, Jan 06, 2014 at 11:57:09PM +0100, Sebastian Reichel wrote: > > > Hi John, > > > > > > > The following patchset adds device tree support to > > > > the spi variant of the wl1251 driver. > > > > > > > > Luciano Coelho (1): > > > > wl1251: split wl251 platform data to a separate structure > > > > > > > > Sebastian Reichel (4): > > > > wl1251: move power GPIO handling into the driver > > > > wl1251: spi: add vio regulator support > > > > wl1251: spi: add device tree support > > > > Documentation: dt: wireless: Add wl1251 > > > > > > What's the status of this patchset? Tony prepared an immutable > > > branch for patches 1+2 [0]. I think the other patches are also ok > > > (at least there were no more complains from the DT binding > > > maintainers). It would be nice to have wl1251 DT support in 3.14. > > > > > > [0] http://www.spinics.net/lists/linux-omap/msg101165.html > > > > > > -- Sebastian > > > > ping? I can't see it on wireless-next. > > I can't pull it because the branch is based on a later source than > that of wireless-next. Hmm I thought v3.13-rc1 was the base we agreed on the immutable branch. Care to explain what the issue is merging it in? AFAIK merging it fast forwards your branch to v3.13-rc1 and then you just need to do the pull request against v3.13-rc1. 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: [PATCHv2 0/5] wl1251 device tree support
On Fri, Jan 17, 2014 at 02:45:15AM +0100, Sebastian Reichel wrote: > On Mon, Jan 06, 2014 at 11:57:09PM +0100, Sebastian Reichel wrote: > > Hi John, > > > > > The following patchset adds device tree support to > > > the spi variant of the wl1251 driver. > > > > > > Luciano Coelho (1): > > > wl1251: split wl251 platform data to a separate structure > > > > > > Sebastian Reichel (4): > > > wl1251: move power GPIO handling into the driver > > > wl1251: spi: add vio regulator support > > > wl1251: spi: add device tree support > > > Documentation: dt: wireless: Add wl1251 > > > > What's the status of this patchset? Tony prepared an immutable > > branch for patches 1+2 [0]. I think the other patches are also ok > > (at least there were no more complains from the DT binding > > maintainers). It would be nice to have wl1251 DT support in 3.14. > > > > [0] http://www.spinics.net/lists/linux-omap/msg101165.html > > > > -- Sebastian > > ping? I can't see it on wireless-next. I can't pull it because the branch is based on a later source than that of wireless-next. -- John W. LinvilleSomeday the world will need a hero, and you linvi...@tuxdriver.com might be all we have. Be ready. -- 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: [PATCHv2 0/5] wl1251 device tree support
On Mon, Jan 06, 2014 at 11:57:09PM +0100, Sebastian Reichel wrote: > Hi John, > > > The following patchset adds device tree support to > > the spi variant of the wl1251 driver. > > > > Luciano Coelho (1): > > wl1251: split wl251 platform data to a separate structure > > > > Sebastian Reichel (4): > > wl1251: move power GPIO handling into the driver > > wl1251: spi: add vio regulator support > > wl1251: spi: add device tree support > > Documentation: dt: wireless: Add wl1251 > > What's the status of this patchset? Tony prepared an immutable > branch for patches 1+2 [0]. I think the other patches are also ok > (at least there were no more complains from the DT binding > maintainers). It would be nice to have wl1251 DT support in 3.14. > > [0] http://www.spinics.net/lists/linux-omap/msg101165.html > > -- Sebastian ping? I can't see it on wireless-next. -- Sebastian signature.asc Description: Digital signature
Re: [PATCHv2 0/5] wl1251 device tree support
Hi John, > The following patchset adds device tree support to > the spi variant of the wl1251 driver. > > Luciano Coelho (1): > wl1251: split wl251 platform data to a separate structure > > Sebastian Reichel (4): > wl1251: move power GPIO handling into the driver > wl1251: spi: add vio regulator support > wl1251: spi: add device tree support > Documentation: dt: wireless: Add wl1251 What's the status of this patchset? Tony prepared an immutable branch for patches 1+2 [0]. I think the other patches are also ok (at least there were no more complains from the DT binding maintainers). It would be nice to have wl1251 DT support in 3.14. [0] http://www.spinics.net/lists/linux-omap/msg101165.html -- Sebastian signature.asc Description: Digital signature
[PATCHv2 0/5] wl1251 device tree support
Hi, The following patchset adds device tree support to the spi variant of the wl1251 driver. Changes since v1 [0]: * Added some Reviewed-By: Pavel Machek * Splitted DT binding documentation into its own patch * Added ti, prefix to power-gpio * Renamed ti,use-eeprom to ti,wl1251-has-eeprom * Updated description for ti,wl1251-has-eeprom * Removed boardcode update from regulator patch to avoid useless merge conflicts (all relevant boardcode will be removed in 3.14). [0] https://lkml.org/lkml/2013/10/27/112 -- Sebastian Luciano Coelho (1): wl1251: split wl251 platform data to a separate structure Sebastian Reichel (4): wl1251: move power GPIO handling into the driver wl1251: spi: add vio regulator support wl1251: spi: add device tree support Documentation: dt: wireless: Add wl1251 .../devicetree/bindings/net/wireless/ti,wl1251.txt | 39 arch/arm/mach-omap2/board-omap3pandora.c | 6 +- arch/arm/mach-omap2/board-rx51-peripherals.c | 13 +--- drivers/net/wireless/ti/wilink_platform_data.c | 37 +-- drivers/net/wireless/ti/wl1251/sdio.c | 31 +++--- drivers/net/wireless/ti/wl1251/spi.c | 71 -- drivers/net/wireless/ti/wl1251/wl1251.h| 4 +- include/linux/wl12xx.h | 24 +++- 8 files changed, 176 insertions(+), 49 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt -- 1.8.4.3 -- 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
