aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorTomeu Vizoso <tomeu.vizoso@collabora.com>2015-03-18 05:52:21 -0400
committerThierry Reding <treding@nvidia.com>2015-03-24 05:51:35 -0400
commit1d1690b85726540c3d2bf0907ce4b30bfec42dc1 (patch)
tree2b1d84e39ddfe2cfb72ca7e003b4b3137c37b8bf /arch/arm
parenta0b9c1cb1636543b659e019a59c048bb911c80e2 (diff)
ARM: tegra: Use pwrseq-simple for the wifi in Nyan
The Nyan boards have a Marvell 88w8897 wifi card connected through SDIO that needs the reset line to be asserted before mmc power up and deasserted afterwards. This patch also adds references to the power supplies of the card so that the regulators are enabled when it's probed. Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Acked-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Alexandre Courbot <acourbot@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/tegra124-nyan.dtsi11
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
index 579b0b9c7383..d3a95f937dfb 100644
--- a/arch/arm/boot/dts/tegra124-nyan.dtsi
+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
@@ -207,7 +207,6 @@
207 regulator-name = "+1.8V_VDDIO"; 207 regulator-name = "+1.8V_VDDIO";
208 regulator-min-microvolt = <1800000>; 208 regulator-min-microvolt = <1800000>;
209 regulator-max-microvolt = <1800000>; 209 regulator-max-microvolt = <1800000>;
210 regulator-boot-on;
211 regulator-always-on; 210 regulator-always-on;
212 }; 211 };
213 212
@@ -364,12 +363,20 @@
364 status = "okay"; 363 status = "okay";
365 }; 364 };
366 365
366 sdhci0_pwrseq: sdhci0_pwrseq {
367 compatible = "mmc-pwrseq-simple";
368
369 reset-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_LOW>;
370 };
371
367 sdhci@0,700b0000 { /* WiFi/BT on this bus */ 372 sdhci@0,700b0000 { /* WiFi/BT on this bus */
368 status = "okay"; 373 status = "okay";
369 power-gpios = <&gpio TEGRA_GPIO(X, 7) GPIO_ACTIVE_HIGH>;
370 bus-width = <4>; 374 bus-width = <4>;
371 no-1-8-v; 375 no-1-8-v;
372 non-removable; 376 non-removable;
377 mmc-pwrseq = <&sdhci0_pwrseq>;
378 vmmc-supply = <&vdd_3v3_lp0>;
379 vqmmc-supply = <&vddio_1v8>;
373 }; 380 };
374 381
375 sdhci@0,700b0400 { /* SD Card on this bus */ 382 sdhci@0,700b0400 { /* SD Card on this bus */