Commit 4f9007d6 authored by H. Nikolaus Schaller's avatar H. Nikolaus Schaller Committed by Ulf Hansson

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

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>
parent 9b8d7072
...@@ -226,6 +226,17 @@ usb_host_5v: fixed-regulator-usb_host_5v { ...@@ -226,6 +226,17 @@ usb_host_5v: fixed-regulator-usb_host_5v {
gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>; /* GPIO_164 */ 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 (wifi+bt module) 32k clock buffer */
wg7210_32k: fixed-regulator-wg7210_32k { wg7210_32k: fixed-regulator-wg7210_32k {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
...@@ -522,9 +533,30 @@ &mmc2 { ...@@ -522,9 +533,30 @@ &mmc2 {
/*wp-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;*/ /* GPIO_127 */ /*wp-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;*/ /* GPIO_127 */
}; };
/* mmc3 is probed using pdata-quirks to pass wl1251 card data */
&mmc3 { &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*/ /* bluetooth*/
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment