From: Tony Lindgren Date: Thu, 26 Mar 2015 19:12:28 +0000 (-0700) Subject: Merge tag 'omap-for-v4.1/wl12xx-dt' into for-next X-Git-Tag: KARO-TXA5-2015-06-26~144^2~5 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c9c69203173eb07206a0d471ddb7f175370c81eb;p=karo-tx-linux.git Merge tag 'omap-for-v4.1/wl12xx-dt' into for-next Wireless and omap changes to make wl12xx driver to use device tree data instead of platform data from Eliad Peller : - Add device-tree support to the wlcore (wl12xx/wl18xx) driver. - Update the current users to use the bindings instead of pdata-quirks. - Finally, remove the deprecated wl12xx_platform_data struct Note that da850 board file code that still uses the platform data, but we have da850.dtsi that can be used instead. So it was decided that we should try to remove the wl12xx support from the da850 board file as suggested by Sekhar Nori . As it's the last patch in the series, the last patch can be simply reverted if needed. As this series touches quite a bit of arch code, it was suggested by Kalle Valo that the whole series should be merged via the arm-soc tree. --- c9c69203173eb07206a0d471ddb7f175370c81eb