Commit 60ac8a77 authored by Guido Günther's avatar Guido Günther Committed by Shawn Guo

arm64: dts: imx8mq-librem5-devkit: Drop power-supply

It's not a valid binding. Instead move the sdio_rst line to the power
sequence and use w_disable1 as the vmmc-supply bringing it more in line
with other SDIO M2 cards.

Resolves following warning:

arch/arm64/boot/dts/freescale/imx8mq-librem5-devkit.dtb: mmc@30b50000: Unevaluated properties are not allowed ('power-supply' was unexpected)
        from schema $id: http://devicetree.org/schemas/mmc/fsl-imx-esdhc.yaml#Reported-by: default avatarDavid Heidelberg <david@ixit.cz>
Signed-off-by: default avatarGuido Günther <agx@sigxcpu.org>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 74cec60c
......@@ -139,18 +139,6 @@ reg_pwr_en: regulator-pwr-en {
regulator-always-on;
};
reg_usdhc2_vmmc: regulator-usdhc2-vmmc {
compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2_pwr>;
regulator-name = "VSD_3V3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-always-on;
};
wwan_codec: sound-wwan-codec {
compatible = "option,gtm601";
#sound-dai-cells = <0>;
......@@ -242,6 +230,13 @@ wifi_pwr_en: regulator-wifi-en {
enable-active-high;
regulator-always-on;
};
wifi_pwr_seq: pwrseq {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc2_rst>;
compatible = "mmc-pwrseq-simple";
reset-gpios = <&gpio2 19 GPIO_ACTIVE_LOW>;
};
};
&A53_0 {
......@@ -808,7 +803,7 @@ MX8MQ_IOMUXC_SD1_RESET_B_USDHC1_RESET_B 0xc1
>;
};
pinctrl_usdhc2_pwr: usdhc2pwrgrp {
pinctrl_usdhc2_rst: usdhc2rstgrp {
fsl,pins = <
MX8MQ_IOMUXC_SD2_RESET_B_GPIO2_IO19 0x41
>;
......@@ -1031,8 +1026,8 @@ &usdhc2 {
pinctrl-1 = <&pinctrl_usdhc2_100mhz>;
pinctrl-2 = <&pinctrl_usdhc2_200mhz>;
bus-width = <4>;
vmmc-supply = <&reg_usdhc2_vmmc>;
power-supply = <&wifi_pwr_en>;
vmmc-supply = <&wifi_pwr_en>;
mmc-pwrseq = <&wifi_pwr_seq>;
broken-cd;
disable-wp;
cap-sdio-irq;
......
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