SoC: One more fix for 5.16

I had missed one patch when I sent up what I thought was the last batch
of fixes for this release. This one fixes issues on the Raspberry Pi
platforms due to gpio init changes this release, so hopefully we can get
it merged before final release is cut.