From nobody Thu Sep 21 16:00:20 2023 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 4Rs0VF1WmMz4tcpm; Thu, 21 Sep 2023 16:00:21 +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 4Rs0VF0XY0z4RjZ; Thu, 21 Sep 2023 16:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695312021; 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=WkD0YbV44GliCxqGKA633wPZdjFVCaSh8lh9LIhZGuM=; b=mvmviwA2Ff5xr+ihSQigUQgGvNd+6CX96nHeiQJLVO2xxHeAXfvBtvIhAFVTJ1JxjN+c0N MeASS2/ginl0zpjFclpKnzl8V/2+as/cpQWF/cm7TIAvNQb12LaUrkKlP/L03q7It4vGXA CrS5EvQ9jBcB9kFXjHcr15xD9S/0Os22STNMHu6FZ7RL3a97W34bHHCBLIyMgebjTI8DYz OzCJjd98EXsRRvyo+I/EFgtGZx2Ds4aJE14q+3bUmgemf0lwus1K5mXIROkVoLjV1YOzsF Ygik4246D9TyHYw+yiz9kQ3txS5H15mbA73yQ+cCB5Ru9CG5eHtO7UCETUUn3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695312021; a=rsa-sha256; cv=none; b=U1HU7A69GSVLkVVzT3f5ymunxvoXKu1KyWMwRu62cevF8BFXrx03B2AAz+QFzO2A8U+/Sg z8YKYy6pEsqicOPAUXZuNjHh6pnHfJkRoKtbDaE3Kst8vJAQKtyvU2mjUGh1oUghWhm1X6 OsF9VeSHMZNv6JnSUVuU2UUX2981mBvzpeO9M+PjACZvtpr+ByovaB1ybyGpeSFLRbuhuR ceThcRp3o4xnuqV+NxTvsqWb3q7rM2NylEZ8YHVW3WxL2hb6wyIWN6MBUCKzDdgsy8OZxw ERbVM9izLoa4cJBkLTVICvV/VroxIN1ltqNxRty0KnebGPvbK3udeZxoArF21Q== 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=1695312021; 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=WkD0YbV44GliCxqGKA633wPZdjFVCaSh8lh9LIhZGuM=; b=Sg3CSjMt88VnlVWnlSG6+GsfB7d51KORhnf8n39D9IkN6m5L4ktZgsaVGUcW016GWm2xJF ee14msrijK0lAvjqOMmeCT7jkpPGeHshpYeeDOgFxmElP318dGWf2jil9EzX7qK/7C8f1j rN0wH/kJa8gSr0S/dy+EFraXz6G/CvOQ5vsWFLmlFBWWcACW/mjJ8G+de+va6TCpaFcL0m lTrMjbzbPHWhtgC2oonW843ejJhhCk/ELsw59uEdW6jiZsn31xE9yPRaJ40KNqEUAm6SGF 8PpuToNSW/0q5vUo6O0Tx0vEzbcZBzSU79jQXcbPbfuCYLGXg9dTFfvZmH7a0g== 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 4Rs0VD6YdCzlVd; Thu, 21 Sep 2023 16:00:20 +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 38LG0Kl1050827; Thu, 21 Sep 2023 16:00:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LG0K6k050824; Thu, 21 Sep 2023 16:00:20 GMT (envelope-from git) Date: Thu, 21 Sep 2023 16:00:20 GMT Message-Id: <202309211600.38LG0K6k050824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: db34f02028f3 - main - arm64: rockchip: rk_clk_composite: Remove gate code 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/main X-Git-Reftype: branch X-Git-Commit: db34f02028f30bbf099bf1bce7ce66184f51b332 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=db34f02028f30bbf099bf1bce7ce66184f51b332 commit db34f02028f30bbf099bf1bce7ce66184f51b332 Author: Emmanuel Vadot AuthorDate: 2023-09-21 14:56:16 +0000 Commit: Emmanuel Vadot CommitDate: 2023-09-21 15:49:33 +0000 arm64: rockchip: rk_clk_composite: Remove gate code It was a bad idea to have composite clock directly managing gates. All clocks drivers have been rewrite to not use this functionality and directly export the gate. We can now remove this code. --- sys/arm64/rockchip/clk/rk_clk_composite.c | 31 ------------------------------- sys/arm64/rockchip/clk/rk_clk_composite.h | 8 ++------ 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/sys/arm64/rockchip/clk/rk_clk_composite.c b/sys/arm64/rockchip/clk/rk_clk_composite.c index a04b3aa2193c..a30dadbaf811 100644 --- a/sys/arm64/rockchip/clk/rk_clk_composite.c +++ b/sys/arm64/rockchip/clk/rk_clk_composite.c @@ -48,9 +48,6 @@ struct rk_clk_composite_sc { uint32_t div_width; uint32_t div_mask; - uint32_t gate_offset; - uint32_t gate_shift; - uint32_t flags; struct syscon *grf; @@ -145,30 +142,6 @@ rk_clk_composite_init(struct clknode *clk, device_t dev) return (0); } -static int -rk_clk_composite_set_gate(struct clknode *clk, bool enable) -{ - struct rk_clk_composite_sc *sc; - uint32_t val = 0; - - sc = clknode_get_softc(clk); - - if ((sc->flags & RK_CLK_COMPOSITE_HAVE_GATE) == 0) - return (0); - - dprintf("%sabling gate\n", enable ? "En" : "Dis"); - if (!enable) - val |= 1 << sc->gate_shift; - dprintf("sc->gate_shift: %x\n", sc->gate_shift); - val |= (1 << sc->gate_shift) << RK_CLK_COMPOSITE_MASK_SHIFT; - dprintf("Write: gate_offset=%x, val=%x\n", sc->gate_offset, val); - DEVICE_LOCK(clk); - WRITE4(clk, sc->gate_offset, val); - DEVICE_UNLOCK(clk); - - return (0); -} - static int rk_clk_composite_set_mux(struct clknode *clk, int index) { @@ -320,7 +293,6 @@ rk_clk_composite_set_freq(struct clknode *clk, uint64_t fparent, uint64_t *fout, static clknode_method_t rk_clk_composite_clknode_methods[] = { /* Device interface */ CLKNODEMETHOD(clknode_init, rk_clk_composite_init), - CLKNODEMETHOD(clknode_set_gate, rk_clk_composite_set_gate), CLKNODEMETHOD(clknode_set_mux, rk_clk_composite_set_mux), CLKNODEMETHOD(clknode_recalc_freq, rk_clk_composite_recalc), CLKNODEMETHOD(clknode_set_freq, rk_clk_composite_set_freq), @@ -355,9 +327,6 @@ rk_clk_composite_register(struct clkdom *clkdom, sc->div_width = clkdef->div_width; sc->div_mask = ((1 << clkdef->div_width) - 1) << sc->div_shift; - sc->gate_offset = clkdef->gate_offset; - sc->gate_shift = clkdef->gate_shift; - sc->flags = clkdef->flags; clknode_register(clkdom, clk); diff --git a/sys/arm64/rockchip/clk/rk_clk_composite.h b/sys/arm64/rockchip/clk/rk_clk_composite.h index 79cd3777c84b..22a052da22c2 100644 --- a/sys/arm64/rockchip/clk/rk_clk_composite.h +++ b/sys/arm64/rockchip/clk/rk_clk_composite.h @@ -41,17 +41,13 @@ struct rk_clk_composite_def { uint32_t div_shift; uint32_t div_width; - uint32_t gate_offset; - uint32_t gate_shift; - uint32_t flags; }; #define RK_CLK_COMPOSITE_HAVE_MUX 0x0001 -#define RK_CLK_COMPOSITE_HAVE_GATE 0x0002 -#define RK_CLK_COMPOSITE_DIV_EXP 0x0004 /* Register 0, 1, 2, 2, ... */ +#define RK_CLK_COMPOSITE_DIV_EXP 0x0002 /* Register 0, 1, 2, 2, ... */ /* Divider 1, 2, 4, 8, ... */ -#define RK_CLK_COMPOSITE_GRF 0x0008 /* Use syscon registers instead of CRU's */ +#define RK_CLK_COMPOSITE_GRF 0x0004 /* Use syscon registers instead of CRU's */ int rk_clk_composite_register(struct clkdom *clkdom, struct rk_clk_composite_def *clkdef);