From nobody Mon May 16 15:33:33 2022 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 43B7B1AE60E4; Mon, 16 May 2022 15:33:35 +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 4L23Dt47djz3rVM; Mon, 16 May 2022 15:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652715214; 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=Y76xbK1BekijZZ96pzahKScr/2pHlVwyUH18F9+c82A=; b=hPj6dSHfel1G1VoUDuoRJ4huy0Wz5rVf5JUHZA/Z41kSPh8ejEMzrZ5mopacFKrrJM71b7 29YGA01Kf888AYoX5/nxaKgx0kepleuyXYNGSOP+1H2pFw9zqFh/8GDhAFN+ZGh51hqf48 D5yzA2IRYBkhHhd850QDGSZTfsU+U2RxD5tXSeu/7vQrWCIzwcKR2zFyyoc1FEq3ISw1IJ 28spfh4GnotjRQsqvhLxi9KCSUn0zhDYZQnCEPkbpDoGJZeFUFtK+7NIlcIzkQcjyTwY7h QjqFFTHRFg+aSX31MWOqQrV8sY2F8dQg1X1OWko8lcRH7M1G8tGJHGK9shKf1g== 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 4441D22A44; Mon, 16 May 2022 15:33:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24GFXXbM020150; Mon, 16 May 2022 15:33:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GFXXAL020149; Mon, 16 May 2022 15:33:33 GMT (envelope-from git) Date: Mon, 16 May 2022 15:33:33 GMT Message-Id: <202205161533.24GFXXAL020149@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: 77fbd51e83e0 - stable/13 - arm64: rockchip: clk: Add MUXRAW macros 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 77fbd51e83e044343201abff3da9ce7d33def806 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652715214; 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=Y76xbK1BekijZZ96pzahKScr/2pHlVwyUH18F9+c82A=; b=V/AFwQJDVsEEgPeBP52G9W77m1ah6lnZutizwwys48m6nC3G46Ld7es39b899DPsxCwvlE 1FHBBeT9OeYgyUKryMJneFdUMqFIWBT8SmAf8xKCAMQ/41/Y7n0/Q8027zPFzQaUmrV+un HwWpQwjeN++NHzOGRiUrazn1GVfqt7xMTb2tCrOaBJTarASa1X7pAqUkP+dV/kjnRaAunH xWU/81sisWXmSciSamWedjuKQNvn6hYKMnSrNgfR2+Y7bMfPGtJCrqAFNhjWY96qbONkf0 P7R8HhPanVLs+GesRFRRfSFnvOOTkJMpjEKuiCaHuwh5TIWVju0CHx8tz1nXwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652715214; a=rsa-sha256; cv=none; b=wkq5e3ogIsVfM3JnwEZX4UFg+qalyjAISyYzKLl3vb5O4ZsG6VSyhArFzl6mw2AGnGOpHX lIg3XWjMRB5GINAXT0RCEUmfBIivbxVTtvJ/HylcfpjwiiTdUBodnXyh0uwukcbPobOdEy o771hqANY61ctEMk5GnW2ULqkUKAcqM71BATG4uylBh/O9ZFyrfESjKcI7/AqyCu1ydPN2 bMhn8el+h6TQpncwlJNCTL0YVbkg+Pkhv7WKG79k/C1qA7ThMoZeV2AG16QxtjU4WhHbAa IFC7p4BuWj6SFbUzRRoEeNtKzc+d4Z1rRO08WciStUtB9EkxBihjthrAvt7btA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=77fbd51e83e044343201abff3da9ce7d33def806 commit 77fbd51e83e044343201abff3da9ce7d33def806 Author: Emmanuel Vadot AuthorDate: 2021-09-15 16:25:09 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 15:27:23 +0000 arm64: rockchip: clk: Add MUXRAW macros Some clocks in the RK3328 SoC (and possibly others) have registers not in the CLKSEL_CON range. Add a macros for muxes which lives not in the range of CLKSEL_CON which just takes a raw offset. (cherry picked from commit deff1fb3dccb13b6961b1e8595f74a2134e65b93) --- sys/arm64/rockchip/clk/rk_cru.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk_cru.h b/sys/arm64/rockchip/clk/rk_cru.h index 1c749d1d2c87..fc838fc11d19 100644 --- a/sys/arm64/rockchip/clk/rk_cru.h +++ b/sys/arm64/rockchip/clk/rk_cru.h @@ -170,7 +170,7 @@ } /* Complex clock without divider (multiplexer only). */ -#define MUX(_id, _name, _pn, _f, _mo, _ms, _mw) \ +#define MUXRAW(_id, _name, _pn, _f, _mo, _ms, _mw) \ { \ .type = RK_CLK_MUX, \ .clk.mux = &(struct rk_clk_mux_def) { \ @@ -179,13 +179,16 @@ .clkdef.parent_names = _pn, \ .clkdef.parent_cnt = nitems(_pn), \ .clkdef.flags = CLK_NODE_STATIC_STRINGS, \ - .offset = CRU_CLKSEL_CON(_mo), \ + .offset = _mo, \ .shift = _ms, \ .width = _mw, \ - .mux_flags = _f, \ + .mux_flags = _f, \ }, \ } +#define MUX(_id, _name, _pn, _f, _mo, _ms, _mw) \ + MUXRAW(_id, _name, _pn, _f, CRU_CLKSEL_CON(_mo), _ms, _mw) + /* Complex clock without divider (multiplexer only in GRF). */ #define MUXGRF(_id, _name, _pn, _f, _mo, _ms, _mw) \ { \