From 5fe96390f54bde28bbfe190f111ca0578ec4af88 Mon Sep 17 00:00:00 2001
From: Joost Lekkerkerker <joostlek@outlook.com>
Date: Mon, 8 Jan 2024 10:37:17 +0100
Subject: [PATCH] Add zone devices to AnthemAV (#107192)

---
 .../components/anthemav/media_player.py       | 26 ++++++++++++-------
 .../components/anthemav/test_media_player.py  |  2 +-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/homeassistant/components/anthemav/media_player.py b/homeassistant/components/anthemav/media_player.py
index c13e6389bfc..0a9edeb2269 100644
--- a/homeassistant/components/anthemav/media_player.py
+++ b/homeassistant/components/anthemav/media_player.py
@@ -50,6 +50,7 @@ class AnthemAVR(MediaPlayerEntity):
     """Entity reading values from Anthem AVR protocol."""
 
     _attr_has_entity_name = True
+    _attr_name = None
     _attr_should_poll = False
     _attr_device_class = MediaPlayerDeviceClass.RECEIVER
     _attr_icon = "mdi:audio-video"
@@ -77,18 +78,23 @@ class AnthemAVR(MediaPlayerEntity):
         self._zone_number = zone_number
         self._zone = avr.zones[zone_number]
         if zone_number > 1:
-            self._attr_name = f"zone {zone_number}"
-            self._attr_unique_id = f"{mac_address}_{zone_number}"
+            unique_id = f"{mac_address}_{zone_number}"
+            self._attr_unique_id = unique_id
+            self._attr_device_info = DeviceInfo(
+                identifiers={(DOMAIN, unique_id)},
+                name=f"Zone {zone_number}",
+                manufacturer=MANUFACTURER,
+                model=model,
+                via_device=(DOMAIN, mac_address),
+            )
         else:
-            self._attr_name = None
             self._attr_unique_id = mac_address
-
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, mac_address)},
-            name=name,
-            manufacturer=MANUFACTURER,
-            model=model,
-        )
+            self._attr_device_info = DeviceInfo(
+                identifiers={(DOMAIN, mac_address)},
+                name=name,
+                manufacturer=MANUFACTURER,
+                model=model,
+            )
         self.set_states()
 
     async def async_added_to_hass(self) -> None:
diff --git a/tests/components/anthemav/test_media_player.py b/tests/components/anthemav/test_media_player.py
index b4e8808f4e9..9dd8af24efb 100644
--- a/tests/components/anthemav/test_media_player.py
+++ b/tests/components/anthemav/test_media_player.py
@@ -22,7 +22,7 @@ from tests.common import MockConfigEntry
     ("entity_id", "entity_name"),
     [
         ("media_player.anthem_av", "Anthem AV"),
-        ("media_player.anthem_av_zone_2", "Anthem AV zone 2"),
+        ("media_player.zone_2", "Zone 2"),
     ],
 )
 async def test_zones_loaded(