From nobody Wed Jun 5 08:28:09 2024 X-Original-To: dev-commits-src-branches@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 4VvLFQ3Dm1z5MMv8; Wed, 05 Jun 2024 08:28:10 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VvLFQ0dRHz4GHP; Wed, 5 Jun 2024 08:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717576090; 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=wCMvzRqvJZBuiJNwfoQFTJuIDI4deqnk2qDWa0vzzns=; b=cb5oNKq8v9S9LODqaeYkHs8l/xC4hc9OhRGVjDLmgTf7mifnTv7iGHXVRTgM7y1d9XC+m2 4FfgjsOBH4SGHRGlF6l88cnYg+eQv8d8NcsoWZSBFlOtS+6aWXYE96K/uGRL3qS3xe6Qb0 R0qP4479EO/WB2OwCgGj7ZVF8aBOIROEdc6JtPivx2YXqjF5Kt/JInc4/Fft33ogL/mZRG XJb1CwUBfmNXX+eVwxQkff8UQzNjTzD1p2xCDV2idmQC053fPCs32KTJARYqD9jCdYD2QD qzkVo/1lBJQqSPm8HP3ycBO6VdxIH5X30M2fjCNpXJaQsz2X9h/NO/+iBfMzZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717576090; a=rsa-sha256; cv=none; b=NoyDDQ1nutmOtjcN8lVjEkSpUisB3FD4Z1AYfsO4fGoYezkK7JHQ9y/nNQYz39LpbhLyZX oNXwOv/M+n+aAYTEuoUqH/Y3dDNcziphgiwILIJs55RQIouDwXg2Gp8XZuH9AFzAIqM97P 4Rp2ji2fOA2I2khg8nEOOD2K5NQcOfoRdGaZw6/4e3Rx9UFqeKnL99AXEUBfbMA2qzi9Pq BfLG5IzofZ1o5j0o26DUox4anDMBNG8ehbMF0EnY+FwIB18kTS1YLaXUaqBNEwasY/Y7+c +gBDtJiMzDNln4Zj1877qxXdDwHvx6M0uKFBUiA/yCf5nHRVbfg3KOKjqClP5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717576090; 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=wCMvzRqvJZBuiJNwfoQFTJuIDI4deqnk2qDWa0vzzns=; b=RKXYd4kvc+41BjLnc6F2OK6/Ss/KbjLGn1MQLestobF5MrXbXiTAbADV0rKBb4G6oQ6hZW FkMCKyjOw4uMGJx656Y5ebZP5XCTcSgTR1DoaF9EwbuZRjhw8WndZSKQfBWrArUGc4eukH zokB5tk/ne3RdCBhKO46EPAcZF0eJ4VE+MDNwWT97uN53AFv46k0Hmg3n4Z5IMXi6RPmlZ yxewXjZLGfrAtPjrC01qEI4V4gZOA1ZFtlwJCaV5RxDXJcI2+6SBU/X4Cz+FfcLP9WVk1Y uxV+FN4bsTZVum5cwaVzLFJsnEp2GQvX+wSLX8wL/c42FFN9iFnn2RVMDByiTw== 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 4VvLFQ0FR7zvV7; Wed, 5 Jun 2024 08:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4558S9cT025336; Wed, 5 Jun 2024 08:28:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4558S9pg025333; Wed, 5 Jun 2024 08:28:09 GMT (envelope-from git) Date: Wed, 5 Jun 2024 08:28:09 GMT Message-Id: <202406050828.4558S9pg025333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: 0181a0e67c33 - stable/14 - eqos: Unbreak fdt support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0181a0e67c33e2725ed6ef7cd52d1dbb355f0342 Auto-Submitted: auto-generated The branch stable/14 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=0181a0e67c33e2725ed6ef7cd52d1dbb355f0342 commit 0181a0e67c33e2725ed6ef7cd52d1dbb355f0342 Author: Emmanuel Vadot AuthorDate: 2023-12-11 10:29:16 +0000 Commit: Emmanuel Vadot CommitDate: 2024-06-05 08:16:33 +0000 eqos: Unbreak fdt support We need to enable the clocks and deassert the resets for eqos to work correctly. (cherry picked from commit 22029445cbef0ffc71196a6f38cee4738e9a6d0f) --- sys/dev/eqos/if_eqos_fdt.c | 56 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/sys/dev/eqos/if_eqos_fdt.c b/sys/dev/eqos/if_eqos_fdt.c index 6d6c80bd2e92..82472008f1d5 100644 --- a/sys/dev/eqos/if_eqos_fdt.c +++ b/sys/dev/eqos/if_eqos_fdt.c @@ -50,6 +50,7 @@ #include #include +#include #include #include #include @@ -148,6 +149,9 @@ eqos_fdt_init(device_t dev) regulator_t eqos_supply; uint32_t rx_delay, tx_delay; uint8_t buffer[16]; + clk_t stmmaceth, mac_clk_rx, mac_clk_tx, aclk_mac, pclk_mac; + uint64_t freq; + int error; if (OF_hasprop(node, "rockchip,grf") && syscon_get_by_ofw_property(dev, node, "rockchip,grf", &sc->grf)) { @@ -174,8 +178,56 @@ eqos_fdt_init(device_t dev) device_printf(dev, "cannot get reset\n"); return (ENXIO); } - else - hwreset_assert(eqos_reset); + hwreset_assert(eqos_reset); + + error = clk_set_assigned(dev, ofw_bus_get_node(dev)); + if (error != 0) { + device_printf(dev, "clk_set_assigned failed\n"); + return (error); + } + + if (clk_get_by_ofw_name(dev, 0, "stmmaceth", &stmmaceth) == 0) { + error = clk_enable(stmmaceth); + if (error != 0) { + device_printf(dev, "could not enable main clock\n"); + return (error); + } + if (bootverbose) { + clk_get_freq(stmmaceth, &freq); + device_printf(dev, "MAC clock(%s) freq: %jd\n", + clk_get_name(stmmaceth), (intmax_t)freq); + } + } + else { + device_printf(dev, "could not find clock stmmaceth\n"); + } + + if (clk_get_by_ofw_name(dev, 0, "mac_clk_rx", &mac_clk_rx) != 0) { + device_printf(dev, "could not get mac_clk_rx clock\n"); + mac_clk_rx = NULL; + } + + if (clk_get_by_ofw_name(dev, 0, "mac_clk_tx", &mac_clk_tx) != 0) { + device_printf(dev, "could not get mac_clk_tx clock\n"); + mac_clk_tx = NULL; + } + + if (clk_get_by_ofw_name(dev, 0, "aclk_mac", &aclk_mac) != 0) { + device_printf(dev, "could not get aclk_mac clock\n"); + aclk_mac = NULL; + } + + if (clk_get_by_ofw_name(dev, 0, "pclk_mac", &pclk_mac) != 0) { + device_printf(dev, "could not get pclk_mac clock\n"); + pclk_mac = NULL; + } + + if (aclk_mac) + clk_enable(aclk_mac); + if (pclk_mac) + clk_enable(pclk_mac); + if (mac_clk_tx) + clk_enable(mac_clk_tx); sc->csr_clock = 125000000; sc->csr_clock_range = GMAC_MAC_MDIO_ADDRESS_CR_100_150;