From eb3c462d699c84743c996cbe47a9ab09df097cdf Mon Sep 17 00:00:00 2001 From: kettenis Date: Thu, 8 Feb 2024 20:50:34 +0000 Subject: [PATCH] Upstream Linux finally settled on the compatible for the JH7100 Ethernet MAC. Keep the preliminary one for now since the upstream device tree doesn't include the USB controller yet. ok miod@ --- sys/dev/fdt/if_dwge.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/fdt/if_dwge.c b/sys/dev/fdt/if_dwge.c index 62dc34e5f66..94705b1c1cf 100644 --- a/sys/dev/fdt/if_dwge.c +++ b/sys/dev/fdt/if_dwge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_dwge.c,v 1.21 2023/11/20 20:41:18 kettenis Exp $ */ +/* $OpenBSD: if_dwge.c,v 1.22 2024/02/08 20:50:34 kettenis Exp $ */ /* * Copyright (c) 2008, 2019 Mark Kettenis * Copyright (c) 2017 Patrick Wildt @@ -450,7 +450,9 @@ dwge_attach(struct device *parent, struct device *self, void *aux) * defragmenting mbufs before transmitting them fixes the * issue. */ - if (OF_is_compatible(faa->fa_node, "starfive,jh7100-gmac")) + /* XXX drop "starfive,jh7100-gmac" in the future */ + if (OF_is_compatible(faa->fa_node, "starfive,jh7100-gmac") || + OF_is_compatible(faa->fa_node, "starfive,jh7100-dwmac")) sc->sc_defrag = 1; /* Power up PHY. */ -- 2.20.1