From nobody Tue Nov 19 21:18:48 2024 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XtHRX3Ml1z5fS9W; Tue, 19 Nov 2024 21:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XtHRX1MKJz4mGg; Tue, 19 Nov 2024 21:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732051128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2uPvKIB7qOGHE7j8fBcQY+duMQKh+8eN3F2LFHxTmHM=; b=hAymFwg0IeZWfaXTuAAlq5OSqwU1hB4dtDOfOdg2Nfm3lL0iMdz0uiZrS4XNSIoR27yhu3 YXooyxfZzpNwlzsgOSxcVkd3aMfChbFs6/a49Eho6hpWPg12lHpV8uXqNgW8yLOEMYcLdr ok9UY3mtCsxrXF+krVb2UJu4sPA/ysIKwW8a0FfDvz9WfqNG6RiTIEYfxfa+pTBSrlbAWN 0q/ImvXcB+vUICsr+V6FL2zDeHO16RZn89Sw+gKxUNWA3ZnisFrvSc6/feLgYiyg9/dj8h 9NA1mZMrXZIpnkt1n9NEZH+5n1P2xs6NgvlsZP+1vFYi8L4Y1prFG7RwPvwbRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732051128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2uPvKIB7qOGHE7j8fBcQY+duMQKh+8eN3F2LFHxTmHM=; b=Dfd5KGRZn3UHf+wL5mzc4dOtYumOcDnrSUP6eM3chbBLOuzwDmv23cgpd0aCc9ULiAAA4n Bi/DP+esUrtZzu1t5YTXKQ4qB5LdhoTJHwHZqI6f65/bf3f/1v5ibnoe/xcNTo7ANVRWVB KYnqqMkCd8lSF9W3wLK6YxudLkdjkX+C99CtNHkZ2Oo7pNXdnT9ighV9ZuM3M1p79kPVu+ vjQ4VHQkpj8zzAua0nWsIzKj8DtS5qH78HbYFMHkyduG4ZtQWdV6SRgXk+1wZjQQsm2Rao OOydb9otcKbAbfHH/AnXxohh1Zv3S6n13t4UPX0h9tVL0ALYKzty0vVzCVq7CQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732051128; a=rsa-sha256; cv=none; b=it4uNeFRv6rXbWG/SFnXFtRpSWTApN9FLCorEz3zjfoWU/9Xik1A6BUnpw7E7fEW4PWyDo u9KcVtMiEgkl8tuDIITM4E2GtsDw7+3L+psFjf8Uydpjg/qlK4t0Yxj9gElYGBZ/Syyvoi AjC2t8xrb5/VLNqw0BkenHxXqHXsRfTPgI6dYsuWMGiX5bWNwQgssr6uBD7TDx4rilmh/Z n31tUv6dMitn/pbtNTR53IkwUsXPQokgEBNh3ybMeloDOE36iUQwa8m2Gp21FRQb7eLyvd j4iv+3T5BtUQ2AY8/WOc1XKm0Y0+Kb77RmsaB7stY06c8C5/rlMatRDpkErTXw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XtHRX0yQxzR9J; Tue, 19 Nov 2024 21:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AJLIm7A093027; Tue, 19 Nov 2024 21:18:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AJLImPA093024; Tue, 19 Nov 2024 21:18:48 GMT (envelope-from git) Date: Tue, 19 Nov 2024 21:18:48 GMT Message-Id: <202411192118.4AJLImPA093024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d6b692835e52 - main - mii_fdt: Search for the "ethernet-ports" subnode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6b692835e52d85441dfdd20a01c12e17cb50914 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d6b692835e52d85441dfdd20a01c12e17cb50914 commit d6b692835e52d85441dfdd20a01c12e17cb50914 Author: Mark Johnston AuthorDate: 2024-11-19 21:05:19 +0000 Commit: Mark Johnston CommitDate: 2024-11-19 21:05:19 +0000 mii_fdt: Search for the "ethernet-ports" subnode This is a more common name for the parent of the port nodes. PR: 280770 MFC after: 2 weeks Reported by: Mike Belanger --- sys/dev/mii/mii_fdt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/dev/mii/mii_fdt.c b/sys/dev/mii/mii_fdt.c index 240312114cf2..2254af162a34 100644 --- a/sys/dev/mii/mii_fdt.c +++ b/sys/dev/mii/mii_fdt.c @@ -115,6 +115,8 @@ mii_fdt_lookup_phy(phandle_t node, int addr) * Since we have multiple candidates select one based on PHY address. */ ports = ofw_bus_find_child(node, "ports"); + if (ports <= 0) + ports = ofw_bus_find_child(node, "ethernet-ports"); if (ports <= 0) return (-1);