From nobody Sun Feb 8 02:56:25 2026 Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5C271E04AD; Thu, 8 May 2025 18:28:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.11.138.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746728897; cv=none; b=LwjBUxQuBD8nxHPVnNg2gmjAuwrhxx+oMR7OjE5bEPOVfkk9PfZIuJyWNzKrni+/1IsezcpvI4gGXlNMB21WID4FMmExzHO+u0T2bO7tmV3u4BCW3LZUMzHMnCctj5pMQu8qfqK2t7Js3twYCROsujduG+1PVmYcXdXPbuwYsrk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746728897; c=relaxed/simple; bh=lRNSuFsvOgZ4UqDQeqtxP8fgcgN/owzh/0Z7bYyI8Wc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fL8Sxt2MSJ5D61IO8bmfKmgcChB62lizCbl3Hc1PUkpXdtS1vH6tZw1VCIm/WeAraM2fcJ72pyg9+ylXKwxQLlQOydyf+AnSgcXfFh1fYS9TGCbi+vArqPkRTpfIs9K+BJz2iGz+WDlZpoQdoelAbmbYM+9guEImHYKmyNeSgIk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de; spf=pass smtp.mailfrom=sntech.de; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b=xMuh4m8v; arc=none smtp.client-ip=185.11.138.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sntech.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b="xMuh4m8v" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sntech.de; s=gloria202408; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID; bh=KjYRtbjWqAvWZ/pwyzxlcCtsJ0lfYFeBiDdS56U82xM=; b=xMuh4m8vnWtpTky5xSEd9kPaa8 wiPiezGc2EoHGucp++SgSrEUhJYFVSS2saHA8tRoQ1jW6S+ESdZUOCipvhze/FNqw3N9P823No91o EI7gaks9fr0s/HDP+mxGKfpsA8uab7U5og5OTG1Xo1AyJUhdHhiE5wM0L1de1lTcKCjbQNr3hRJtY BmnW+2K9d2RtQTztxE6nNojKl3ubTD9v4+wcp+xa9QHMzr0HveQiORfyuVMfqEOsxcsexD/9qKnPL IDLX8n81vN65KGjOafwcKArvMp62lYl/iuXIqRBpNhpulfuBSse7fZvv9PqJcSa2Y7KJifbJgowj6 UO/XHvsw==; Received: from [61.8.144.177] (helo=localhost.localdomain) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1uD5yb-0000tP-62; Thu, 08 May 2025 20:28:09 +0200 From: Heiko Stuebner To: heiko@sntech.de Cc: mturquette@baylibre.com, sboyd@kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, nicolas.frattaroli@collabora.com Subject: [PATCH 1/2] clk: rockchip: rename branch_muxgrf to branch_grf_mux Date: Thu, 8 May 2025 20:27:51 +0200 Message-ID: <20250508182752.1925313-2-heiko@sntech.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250508182752.1925313-1-heiko@sntech.de> References: <20250508182752.1925313-1-heiko@sntech.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" We now have a number of new branch-types coming from the "General Register Files" (gates and mmc phase clocks). Their naming as branch_grf_foo is way nicer, so rename the old branch_muxgrf to a similar scheme. Signed-off-by: Heiko Stuebner --- drivers/clk/rockchip/clk.c | 4 ++-- drivers/clk/rockchip/clk.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c index 43d7ed5c3418..b140412df65a 100644 --- a/drivers/clk/rockchip/clk.c +++ b/drivers/clk/rockchip/clk.c @@ -509,7 +509,7 @@ void rockchip_clk_register_branches(struct rockchip_clk= _provider *ctx, clk =3D NULL; =20 /* for GRF-dependent branches, choose the right grf first */ - if ((list->branch_type =3D=3D branch_muxgrf || + if ((list->branch_type =3D=3D branch_grf_mux || list->branch_type =3D=3D branch_grf_gate || list->branch_type =3D=3D branch_grf_mmc) && list->grf_type !=3D grf_type_sys) { @@ -540,7 +540,7 @@ void rockchip_clk_register_branches(struct rockchip_clk= _provider *ctx, list->mux_shift, list->mux_width, list->mux_flags, &ctx->lock); break; - case branch_muxgrf: + case branch_grf_mux: clk =3D rockchip_clk_register_muxgrf(list->name, list->parent_names, list->num_parents, flags, grf, list->muxdiv_offset, diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h index 10be168f49e3..1e9c3c0d31e3 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h @@ -664,7 +664,7 @@ struct clk *rockchip_clk_register_gate_grf(const char *= name, enum rockchip_clk_branch_type { branch_composite, branch_mux, - branch_muxgrf, + branch_grf_mux, branch_divider, branch_fraction_divider, branch_gate, @@ -943,7 +943,7 @@ struct rockchip_clk_branch { #define MUXGRF(_id, cname, pnames, f, o, s, w, mf, gt) \ { \ .id =3D _id, \ - .branch_type =3D branch_muxgrf, \ + .branch_type =3D branch_grf_mux, \ .name =3D cname, \ .parent_names =3D pnames, \ .num_parents =3D ARRAY_SIZE(pnames), \ --=20 2.47.2 From nobody Sun Feb 8 02:56:25 2026 Received: from gloria.sntech.de (gloria.sntech.de [185.11.138.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D5BC41990A7; Thu, 8 May 2025 18:28:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.11.138.130 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746728896; cv=none; b=B04s6ZiXmCkspsRjmXkD3n8NmX8eRFiz0HDJzr4hfGdZJoXppDHNZzxglwGO639ukrDPuZIHDwYxd7QLKK39w0kQvstF2tlvrGssfq09a1aXw9UzD9EtesGzKRhy2Zgpe7mCFNTCpD6K/uwpMb4CmU5UAbG5Rb7Cx9ju6orx5Vo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746728896; c=relaxed/simple; bh=Rbbm4ITiWKNaolotmvxv7JTev0kRr/s6YWwpbyMav5o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n3w/UWu7ln8zzIMKnU9RI13Iy6rvx979hY5YBG32nwYvif/MDdpcSlLG0Okl41aKrrYJGRrgC7tbNi1LX0fAh7stx+QVb7Kiwb1YsaxD/H8uuKEitm4RA3UXJZPCIxJcBxQe52OgTZPfeEiZQw+SXWS1vTgoITJtlF+PO5etC0Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de; spf=pass smtp.mailfrom=sntech.de; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b=QpcOgrgt; arc=none smtp.client-ip=185.11.138.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=sntech.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=sntech.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=sntech.de header.i=@sntech.de header.b="QpcOgrgt" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sntech.de; s=gloria202408; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID; bh=9URX2g2bLrhkgpjZmXJowFGtvU2zsLAihvZ4yWH4FH0=; b=QpcOgrgtM1z4rr7pYPCegX05KV hrm8GBC1By1IIeARcq4yyi8+2teu4lr6v6pk09sunHGnvqRZl+Rjk5E3x2Wp8MUEpmEGt2ocuRxdx v18q47cMkFhnwwtCKu52PTsVtvPQ4HhvvFIKVLDF6YcZ9KEYWKQNyuB9bNaHBF90+zg12gU6nlpUq zFwQObMmdPPJgc/Ah9grzicDMKr15RxX+erpvjUPEDe+HrzZQV6MGjtu5W8xNzzNJSiEoV7Xr7Yhp lf5BN5RjeS+uGMIsiHxqR8bTdgWreVdrptxrjQI1xhx4JcdTQUb8EvMnn4IFxbr3vgw5ezPWtIcNF TC3Y65Cw==; Received: from [61.8.144.177] (helo=localhost.localdomain) by gloria.sntech.de with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1uD5yb-0000tP-PT; Thu, 08 May 2025 20:28:09 +0200 From: Heiko Stuebner To: heiko@sntech.de Cc: mturquette@baylibre.com, sboyd@kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, nicolas.frattaroli@collabora.com Subject: [PATCH 2/2] clk: rockchip: rename gate-grf clk file Date: Thu, 8 May 2025 20:27:52 +0200 Message-ID: <20250508182752.1925313-3-heiko@sntech.de> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250508182752.1925313-1-heiko@sntech.de> References: <20250508182752.1925313-1-heiko@sntech.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" All Rockchip clock types live in files starting with clk-foo, so rename the newly added gate-grf-clock to follow that scheme. Signed-off-by: Heiko Stuebner --- drivers/clk/rockchip/Makefile | 2 +- drivers/clk/rockchip/{gate-grf.c =3D> clk-gate-grf.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename drivers/clk/rockchip/{gate-grf.c =3D> clk-gate-grf.c} (100%) diff --git a/drivers/clk/rockchip/Makefile b/drivers/clk/rockchip/Makefile index f0e0b2c6e876..c281a9738d9f 100644 --- a/drivers/clk/rockchip/Makefile +++ b/drivers/clk/rockchip/Makefile @@ -8,13 +8,13 @@ obj-$(CONFIG_COMMON_CLK_ROCKCHIP) +=3D clk-rockchip.o clk-rockchip-y +=3D clk.o clk-rockchip-y +=3D clk-pll.o clk-rockchip-y +=3D clk-cpu.o +clk-rockchip-y +=3D clk-gate-grf.o clk-rockchip-y +=3D clk-half-divider.o clk-rockchip-y +=3D clk-inverter.o clk-rockchip-y +=3D clk-mmc-phase.o clk-rockchip-y +=3D clk-muxgrf.o clk-rockchip-y +=3D clk-ddr.o clk-rockchip-y +=3D gate-link.o -clk-rockchip-y +=3D gate-grf.o clk-rockchip-$(CONFIG_RESET_CONTROLLER) +=3D softrst.o =20 obj-$(CONFIG_CLK_PX30) +=3D clk-px30.o diff --git a/drivers/clk/rockchip/gate-grf.c b/drivers/clk/rockchip/clk-gat= e-grf.c similarity index 100% rename from drivers/clk/rockchip/gate-grf.c rename to drivers/clk/rockchip/clk-gate-grf.c --=20 2.47.2