Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752951AbaBNXGp (ORCPT ); Fri, 14 Feb 2014 18:06:45 -0500 Received: from ring0.de ([5.45.105.125]:32928 "EHLO smtp.ring0.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752282AbaBNXGn (ORCPT ); Fri, 14 Feb 2014 18:06:43 -0500 X-Spam-Report: * -0.0 NO_RELAYS Informational: message was not relayed via SMTP * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * -0.0 NO_RECEIVED Informational: message has no Received headers From: Sebastian Reichel To: Sebastian Reichel , Luciano Coelho , Tony Lindgren , "John W. Linville" Cc: Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Rob Landley , Kumar Gala , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org, linux-omap@vger.kernel.org, netdev@vger.kernel.org, Sebastian Reichel Subject: [RESEND] [PATCHv2 0/5] wl1251 device tree support Date: Sat, 15 Feb 2014 00:05:51 +0100 Message-Id: <1392419156-14394-1-git-send-email-sre@debian.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <20140125000929.GD25488@atomide.com> References: <20140125000929.GD25488@atomide.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/