add fixes for mmc_sdhci needed after [10637]