Skip to content

Commit

Permalink
ARM: dts: pandora-common: define wl1251 as child node of mmc3
Browse files Browse the repository at this point in the history
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: 81eef6c ("mmc: omap_hsmmc: Use dma_request_chan() for requesting DMA channel")
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Cc: <stable@vger.kernel.org> # v4.7+
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
  • Loading branch information
H. Nikolaus Schaller authored and Ulf Hansson committed Nov 15, 2019
1 parent 9b8d707 commit 4f9007d
Showing 1 changed file with 34 additions and 2 deletions.
36 changes: 34 additions & 2 deletions arch/arm/boot/dts/omap3-pandora-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,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";
Expand Down Expand Up @@ -522,9 +533,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*/
Expand Down

0 comments on commit 4f9007d

Please sign in to comment.