Merge "ipq40xx: fix emmc erase timeout issue"