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

ARM: dts: omap3-igep0030: Use MMC pwrseq to init SDIO WiFi

When the WiFi support was added to the IGEP0030 board, the MMC subsystem
did not provide a mechanism to define power sequence providers. So a DT
hack was used to toggle the WiFi chip reset and power down pins by using
fake fixed regulators whose enable GPIO was the GPIOs connected to these
pins.

But now the simple MMC power sequence provider can be used for this and
the workaround removed.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Enric Balletbo Serra <enric.balletbo@collabora.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by

Javier Martinez Canillas and committed by
Tony Lindgren
89c6f2e5 fd7e118c

+8 -16
+8 -16
arch/arm/boot/dts/omap3-igep0030.dts
··· 15 15 model = "IGEP COM MODULE Rev. E (TI OMAP AM/DM37x)"; 16 16 compatible = "isee,omap3-igep0030", "ti,omap36xx", "ti,omap3"; 17 17 18 - /* Regulator to trigger the WIFI_PDN signal of the Wifi module */ 19 - lbee1usjyc_pdn: lbee1usjyc_pdn { 18 + vmmcsdio_fixed: fixedregulator-mmcsdio { 20 19 compatible = "regulator-fixed"; 21 - regulator-name = "regulator-lbee1usjyc-pdn"; 20 + regulator-name = "vmmcsdio_fixed"; 22 21 regulator-min-microvolt = <3300000>; 23 22 regulator-max-microvolt = <3300000>; 24 - gpio = <&gpio5 10 GPIO_ACTIVE_HIGH>; /* gpio_138 - WIFI_PDN */ 25 - startup-delay-us = <10000>; 26 - enable-active-high; 27 23 }; 28 24 29 - /* Regulator to trigger the RESET_N_W signal of the Wifi module */ 30 - lbee1usjyc_reset_n_w: lbee1usjyc_reset_n_w { 31 - compatible = "regulator-fixed"; 32 - regulator-name = "regulator-lbee1usjyc-reset-n-w"; 33 - regulator-min-microvolt = <3300000>; 34 - regulator-max-microvolt = <3300000>; 35 - gpio = <&gpio5 11 GPIO_ACTIVE_HIGH>; /* gpio_139 - RESET_N_W */ 36 - enable-active-high; 25 + mmc2_pwrseq: mmc2_pwrseq { 26 + compatible = "mmc-pwrseq-simple"; 27 + reset-gpios = <&gpio5 11 GPIO_ACTIVE_LOW>, /* gpio_139 - RESET_N_W */ 28 + <&gpio5 10 GPIO_ACTIVE_LOW>; /* gpio_138 - WIFI_PDN */ 37 29 }; 38 30 }; 39 31 ··· 54 62 &mmc2 { 55 63 pinctrl-names = "default"; 56 64 pinctrl-0 = <&mmc2_pins &lbee1usjyc_pins>; 57 - vmmc-supply = <&lbee1usjyc_pdn>; 58 - vmmc_aux-supply = <&lbee1usjyc_reset_n_w>; 65 + vmmc-supply = <&vmmcsdio_fixed>; 66 + mmc-pwrseq = <&mmc2_pwrseq>; 59 67 bus-width = <4>; 60 68 non-removable; 61 69 };