From nobody Tue Apr 08 03:47:27 2025 X-Original-To: dev-commits-src-all@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 4ZWsTq6gJ0z5sgPT; Tue, 08 Apr 2025 03:47:27 +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 4ZWsTq4plrz45V8; Tue, 08 Apr 2025 03:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744084047; 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=4xOldjdueyI00o6/j79lWB4DTTRDpKOTzFQJ+kK5G/Y=; b=Og7b3+FzJ8EUQA92PyikQriAkqvky5V3eW9sZ2e14CaCS5lFd7e937wP1vOc1Xg3d6/SEG zCbCQOW1ABRUu3INsCrclvWLNKTf94OVnfNXHh+ZrX/gs3JBf2ZTnlD+G8+rEBbFFCtzpf wTgy7pHoCDoocEhHs/7kAWevfjaQ+TRVXP0iwFUUpsL2DUI/wl0sve+WOCNcOU73KBlNKi hycSmzHh6S0VUkrQItT3v+rMR7syBYSErSgK4SVfSB7F4qgGtGXFBm+5s7YamguOI9o6U6 CsoTA8NnEcuqHK+lOfGvwLc/x3s9c/E/udjO3G2zO3J9DQwP26cu7qEnT3wMrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744084047; a=rsa-sha256; cv=none; b=nh9PsDlb+zyREiaEjuwYX3YAv9/gNRebbpJ2pu1Ew1V5q+D/jQslYdFNN2cb9GAHfCl5Pa 8QfQE3dzHcexXH6jQTcrpmjucXh1beE0bMinHtWQRTStmhEWWfNHDpxTQydrVxN/Jfmt9r d7pEKzAF1RLqc9X9BKcBkONDx+VaKc/EDnJOEtH/cMGdVSSwfgQvkLxTMxpO0KEUAXPmaL oVE0B140JW7HXG0uJwKyRVs1g/OeztF/bTEQxkhFFtOIRerezTvZecvfcNmJ9FN6via4it kc5PrgXfoaNDcMOsXJA7eFTNI1jZD2acsArSPvrHwWPMkt0fNLwpuWPOLZTzSg== 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=1744084047; 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=4xOldjdueyI00o6/j79lWB4DTTRDpKOTzFQJ+kK5G/Y=; b=YzPRHEzOAOHWJMF+rJjGyfrNvdgokpFE9BwPc1H/oD3CXodLomx7rA7CcH90lSNLfEIkdU B/j0n/SGwGiUXJSyl23RLD2hewHNA/u0qC9UsaDLyJwgJ1zDntgdIQSzuVWFxGknedxAcG 1h0qvi661wHh0OcJn1ab8pWW2tbt7n37rk4aMqeXuFtGJFAjU3kftOIbiu1BOP0GV7ra1S 4SYmL8n0vp9+5VqiwsuZ9Z0pTrY7LxOnwIs/IPRSgmWSR2hkRwt4RffTCwFa8O4g9visEL NWFXDAyH9kmQb1GHsfADSQoyOkjkIkdAauegkTcucwOQQjfSa3zKI1gvFMBCyA== 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 4ZWsTq3qHszqx; Tue, 08 Apr 2025 03:47:27 +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 5383lRft016645; Tue, 8 Apr 2025 03:47:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5383lR0Y016641; Tue, 8 Apr 2025 03:47:27 GMT (envelope-from git) Date: Tue, 8 Apr 2025 03:47:27 GMT Message-Id: <202504080347.5383lR0Y016641@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Adrian Chadd Subject: git: dc1d78b2c2d2 - main - qcom_dwc3: update naming to match the later device tree drops. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adrian X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc1d78b2c2d293565017542006aeaed64a390196 Auto-Submitted: auto-generated The branch main has been updated by adrian: URL: https://cgit.FreeBSD.org/src/commit/?id=dc1d78b2c2d293565017542006aeaed64a390196 commit dc1d78b2c2d293565017542006aeaed64a390196 Author: Adrian Chadd AuthorDate: 2025-04-05 20:30:13 +0000 Commit: Adrian Chadd CommitDate: 2025-04-08 03:45:07 +0000 qcom_dwc3: update naming to match the later device tree drops. The device tree renamed master -> core, so rename the fields here. Locally tested: * IPQ4019, ASUS RT-AC58U, USB works (enough for umass!) Differential Revision: https://reviews.freebsd.org/D49684 Reviewed by: manu --- sys/dev/qcom_dwc3/qcom_dwc3.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/qcom_dwc3/qcom_dwc3.c b/sys/dev/qcom_dwc3/qcom_dwc3.c index 5c5a47989441..7352d658d326 100644 --- a/sys/dev/qcom_dwc3/qcom_dwc3.c +++ b/sys/dev/qcom_dwc3/qcom_dwc3.c @@ -58,7 +58,7 @@ static struct ofw_compat_data compat_data[] = { struct qcom_dwc3_softc { struct simplebus_softc sc; device_t dev; - clk_t clk_master; + clk_t clk_core; clk_t clk_sleep; clk_t clk_mock_utmi; int type; @@ -98,8 +98,8 @@ qcom_dwc3_attach(device_t dev) sc->type = ofw_bus_search_compatible(dev, compat_data)->ocd_data; /* Mandatory clocks */ - if (clk_get_by_ofw_name(dev, 0, "master", &sc->clk_master) != 0) { - device_printf(dev, "Cannot get master clock\n"); + if (clk_get_by_ofw_name(dev, 0, "core", &sc->clk_core) != 0) { + device_printf(dev, "Cannot get core clock\n"); return (ENXIO); } @@ -121,10 +121,10 @@ qcom_dwc3_attach(device_t dev) /* * Now, iterate over the clocks and enable them. */ - err = clk_enable(sc->clk_master); + err = clk_enable(sc->clk_core); if (err != 0) { device_printf(dev, "Could not enable clock %s\n", - clk_get_name(sc->clk_master)); + clk_get_name(sc->clk_core)); return (ENXIO); } err = clk_enable(sc->clk_sleep);