[SRU][focal/linux-raspi][PATCH v2] UBUNTU: [Config] raspi: Set USB_DWC2_DUAL_ROLE=y

[Juerg Haefliger]

BugLink: https://bugs.launchpad.net/bugs/1861070

Signed-off-by: Juerg Haefliger <juergh at canonical.com>
---
 debian.raspi/config/annotations          | 7 +++++--
 debian.raspi/config/config.common.ubuntu | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian.raspi/config/annotations b/debian.raspi/config/annotations
index 824cc0cbbe2d..e57e62300df7 100644
--- a/debian.raspi/config/annotations
+++ b/debian.raspi/config/annotations
@@ -7310,9 +7310,12 @@ CONFIG_USB_DWC2_DEBUG                           policy<{'amd64': 'n', 'arm64': '
 CONFIG_USB_DWC2_TRACK_MISSED_SOFS               policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'ppc64el': 'n'}>
 
 # Menu: Device Drivers >> USB support >> Support for Host-side USB >> DesignWare USB2 DRD Core Support >> DWC2 Mode Selection
-CONFIG_USB_DWC2_HOST                            policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y'}>
+CONFIG_USB_DWC2_HOST                            policy<{'arm64': 'n', 'armhf': 'n'}>
 CONFIG_USB_DWC2_PERIPHERAL                      policy<{'armhf': 'n'}>
-CONFIG_USB_DWC2_DUAL_ROLE                       policy<{'armhf': 'n'}>
+CONFIG_USB_DWC2_DUAL_ROLE                       policy<{'arm64': 'y', 'armhf': 'y'}>
+
+CONFIG_USB_DWC2_HOST                            note<LP:1861070>
+CONFIG_USB_DWC2_DUAL_ROLE                       note<LP:1861070>
 
 # Menu: Device Drivers >> USB support >> Support for Host-side USB >> DesignWare USB3 DRD Core Support
 CONFIG_USB_DWC3                                 policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'i386': 'm', 'ppc64el': 'm'}>
diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu
index fe3a4c183c45..35dea0f95d77 100644
--- a/debian.raspi/config/config.common.ubuntu
+++ b/debian.raspi/config/config.common.ubuntu
@@ -7279,8 +7279,8 @@ CONFIG_USB_DSBR=m
 # CONFIG_USB_DUMMY_HCD is not set
 CONFIG_USB_DWC2=m
 # CONFIG_USB_DWC2_DEBUG is not set
-# CONFIG_USB_DWC2_DUAL_ROLE is not set
-CONFIG_USB_DWC2_HOST=y
+CONFIG_USB_DWC2_DUAL_ROLE=y
+# CONFIG_USB_DWC2_HOST is not set
 # CONFIG_USB_DWC2_PCI is not set
 # CONFIG_USB_DWC2_PERIPHERAL is not set
 # CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
-- 
2.20.1