From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B059EC7EE25 for ; Fri, 9 Jun 2023 14:31:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:In-reply-to: Date:Subject:Cc:To:From:References:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+Weq/spuSGlAB3Y/eh0tF3eGDrB+ED98V/OXfu58Z0c=; b=b++ubvCgGeAj5t Zxp/EuonzPpWJ+1E6NwDLioe/ZoR4R4/xJqXdsBpN02UlVphMmkN3aehSTlR7rxSfiHdGU4IRq4c+ G97TG0tFSVoLtO4bSih1ASHi4XKYdkbxlKoDEneOH769kjYNJNK9fd3a7AXfrCYR3AMDbwrO25cqc d70ugAL0GReXLHricnLfY5jN/AY1sMJepsKNqlgzBADKAwlvJfnXlYPzoGBHbezxiK1UIEzgpMt1z MedB0sDk9SnWm8uHhR2IxV5QPoMu87XCeXkXgwM98MebFdgNZ6XFk/e38gEWQr+xTIzccfme1aNSp +TVoDAnWNUGvV7EKR9gA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q7d9G-00DGly-2M; Fri, 09 Jun 2023 14:31:30 +0000 Received: from mail-lf1-x12f.google.com ([2a00:1450:4864:20::12f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q7d9D-00DGkW-0f for linux-arm-kernel@lists.infradead.org; Fri, 09 Jun 2023 14:31:29 +0000 Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-4f4b2bc1565so2346648e87.2 for ; Fri, 09 Jun 2023 07:31:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20221208.gappssmtp.com; s=20221208; t=1686321083; x=1688913083; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:from:to:cc:subject:date:message-id:reply-to; bh=rvKldkKyOEzMjaVgJzIrDpQYw9hrf0Xh92le1NSdGEw=; b=UktX5DCkzRF28DwzEH27lkzst5pNZ/sWkOflvK2OSTWWAk5rI1HApzsZN11Z1LMGre faXb25K0qOHjWhPiTgjp7rSz+gv8fzdWbIvf4ho8ORPJZte7Hae4IQ2+JpChTfyMmoCy mWV6VURFYsjJ9BbBX+kGktXOxS7BrUhaUWdykIlNe+h5mKEj2GLFNU8eqazymqSB2Tjs XcxakgN8hetMGTNtwtKNdI6y7dEBblnTFIgok0/QLo6Ktz69zr/mPpxQJ77z+AR/alY+ f5fmxF7tRWhCnbluS9UWpjx8Q+wzKh/I+Pqj5Y/nCZP1F3VwOGWeiGYAEGu6K6msfJf0 ohYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686321083; x=1688913083; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=rvKldkKyOEzMjaVgJzIrDpQYw9hrf0Xh92le1NSdGEw=; b=Y937XNGnirvB7W42TTLIcGnAYK47Q2cbXB5ndr+xT8RmOR/q9e7lRslAG0tm6bykVU J5tyycLh1yTdkHOQisIX6efl69a87mIAr0gHDlYhxCLQFsWf9vryMvobBX1Vd4vcxyns vcX6DWv+y7wDb51LwAYB1BUNbPF8kCX57X+kVMnuLW8SLoy8rnG/dWYoEIjNT3FiBfH3 yKxOBQMQnHeOqZIGKt9RpUP8SIVzYMWg/bjrwQ0OJNkxAtogJ3SRiHPIq7hLTlKAIz1h tyPHP+S7A8kxS6H0yhKveUdytDwRNz2Hqqi4zV0cR6rToqTjh/X3EPjL28Dp+Nn48FxC X+kA== X-Gm-Message-State: AC+VfDztRXCSTyf7hNP2iTvr8DAz4EwwU8MlHf/ufPHkEvU3RV5fnqtq HZ0DZLU/Sz5FaJaq6s7TaSCuZg== X-Google-Smtp-Source: ACHHUZ65m5AMFmjxrMwWxpXLbpcZF2OPgnMHH0ovUIGyqONAblCOSsCEtrKUzsNS0WEh/UkxuTsNcg== X-Received: by 2002:ac2:5b11:0:b0:4f1:30cc:3dae with SMTP id v17-20020ac25b11000000b004f130cc3daemr1352875lfn.10.1686321083183; Fri, 09 Jun 2023 07:31:23 -0700 (PDT) Received: from localhost (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id e40-20020a5d5968000000b002fda1b12a0bsm4653096wri.2.2023.06.09.07.31.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jun 2023 07:31:22 -0700 (PDT) References: <20230607-topic-amlogic-upstream-clkid-public-migration-v1-0-9676afa6b22c@linaro.org> <20230607-topic-amlogic-upstream-clkid-public-migration-v1-3-9676afa6b22c@linaro.org> <1jlegu9l5d.fsf@starbuckisacylon.baylibre.com> <638206ba-e2da-bb8e-a2e4-138af84648b4@linaro.org> User-agent: mu4e 1.8.13; emacs 28.2 From: Jerome Brunet To: Neil Armstrong , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Subject: Re: [PATCH 03/18] clk: meson: migrate a1 clock drivers out of hw_onecell_data to drop NR_CLKS Date: Fri, 09 Jun 2023 16:30:45 +0200 In-reply-to: <638206ba-e2da-bb8e-a2e4-138af84648b4@linaro.org> Message-ID: <1jwn0c672d.fsf@starbuckisacylon.baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230609_073127_244155_92ECB555 X-CRM114-Status: GOOD ( 21.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu 08 Jun 2023 at 14:53, Neil Armstrong wrote: > On 08/06/2023 14:45, Jerome Brunet wrote: >>> +struct meson_a1_pll_clks { >>> + struct clk_hw **hw_clks; >>> + unsigned int hw_clk_num; >>> +}; >>> + >>> +static struct meson_a1_pll_clks a1_pll_clks = { >>> + .hw_clks = a1_pll_hw_clks, >>> + .hw_clk_num = ARRAY_SIZE(a1_pll_hw_clks), >>> +}; >>> + >>> +static struct clk_hw *meson_a1_pll_hw_get(struct of_phandle_args *clkspec, void *clk_data) >>> +{ >>> + const struct meson_a1_pll_clks *data = clk_data; >>> + unsigned int idx = clkspec->args[0]; >>> + >>> + if (idx >= data->hw_clk_num) { >>> + pr_err("%s: invalid index %u\n", __func__, idx); >>> + return ERR_PTR(-EINVAL); >>> + } >>> + >>> + return data->hw_clks[idx]; >>> +} >> I'd prefer to have a single struct type and and single custom >> callback for the different SoC please. > > Sure, I've written a common code for that, but I have a hard time finding > a proper naming for it... so I choosed meson-clkc since it could have > more common helper code for duplicated code over the clk driver: Agreed. meson-clkc-utils maybe ? > > ===================================><============================================================================ > diff --git a/drivers/clk/meson/Kconfig b/drivers/clk/meson/Kconfig > index 8ce846fdbe43..9070dcfd9e71 100644 > --- a/drivers/clk/meson/Kconfig > +++ b/drivers/clk/meson/Kconfig > @@ -30,6 +30,9 @@ config COMMON_CLK_MESON_VID_PLL_DIV > tristate > select COMMON_CLK_MESON_REGMAP > > +config COMMON_CLK_MESON_CLKC > + tristate > + > config COMMON_CLK_MESON_AO_CLKC > tristate > select COMMON_CLK_MESON_REGMAP > diff --git a/drivers/clk/meson/Makefile b/drivers/clk/meson/Makefile > index d5288662881d..13c6db466986 100644 > --- a/drivers/clk/meson/Makefile > +++ b/drivers/clk/meson/Makefile > @@ -1,6 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0-only > # Amlogic clock drivers > > +obj-$(CONFIG_COMMON_CLK_MESON_CLKC) += meson-clkc.o > obj-$(CONFIG_COMMON_CLK_MESON_AO_CLKC) += meson-aoclk.o > obj-$(CONFIG_COMMON_CLK_MESON_CPU_DYNDIV) += clk-cpu-dyndiv.o > obj-$(CONFIG_COMMON_CLK_MESON_DUALDIV) += clk-dualdiv.o > diff --git a/drivers/clk/meson/meson-clkc.c b/drivers/clk/meson/meson-clkc.c > new file mode 100644 > index 000000000000..fa98b9d09011 > --- /dev/null > +++ b/drivers/clk/meson/meson-clkc.c > @@ -0,0 +1,25 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (c) 2023 Neil Armstrong > + */ > + > +#include > +#include > +#include > +#include "meson-clkc.h" > + > +struct clk_hw *meson_clk_hw_get(struct of_phandle_args *clkspec, void *clk_hw_data) > +{ > + const struct meson_clk_hw_data *data = clk_hw_data; > + unsigned int idx = clkspec->args[0]; > + > + if (idx >= data->num) { > + pr_err("%s: invalid index %u\n", __func__, idx); > + return ERR_PTR(-EINVAL); > + } > + > + return data->hws[idx]; > +} > +EXPORT_SYMBOL_GPL(meson_clk_hw_get); > + > +MODULE_LICENSE("GPL v2"); > diff --git a/drivers/clk/meson/meson-clkc.h b/drivers/clk/meson/meson-clkc.h > new file mode 100644 > index 000000000000..e3bad2aa17eb > --- /dev/null > +++ b/drivers/clk/meson/meson-clkc.h > @@ -0,0 +1,19 @@ > +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ > +/* > + * Copyright (c) 2023 Neil Armstrong > + */ > + > +#ifndef __MESON_HW_CLKC_H__ > +#define __MESON_HW_CLKC_H__ > + > +#include > +#include > + > +struct meson_clk_hw_data { > + struct clk_hw **hws; > + unsigned int num; > +}; > + > +struct clk_hw *meson_clk_hw_get(struct of_phandle_args *clkspec, void *clk_hw_data); > + > +#endif > ===================================><============================================================================ > > If it's ok I'll send a v2 using this. > > Thanks, > Neil _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel