Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 81eef6ca9201 ("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>

authored by

H. Nikolaus Schaller and committed by
Ulf Hansson
4f9007d6 9b8d7072

+34 -2
+34 -2
arch/arm/boot/dts/omap3-pandora-common.dtsi
··· 226 226 gpio = <&gpio6 4 GPIO_ACTIVE_HIGH>; /* GPIO_164 */ 227 227 }; 228 228 229 + /* wl1251 wifi+bt module */ 230 + wlan_en: fixed-regulator-wg7210_en { 231 + compatible = "regulator-fixed"; 232 + regulator-name = "vwlan"; 233 + regulator-min-microvolt = <1800000>; 234 + regulator-max-microvolt = <1800000>; 235 + startup-delay-us = <50000>; 236 + enable-active-high; 237 + gpio = <&gpio1 23 GPIO_ACTIVE_HIGH>; 238 + }; 239 + 229 240 /* wg7210 (wifi+bt module) 32k clock buffer */ 230 241 wg7210_32k: fixed-regulator-wg7210_32k { 231 242 compatible = "regulator-fixed"; ··· 533 522 /*wp-gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;*/ /* GPIO_127 */ 534 523 }; 535 524 536 - /* mmc3 is probed using pdata-quirks to pass wl1251 card data */ 537 525 &mmc3 { 538 - status = "disabled"; 526 + vmmc-supply = <&wlan_en>; 527 + 528 + bus-width = <4>; 529 + non-removable; 530 + ti,non-removable; 531 + cap-power-off-card; 532 + 533 + pinctrl-names = "default"; 534 + pinctrl-0 = <&mmc3_pins>; 535 + 536 + #address-cells = <1>; 537 + #size-cells = <0>; 538 + 539 + wlan: wifi@1 { 540 + compatible = "ti,wl1251"; 541 + 542 + reg = <1>; 543 + 544 + interrupt-parent = <&gpio1>; 545 + interrupts = <21 IRQ_TYPE_LEVEL_HIGH>; /* GPIO_21 */ 546 + 547 + ti,wl1251-has-eeprom; 548 + }; 539 549 }; 540 550 541 551 /* bluetooth*/