diff --git a/arch/arm/dts/imx8mq-nitrogen8m_som.dts b/arch/arm/dts/imx8mq-nitrogen8m_som.dts index 23595e844911aed064e6075eb80e2ee693cc2565..be8f7fb2010fe925e7343c8d2ea99c8318464b89 100644 --- a/arch/arm/dts/imx8mq-nitrogen8m_som.dts +++ b/arch/arm/dts/imx8mq-nitrogen8m_som.dts @@ -310,12 +310,14 @@ >; }; +/* pinctrl_reg_wlan_vmmc: reg-wlan-vmmcgrp { fsl,pins = < #define GP_REG_WLAN_VMMC <&gpio3 20 GPIO_ACTIVE_HIGH> MX8MQ_IOMUXC_SAI5_RXC_GPIO3_IO20 0x16 >; }; +*/ pinctrl_sai1: sai1grp { fsl,pins = < @@ -603,6 +605,7 @@ regulator-max-microvolt = <5000000>; }; +/* reg_wlan_vmmc: regulator-wlan-vmmc { compatible = "regulator-fixed"; pinctrl-names = "default"; @@ -614,6 +617,7 @@ startup-delay-us = <70000>; enable-active-high; }; +*/ #if 0 sound-wm8960 { @@ -1361,7 +1365,7 @@ status = "okay"; tuning-delay = <32>; tuning-mode = <1>; - vmmc-supply = <®_wlan_vmmc>; + vmmc-supply = <®_vref_3v3>; vqmmc-1-8-v; }; diff --git a/board/boundary/nitrogen8m_som/spl.c b/board/boundary/nitrogen8m_som/spl.c index 484e95b43cdc0187d1230aa2df42b3e9babe45de..cb2d35f62036a297ecf69e5ff748951c425b8abf 100644 --- a/board/boundary/nitrogen8m_som/spl.c +++ b/board/boundary/nitrogen8m_som/spl.c @@ -105,6 +105,7 @@ static struct fsl_esdhc_cfg usdhc_cfg[] = { int board_mmc_init(bd_t *bis) { int i, ret; + /* * According to the board_mmc_init() the following map is done: * (U-Boot device node) (Physical Port) @@ -122,7 +123,7 @@ int board_mmc_init(bd_t *bis) break; case 1: usdhc_cfg[1].sdhc_clk = mxc_get_clock(USDHC2_CLK_ROOT); - gpio_request(GP_EMMC_RESET, "usdhc2_reset"); + gpio_request(USDHC2_PWR_GPIO, "usdhc2_reset"); gpio_direction_output(USDHC2_PWR_GPIO, 0); udelay(500); gpio_direction_output(USDHC2_PWR_GPIO, 1);