Revert "Merge 0cc82d61 ("Merge branch 'for-5.16/nintendo' into for-linus")...

Revert "Merge 0cc82d61 ("Merge branch 'for-5.16/nintendo' into for-linus") into android-mainline"

There is something odd about the new switch driver upstream that is
failing CTS tests.  Revert the new version and go back to the old one
for now so that we can continue on with the merge to 5.16-rc1.  We will
revisit this after the merge is complete.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I874b4f5e10ca565341ab696f0bbb761302df806c