Merge pull request #1858 from thloh85-intel/dwmmc_fixes