Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11cc8bb5 authored by H. Nikolaus Schaller's avatar H. Nikolaus Schaller Committed by Greg Kroah-Hartman
Browse files

ARM: dts: pandora-common: define wl1251 as child node of mmc3 



commit 4f9007d692017cef38baf2a9b82b7879d5b2407b upstream.

Since v4.7 the dma initialization requires that there is a
device tree property for "rx" and "tx" channels which is
not provided by the pdata-quirks initialization.

By conversion of the mmc3 setup to device tree this will
finally allows to remove the OpenPandora wlan specific omap3
data-quirks.

Fixes: 81eef6ca ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
Signed-off-by: default avatarH. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # v4.7+
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ff01cf28

arch/arm/boot/dts/omap3-pandora-common.dtsi

+34 −2
Original line number Diff line number Diff line
@@ -229,6 +229,17 @@ 
		gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>;	/* GPIO_164 */

	};



	/* wl1251 wifi+bt module */

	wlan_en: fixed-regulator-wg7210_en {

		compatible = "regulator-fixed";

		regulator-name = "vwlan";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		startup-delay-us = <50000>;

		enable-active-high;

		gpio = <&gpio1 23 GPIO_ACTIVE_HIGH>;

	};



	/* wg7210 (wifi+bt module) 32k clock buffer */

	wg7210_32k: fixed-regulator-wg7210_32k {

		compatible = "regulator-fixed";
@@ -525,9 +536,30 @@ 
	/*wp-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;*/	/* GPIO_127 */

};



/* mmc3 is probed using pdata-quirks to pass wl1251 card data */

&mmc3 {

	status = "disabled";

	vmmc-supply = <&wlan_en>;



	bus-width = <4>;

	non-removable;

	ti,non-removable;

	cap-power-off-card;



	pinctrl-names = "default";

	pinctrl-0 = <&mmc3_pins>;



	#address-cells = <1>;

	#size-cells = <0>;



	wlan: wifi@1 {

		compatible = "ti,wl1251";



		reg = <1>;



		interrupt-parent = <&gpio1>;

		interrupts = <21 IRQ_TYPE_LEVEL_HIGH>;	/* GPIO_21 */



		ti,wl1251-has-eeprom;

	};

};



/* bluetooth*/