From b3205ea1cd4bb43ba31f04df1a879a9922e99d39 Mon Sep 17 00:00:00 2001
From: puddly <32534428+puddly@users.noreply.github.com>
Date: Fri, 7 Feb 2025 10:33:40 -0500
Subject: [PATCH] Do not rely on pyserial for port scanning with the CM5 + ZHA
 (#137585)

Do not rely on pyserial for port scanning with the CM5
---
 homeassistant/components/zha/config_flow.py | 11 ++++++++---
 tests/components/zha/test_config_flow.py    | 13 +++++++++++--
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/homeassistant/components/zha/config_flow.py b/homeassistant/components/zha/config_flow.py
index d41ae7dbfee..b98e53f98d8 100644
--- a/homeassistant/components/zha/config_flow.py
+++ b/homeassistant/components/zha/config_flow.py
@@ -113,9 +113,14 @@ async def list_serial_ports(hass: HomeAssistant) -> list[ListPortInfo]:
     except HomeAssistantError:
         pass
     else:
-        yellow_radio = next(p for p in ports if p.device == "/dev/ttyAMA1")
-        yellow_radio.description = "Yellow Zigbee module"
-        yellow_radio.manufacturer = "Nabu Casa"
+        # PySerial does not properly handle the Yellow's serial port with the CM5
+        # so we manually include it
+        port = ListPortInfo(device="/dev/ttyAMA1", skip_link_detection=True)
+        port.description = "Yellow Zigbee module"
+        port.manufacturer = "Nabu Casa"
+
+        ports = [p for p in ports if not p.device.startswith("/dev/ttyAMA")]
+        ports.insert(0, port)
 
     if is_hassio(hass):
         # Present the multi-PAN addon as a setup option, if it's available
diff --git a/tests/components/zha/test_config_flow.py b/tests/components/zha/test_config_flow.py
index 573a04e9b57..94566be2f87 100644
--- a/tests/components/zha/test_config_flow.py
+++ b/tests/components/zha/test_config_flow.py
@@ -1914,9 +1914,18 @@ async def test_options_flow_migration_reset_old_adapter(
     assert result4["step_id"] == "choose_serial_port"
 
 
-async def test_config_flow_port_yellow_port_name(hass: HomeAssistant) -> None:
+@pytest.mark.parametrize(
+    "device",
+    [
+        "/dev/ttyAMA1",  # CM4
+        "/dev/ttyAMA10",  # CM5, erroneously detected by pyserial
+    ],
+)
+async def test_config_flow_port_yellow_port_name(
+    hass: HomeAssistant, device: str
+) -> None:
     """Test config flow serial port name for Yellow Zigbee radio."""
-    port = com_port(device="/dev/ttyAMA1")
+    port = com_port(device=device)
     port.serial_number = None
     port.manufacturer = None
     port.description = None