Revert "sdhci: workaround from lkml"

This reverts commit 33f340437f0eba23003b423cbcab9e5bade7d795.
Revert "Revert "sdhci: workaround from lkml""

This reverts commit e3202292deac8f6061e4187622c5fadd7bdbba8f.
topology: update to latest upstream version