From nobody Fri Oct 3 21:05:40 2025 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 54DAA2FABE3 for ; Mon, 25 Aug 2025 14:27:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756132035; cv=none; b=fou3WoHLsjV9t3f4pzSgLwwkBCcz6l6DXAroidAJVKui760L7RG6pqG/vyQD54wIKzdNNiG8vKIwTH+BkPl3gHjwrYCY83rFE9SNq5MD1lvVwQMCYShMSibHWIUE1xqvBhq9TTv3Ur+u5WONFRnQk1yXwLpi02EdTuQubreU3H8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756132035; c=relaxed/simple; bh=5iKLGNRbAiiV7znNVkmV2nYu93DQzEVzWcxt59v2OQ4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CRlgTWawFSY/dfZRxKGey0VOQ72OICgkKklKksb8/a9KUs8lHxjyU+yWtDbH9klP8C8PWNNBGhiohyNwY1AuWCFBFUk8CF+0argwoBQpGdKIGqd7LN4nPofVimYVRsaKjHh65ro4upswQLhqNASO3qRfIYKFZ6xoKz+RAN/B4tc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=CGbbosqL; arc=none smtp.client-ip=209.85.128.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="CGbbosqL" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-45a1b0c8867so36674015e9.3 for ; Mon, 25 Aug 2025 07:27:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1756132030; x=1756736830; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Q2GKlTQ+1w74j9oubIC+GWZcqnBFxLSwzSHXC6Ex1dU=; b=CGbbosqLriNzDvMfcmkgC8Kxg1Kmgh/PP6PXQ/k9+zGC6CKHChKVyiJWFmJ8XjegOx kljCnu1jLtlRrSNWjWtDJM97pTdTVRmpPaSE7PHZQv5xjmG4c7CBF9FQP3ERy7hn1KmM azcI8ZwzmtubGMdLZpFD0/hUsQ4PcR5AISGfzRNy8UWIKdqrSTOvNQVCan8jzBavq2FO BG+yC9K3ga39D/r+V6sS1bpudKcBeUF2LN8ktamkOst31U1yWETuWxgEDXVsB9RoJrI1 rgtnQlggheNbaAjWTz4+2zf6UITQ8Oua6xE3FbpsF7YFbAkfSfKmaBD5sTxJDLgTqNH/ xj1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756132030; x=1756736830; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Q2GKlTQ+1w74j9oubIC+GWZcqnBFxLSwzSHXC6Ex1dU=; b=esVS/bESIP2pI39JX2EFQ9POYibRB8i2DmemvVUDS1+Re0ADAxOJ9A9Af/SfhSf4xu Mnv+k61+Jy/FYy0zAL0Ywn7T8/ObV65pAwf1amtAVzYSre1Wcof7g5sxzQxK9S5+LrF5 sy2Dz6uDBR1wo0OZgHXdlpEoHEmSSAqhBOibuaWkzHnpvbUPKxGqaTgKCJCyIbT2p9JZ slwjUwEhA5ZlU7xdv4P8drbPZfS7Wl6eUlQZuG/a1NKpa+vNQ1pXlDLmVR2QAQVjbvWC Ho7JPr2U1OI272rqWzVjFRJ6SNfbIWAnA41KmSbY63uz5II2h/SzwSW9LYvvlgIC2DL8 9gKQ== X-Forwarded-Encrypted: i=1; AJvYcCXCg0IfwMhfXUil8Af9R+Jq0diAIdxFODs8lEFrqZ/etwnKXSIPtXF2/E2h+7Y1lhMtjImLYktjFWhnAjY=@vger.kernel.org X-Gm-Message-State: AOJu0YycLPVvm8h63Y3+DT6caMwCuHVd3t32di1Subb0JC7dTdUspECG kZoe/bL/fNgaEieJAaq4HNBPbY6VKxuL3osqOhZ0uP+vOBP1Mm3LwS6nerljy/6uadk= X-Gm-Gg: ASbGncuR9nfiyVJ0G4JT0gJZ6ImIrBCAGnXGB9st6oLLWY8xV9tN7Z+Bq7UvI0lipYc Nnn1DwX0t3VURut4mgUNovRnZ/hei0SwWsva6cksMzi+VzEQE+nP2VZWxKth1miRHTGnFXkVAXZ k8ZDbAFbtVbXNLW6ZJ59uN21CjA4sspdod5s++PDld0x6qOrxPMz/zfs9AkGB8Kx6wcL9AUAEUo OwGTEpr4niWGERr0G2pdoXSbWhZm6bus91Ok9ci0dcSRCMsiLn1Z7D6hr/YmuflXJzHInrL59Nf wbryFKuNFPmdJToef/XX+Sn7xd6t+72lnHziCWM8kpHvivgVsMdAnDRzPMs8ycBP2zl8d6A4oGq gwaipcv53GcYZ/+eJecq8rydDsiM2QufsQOkv X-Google-Smtp-Source: AGHT+IEPylErx21mcn6dCJV2kIoCD0AjzLCCsQU2klZrox1l+K+hy+rzX244+vSFz6N2S3mmScUSPg== X-Received: by 2002:a05:600c:1c20:b0:458:c059:7d9c with SMTP id 5b1f17b1804b1-45b5d48ea24mr53620055e9.6.1756132029678; Mon, 25 Aug 2025 07:27:09 -0700 (PDT) Received: from toaster.baylibre.com ([2a01:e0a:3c5:5fb1:b261:baab:ed3d:3cb6]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-3c70e4b9e1fsm12634462f8f.14.2025.08.25.07.27.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Aug 2025 07:27:09 -0700 (PDT) From: Jerome Brunet Date: Mon, 25 Aug 2025 16:26:30 +0200 Subject: [PATCH v2 05/12] clk: amlogic: move PCLK definition to clkc-utils Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250825-meson-clk-cleanup-24-v2-5-0f402f01e117@baylibre.com> References: <20250825-meson-clk-cleanup-24-v2-0-0f402f01e117@baylibre.com> In-Reply-To: <20250825-meson-clk-cleanup-24-v2-0-0f402f01e117@baylibre.com> To: Neil Armstrong , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl Cc: linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Jerome Brunet X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2901; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=5iKLGNRbAiiV7znNVkmV2nYu93DQzEVzWcxt59v2OQ4=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBorHKy/cxvrqriA5RdgyQ8kngzsTGP4zIGETSvr bPIwwN/D/KJAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCaKxysgAKCRDm/A8cN/La hU6YD/9847LKHLtfPFP+98FtM+A/KPHuOXabho5DnlqQ4CTQm7TeTEECumy3BR3ViDcUWqmul6J mOcnAQ4VD/PQx47DoisFdLoyRgVYGi41vm/px3GlkNoiAoMuIbOQ1S7mK7b6Yo3bd6TARrh1yxI b2bXFz9x0w3hWAGTTBsDXfCyBWlUdRvSRosLINDT4bw/hFcnRljMaFx0C+8oFUMrGeKc/tblNsW evuqJI1g7805n992YNyaRg5OxHvkNzgwese6m7LyB+o/q/DBxPLzJuXypikMS8Ua0zCnPMMP+eO n5tt6cqV5DhMhAVE0bLvTxxvCRmGJZFGpe4wXSUCxZWiY08A4hLI5PVUPlnvM6l+lUOmtXU8uL1 lVd2y0PMtirwjQ7nyoy+FY5p8EeTpFii3D3a5Mq/tgwGDGIxQUE2C0FY85NTUFd6VedNMh1I3UF TnAqB5i+e8vakFIzBsJU4UQXdaVIYqfYkNTOKwq8YKN8s1TMTtFoYnH42Z4WqzK6aQ+KvoG74ZT PwROguP/QnE9zU1S4moPZwFjiYu7Kizf0I+hI5n5/TluEiSwbiXyLsUBYSbqzbdDvCYEDjqX09N zB7S+wUEQ/EO+L1pciA2bfTKsUvEZWtLYGqUyQ7LUn774lybqO7VWYI9hiMuUBE6AHgYh/C/37T pqUsLmEEHRMIMPg== X-Developer-Key: i=jbrunet@baylibre.com; a=openpgp; fpr=F29F26CF27BAE1A9719AE6BDC3C92AAF3E60AED9 clk-regmap was always meant to stay generic, without any amlogic specifics. The hope was that it could move out of the amlogic directory one day. Even if this may actually not become true, it should remain generic. Move the amlogic peripheral clock definition out of clk-regmap header. Signed-off-by: Jerome Brunet --- drivers/clk/meson/clk-regmap.h | 20 -------------------- drivers/clk/meson/meson-clkc-utils.h | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/drivers/clk/meson/clk-regmap.h b/drivers/clk/meson/clk-regmap.h index f8cac2df5755b0f894570305604485f54c17ea49..8e5c39b023e1334e37d5a9e0594= 436727f16c4f2 100644 --- a/drivers/clk/meson/clk-regmap.h +++ b/drivers/clk/meson/clk-regmap.h @@ -118,24 +118,4 @@ clk_get_regmap_mux_data(struct clk_regmap *clk) extern const struct clk_ops clk_regmap_mux_ops; extern const struct clk_ops clk_regmap_mux_ro_ops; =20 -#define __MESON_PCLK(_name, _reg, _bit, _ops, _pname) \ -struct clk_regmap _name =3D { \ - .data =3D &(struct clk_regmap_gate_data){ \ - .offset =3D (_reg), \ - .bit_idx =3D (_bit), \ - }, \ - .hw.init =3D &(struct clk_init_data) { \ - .name =3D #_name, \ - .ops =3D _ops, \ - .parent_hws =3D (const struct clk_hw *[]) { _pname }, \ - .num_parents =3D 1, \ - .flags =3D (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED), \ - }, \ -} - -#define MESON_PCLK(_name, _reg, _bit, _pname) \ - __MESON_PCLK(_name, _reg, _bit, &clk_regmap_gate_ops, _pname) - -#define MESON_PCLK_RO(_name, _reg, _bit, _pname) \ - __MESON_PCLK(_name, _reg, _bit, &clk_regmap_gate_ro_ops, _pname) #endif /* __CLK_REGMAP_H */ diff --git a/drivers/clk/meson/meson-clkc-utils.h b/drivers/clk/meson/meson= -clkc-utils.h index b45f85f630d7190fb6509b088f05f17ca91fa1c8..0c228a6723bb2bddc0b9a4f9251= 5f05850a5613a 100644 --- a/drivers/clk/meson/meson-clkc-utils.h +++ b/drivers/clk/meson/meson-clkc-utils.h @@ -27,4 +27,25 @@ struct meson_clkc_data { int meson_clkc_syscon_probe(struct platform_device *pdev); int meson_clkc_mmio_probe(struct platform_device *pdev); =20 +#define __MESON_PCLK(_name, _reg, _bit, _ops, _pname) \ +struct clk_regmap _name =3D { \ + .data =3D &(struct clk_regmap_gate_data) { \ + .offset =3D (_reg), \ + .bit_idx =3D (_bit), \ + }, \ + .hw.init =3D &(struct clk_init_data) { \ + .name =3D #_name, \ + .ops =3D _ops, \ + .parent_hws =3D (const struct clk_hw *[]) { _pname }, \ + .num_parents =3D 1, \ + .flags =3D (CLK_SET_RATE_PARENT | CLK_IGNORE_UNUSED), \ + }, \ +} + +#define MESON_PCLK(_name, _reg, _bit, _pname) \ + __MESON_PCLK(_name, _reg, _bit, &clk_regmap_gate_ops, _pname) + +#define MESON_PCLK_RO(_name, _reg, _bit, _pname) \ + __MESON_PCLK(_name, _reg, _bit, &clk_regmap_gate_ro_ops, _pname) + #endif --=20 2.47.2