Update the IQS device tree for SD card boot in SPL. Retain the SDHC2 and power dependencies required by the SPL boot flow and configure the controller for SD operation.
Signed-off-by: Abhilash V <[email protected]> --- arch/arm/dts/shikra-iqs-evk-u-boot.dtsi | 19 +++++++++++++++++++ arch/arm/dts/shikra-iqs-evk.dts | 3 ++- drivers/gpio/msm_gpio.c | 3 +-- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/shikra-iqs-evk-u-boot.dtsi b/arch/arm/dts/shikra-iqs-evk-u-boot.dtsi index a1e506f7dff..f2265c741bd 100644 --- a/arch/arm/dts/shikra-iqs-evk-u-boot.dtsi +++ b/arch/arm/dts/shikra-iqs-evk-u-boot.dtsi @@ -46,6 +46,25 @@ bootph-all; }; +&sdc2_default { + bootph-all; + clk-pins { bootph-all; }; + cmd-pins { bootph-all; }; + data-pins { bootph-all; }; +}; + +&sdc2_sleep { + bootph-all; + clk-pins { bootph-all; }; + cmd-pins { bootph-all; }; + data-pins { bootph-all; }; +}; + +&sdc2_card_det_n { bootph-all; }; +&sdhc_2 { bootph-all; }; +&pm8150_l10 { bootph-all; }; +&pm8150_l2 { bootph-all; }; + &qupv3_0 { bootph-all; }; diff --git a/arch/arm/dts/shikra-iqs-evk.dts b/arch/arm/dts/shikra-iqs-evk.dts index 38b13f79c24..0f91678a3be 100644 --- a/arch/arm/dts/shikra-iqs-evk.dts +++ b/arch/arm/dts/shikra-iqs-evk.dts @@ -41,8 +41,10 @@ }; &sdhc_2 { + resets = <&gcc GCC_SDCC2_BCR>; vmmc-supply = <&pm8150_l10>; vqmmc-supply = <&pm8150_l2>; + max-frequency = <100000000>; no-sdio; no-mmc; @@ -50,7 +52,6 @@ pinctrl-0 = <&sdc2_default &sdc2_card_det_n>; pinctrl-1 = <&sdc2_sleep &sdc2_card_det_n>; pinctrl-names = "default", "sleep"; - cd-gpios = <&tlmm 89 GPIO_ACTIVE_LOW>; status = "okay"; diff --git a/drivers/gpio/msm_gpio.c b/drivers/gpio/msm_gpio.c index 7de332c66ae..affbbe5c880 100644 --- a/drivers/gpio/msm_gpio.c +++ b/drivers/gpio/msm_gpio.c @@ -274,8 +274,7 @@ static int msm_gpio_of_to_plat(struct udevice *dev) /* Get the pin count from the pinctrl driver */ uc_priv->gpio_count = pin_data->pin_count; - uc_priv->bank_name = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), - "gpio-bank-name", NULL); + uc_priv->bank_name = dev_read_string(dev, "gpio-bank-name"); if (uc_priv->bank_name == NULL) uc_priv->bank_name = "soc"; -- 2.34.1
