Merge ae96b02b ("soundwire: stream: Revert "soundwire: stream: fix...

Merge ae96b02b ("soundwire: stream: Revert "soundwire: stream: fix programming slave ports for non-continous port maps"") into android13-5.10

Steps on the way to 5.10.227

Resolves merge conflicts in:
	drivers/usb/dwc3/core.h

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