On Thu, Mar 13, 2014 at 06:00:39PM +0100, Sebastian Reichel wrote: > Hi, > > On Wed, Feb 26, 2014 at 08:44:36PM +0100, Sebastian Reichel wrote: > > On Sat, Feb 15, 2014 at 12:05:51AM +0100, Sebastian Reichel wrote: > > > 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. > > > > ping! Is there still anything wrong with this patchset? > > ping! This patchset is quite old now. Please pull it into > wireless-next, so that it can appear in 3.15. > > -- Sebastian These are already in wireless-next... commit edb6e3ec374d5630dfc7a93ddd5c0f4864e98a9d Author: Sebastian Reichel <sre@xxxxxxxxxx> Date: Sat Feb 15 00:05:56 2014 +0100 Documentation: dt: wireless: Add wl1251 Add device tree binding documentation for Texas Instrument's wl1251 wireless lan chip. For now only the SPI binding is documented. Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx> Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> commit 07bbca6f142d02b4b09d66ed3c2cde36c77057ad Author: Sebastian Reichel <sre@xxxxxxxxxx> Date: Sat Feb 15 00:05:55 2014 +0100 wl1251: spi: add device tree support Add device tree support for the spi variant of wl1251. Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx> Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> commit e4c2e09e1534835c749de362b9b38e2d8b286236 Author: Sebastian Reichel <sre@xxxxxxxxxx> Date: Sat Feb 15 00:05:54 2014 +0100 wl1251: spi: add vio regulator support This patch adds support for requesting the regulator powering the vio pin. Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx> Reviewed-by: Pavel Machek <pavel@xxxxxx> Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> commit 1d207cd30b65fdd60d952cb9e100b6f776564f06 Author: Sebastian Reichel <sre@xxxxxxxxxx> Date: Sat Feb 15 00:05:53 2014 +0100 wl1251: move power GPIO handling into the driver Move the power GPIO handling from the board code into the driver. This is a dependency for device tree support. Signed-off-by: Sebastian Reichel <sre@xxxxxxxxxx> Reviewed-by: Pavel Machek <pavel@xxxxxx> Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> commit 946651cba26779864bcdbd7e12502f5a36c2de37 Author: Luciano Coelho <coelho@xxxxxx> Date: Sat Feb 15 00:05:52 2014 +0100 wl1251: split wl251 platform data to a separate structure Move the wl1251 part of the wl12xx platform data structure into a new structure specifically for wl1251. Change the platform data built-in block and board files accordingly. Signed-off-by: Luciano Coelho <coelho@xxxxxx> Acked-by: Tony Lindgren <tony@xxxxxxxxxxx> Reviewed-by: Felipe Balbi <balbi@xxxxxx> Reviewed-by: Sebastian Reichel <sre@xxxxxxxxxx> Reviewed-by: Pavel Machek <pavel@xxxxxx> Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx> -- John W. Linville Someday the world will need a hero, and you linville@xxxxxxxxxxxxx might be all we have. Be ready. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html