wifi: mt76: Use of_reserved_mem_region_to_resource() for "memory-region"

Use the newly added of_reserved_mem_region_to_resource() function to
handle "memory-region" properties.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patch.msgid.link/20251031175113.1453100-1-robh@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/soc.c b/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
index e22a737bd9ab81e98575edb746f8aaf1bf5bddea..54ff6de96f3ea9b06a04994fe4939d1f977b3b12 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/soc.c
@@ -284,20 +284,15 @@ static int mt798x_wmac_coninfra_check(struct mt7915_dev *dev)
 static int mt798x_wmac_coninfra_setup(struct mt7915_dev *dev)
 {
        struct device *pdev = dev->mt76.dev;
-       struct reserved_mem *rmem;
-       struct device_node *np;
+       struct resource res;
        u32 val;
+       int ret;
 
-       np = of_parse_phandle(pdev->of_node, "memory-region", 0);
-       if (!np)
-               return -EINVAL;
-
-       rmem = of_reserved_mem_lookup(np);
-       of_node_put(np);
-       if (!rmem)
-               return -EINVAL;
+       ret = of_reserved_mem_region_to_resource(pdev->of_node, 0, &res);
+       if (ret)
+               return ret;
 
-       val = (rmem->base >> 16) & MT_TOP_MCU_EMI_BASE_MASK;
+       val = (res.start >> 16) & MT_TOP_MCU_EMI_BASE_MASK;
 
        if (is_mt7986(&dev->mt76)) {
                /* Set conninfra subsys PLL check */
@@ -318,8 +313,8 @@ static int mt798x_wmac_coninfra_setup(struct mt7915_dev *dev)
                               MT_TOP_EFUSE_BASE_MASK, 0x11f20000 >> 16);
        }
 
-       mt76_wr(dev, MT_INFRA_BUS_EMI_START, rmem->base);
-       mt76_wr(dev, MT_INFRA_BUS_EMI_END, rmem->size);
+       mt76_wr(dev, MT_INFRA_BUS_EMI_START, res.start);
+       mt76_wr(dev, MT_INFRA_BUS_EMI_END, resource_size(&res));
 
        mt76_rr(dev, MT_CONN_INFRA_EFUSE);