> BTW, are these a hard dependency for patch 3, or will the missing power
> source control just be ignored?

Long answer short: It is a hard dependency.

It shouldn't be, but fixing this might need patches to pfc, mmc-core,
and sdhi driver. Need to think about it. (and even then, patch 3 will be
depending on these yet-to-come fixes).