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 majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
