mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2025-12-10 07:44:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "ipq4019: fdt_fixup: Delete the 'sd-ldo-gpios' property from sdhci node"

Browse source
This commit is contained in:
Linux Build Service Account 2018-07-23 23:07:22 -07:00 • committed by Gerrit - the friendly Code Review server
commit 732fb77f30
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
board/qca/arm/common/fdt_fixup.c
View file

@ -481,6 +481,10 @@ static int ipq40xx_patch_eth_params(void *blob, unsigned long gmac_no)
return 0;
}
__weak void fdt_fixup_sd_ldo_gpios_toggle(void *blob)
{
return;
}
/*
* For newer kernel that boot with device tree (3.14+), all of memory is
@ -576,6 +580,10 @@ int ft_board_setup(void *blob, bd_t *bd)
ipq_fdt_fixup_usb_device_mode(blob);
fdt_fixup_auto_restart(blob);
if ((flash_type == SMEM_BOOT_MMC_FLASH) ||
(flash_type == SMEM_BOOT_NORPLUSEMMC))
fdt_fixup_sd_ldo_gpios_toggle(blob);
#ifdef CONFIG_QCA_MMC
board_mmc_deinit();
#endif

22
board/qca/arm/ipq40xx/ipq40xx.c
View file

@ -438,6 +438,28 @@ void ipq_fdt_fixup_socinfo(void *blob)
}
}
void fdt_fixup_sd_ldo_gpios_toggle(void *blob)
{
int noff;
int ret;
noff = fdt_path_offset(blob, "/soc/sdhci");
if (noff < 0) {
printf("ipq: fdt fixup unable to find node /soc/sdhci\n");
return;
}
/**
* In eMMC card, power-on write protection also gets cleared
* during sd-ldo toggle in kernel.
*/
ret = fdt_delprop(blob, noff, "sd-ldo-gpios");
if (ret < 0) {
printf("sdhci: cann't delete sd-ldo-gpios\n");
return;
}
}
void ipq_fdt_fixup_usb_device_mode(void *blob)
{
int nodeoff, ret, i;