From patchwork Fri Mar 21 15:18:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 14025670 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 EFADAC36002 for ; Fri, 21 Mar 2025 15:20:00 +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:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XnGXZngf5Ja60KGy3wb74S8ZFjSp3TMv0KqNFaN07jo=; b=E55+PMeyej4wvW SWf+065uOd/TeVC2RBat5Qw0bKc4Js6ibaa9Gn+vey1CpHtC62nCRqXKCGHydwNIEDdIawGkykm7X /dnVbqKHQXh8g33bOUTATLqUFFuTB+RgAdD8icNVK1U6wzGbCFjz8pL4dChSt0jHnlN+g0KSMPAlE J4xGax27AkSxHDmmOVD1x9jUUXXQvY+QfMgvmeO3Vtor5saUFJdZk8MWWvKnh34biQf2oXXZVADSq Zn7uT9V6m7tvZRaqmryL65dwxlRqj6m2wYtQd2XABsFJcUnecOChO25FiXmluQbmaF8RUfqQaGwqX knHis3AlmBE+7bU5kJXw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tveA5-0000000FHax-1VuA; Fri, 21 Mar 2025 15:19:53 +0000 Received: from mail-il1-x135.google.com ([2607:f8b0:4864:20::135]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tve8t-0000000FHLL-0dNo for linux-riscv@lists.infradead.org; Fri, 21 Mar 2025 15:18:40 +0000 Received: by mail-il1-x135.google.com with SMTP id e9e14a558f8ab-3ce868498d3so7107375ab.3 for ; Fri, 21 Mar 2025 08:18:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1742570318; x=1743175118; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+8oqjEMMafA14xwGBAA8P5aE0E7j2tKNWQP5nX11uxM=; b=pL6mo4sE7Qd9CCtY9ipMK+FCWQONulE2gM0JyCejg4TS/0Np6LhdP2vIEDRhM31Bpo lJGvS+A+wfXocJHrlT71KJdNkDJPwCSuhB/HJ42NEQxyC4OdyK+QLHRwyFDOQ++FOYRZ FwrRkOCvIODksLr7a93f0B6H9weUKkQ7cSkK9gCGmreH4ww3SeSwxZtuEzwGH8G72bX1 QvHRr1+Ve9WUsweJcK7WVAwt7tiZeQHp6DjL6guP98C4lOzX0LTLoDXoN5m/e52AA85Z 0/HpDJkf6ERx066MO4qL1YhGE/FzOEPxOIL2u9dtZ7VdpiGgLe0YpaWcgZxS9tt0SeaF Uvtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742570318; x=1743175118; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+8oqjEMMafA14xwGBAA8P5aE0E7j2tKNWQP5nX11uxM=; b=nVwGwT8olFwEE4by2c+UIw19ObXfbhfUglepfa8G8mYmrBOApv1/quJ4LS1PiJOnLj Hj+HGC44SgbTwL49SKAsmEubCorjG3cH8K9jdYwEN7OSrdBqHqTY+M8z4PIIce500Hh3 ISKk6llNDCGL2DEICVXkEAQ+Yrc03wRw3CmbyIkxqTRrXJsjpTsnZxopsjnDg3vfjm6c cF41w7vNQI4Scnu3L4dC8jegGGcCyoGT//81oYx15p11wt0yHudCv70z2rU9feTyEphO IgMSJ8SnqqDhoOPfCDTUJcwks8ObKUKcyN3q5MBBQI/3RLnLI3m5q1L+YcMLYfUPuh3B gDyw== X-Forwarded-Encrypted: i=1; AJvYcCWVyW7NCP6Ityh4CW7zCWgWLL/1S/lWNKYhTfEb5EVNeLpjtZZBoYrW8oyezafHLaBrSa2ekGY/6AYMnQ==@lists.infradead.org X-Gm-Message-State: AOJu0YxRahyc9s3bdrVUjC2qmuF9kSMlPLTErjmTs7fPQZi34Ec4UIkd OOvBMSOSsGo0XvXNisolP9UoDqe/b2eP0dwb603AFJprEHI6GXCpOwR8AQdmVjI= X-Gm-Gg: ASbGncueFLr2P1mx7uQ2a1EI8bnkNotf2o3tsEWuxvIwv+SD2/ei9wVC1c2Sbj7LXCr PrX+miVxD3wZTTsIAZIckETdvBn6XIRRAonhbSedddDnCznhXlfmchn0wKm7msboAUZYdaOWWwD KgS/GAwkEZYi1Xw028AFLQmRatOtVyXPy3WRwFP6tcy2dVEBZ4+P4D7k2zhObWQx5MnoKsQ+foy EXi0L9KGHSBs+RFS6zkbtXcJoxLnk1FhulyLkqBJh6U2XILU+ew1A8hSmeZi47oDuyaGRZTtQaO 1b8gvVuJhpq3kKG5XQv/1sEV9f3j9eWv6SusaYq0a81QaCkgBYfOBs6W82uXuMvZFpo36nv6fbq A81uJqqNaORW59VB37053nmsD X-Google-Smtp-Source: AGHT+IHxbdcOPqhKYJ0+FGJjjIoQPFJNqCEO48X21wDnTd2u/d1IQvQYx7rVdqkDuvFrmILGMVLeyA== X-Received: by 2002:a05:6e02:144e:b0:3d4:3eed:2755 with SMTP id e9e14a558f8ab-3d596108882mr41447845ab.12.1742570317784; Fri, 21 Mar 2025 08:18:37 -0700 (PDT) Received: from zoltan.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f2cbdd0a21sm475553173.41.2025.03.21.08.18.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Mar 2025 08:18:37 -0700 (PDT) From: Alex Elder To: p.zabel@pengutronix.de, mturquette@baylibre.com, sboyd@kernel.org, dlan@gentoo.org Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, heylenay@4d2.org, guodong@riscstar.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, spacemit@lists.linux.dev, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH RESEND 2/7] clk: spacemit: define struct k1_ccu_data Date: Fri, 21 Mar 2025 10:18:25 -0500 Message-ID: <20250321151831.623575-3-elder@riscstar.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250321151831.623575-1-elder@riscstar.com> References: <20250321151831.623575-1-elder@riscstar.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250321_081839_184949_E7641F6B X-CRM114-Status: GOOD ( 17.83 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Define a new structure type to be used for describing the OF match data. Rather than using the array of spacemit_ccu_clk structures for match data, we use this structure instead. Move the definition of the spacemit_ccu_clk structure closer to the top of the source file, and add the new structure definition below it. Shorten the name of spacemit_ccu_register() to be k1_ccu_register(). Signed-off-by: Alex Elder --- drivers/clk/spacemit/ccu-k1.c | 58 ++++++++++++++++++++++++++--------- 1 file changed, 43 insertions(+), 15 deletions(-) diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c index 44db48ae71313..f7367271396a0 100644 --- a/drivers/clk/spacemit/ccu-k1.c +++ b/drivers/clk/spacemit/ccu-k1.c @@ -129,6 +129,15 @@ #define APMU_EMAC0_CLK_RES_CTRL 0x3e4 #define APMU_EMAC1_CLK_RES_CTRL 0x3ec +struct spacemit_ccu_clk { + int id; + struct clk_hw *hw; +}; + +struct k1_ccu_data { + struct spacemit_ccu_clk *clk; /* array with sentinel */ +}; + /* APBS clocks start */ /* Frequency of pll{1,2} should not be updated at runtime */ @@ -1359,11 +1368,6 @@ static CCU_GATE_DEFINE(emmc_bus_clk, CCU_PARENT_HW(pmua_aclk), 0); /* APMU clocks end */ -struct spacemit_ccu_clk { - int id; - struct clk_hw *hw; -}; - static struct spacemit_ccu_clk k1_ccu_apbs_clks[] = { { CLK_PLL1, &pll1.common.hw }, { CLK_PLL2, &pll2.common.hw }, @@ -1403,6 +1407,10 @@ static struct spacemit_ccu_clk k1_ccu_apbs_clks[] = { { 0, NULL }, }; +static const struct k1_ccu_data k1_ccu_apbs_data = { + .clk = k1_ccu_apbs_clks, +}; + static struct spacemit_ccu_clk k1_ccu_mpmu_clks[] = { { CLK_PLL1_307P2, &pll1_d8_307p2.common.hw }, { CLK_PLL1_76P8, &pll1_d32_76p8.common.hw }, @@ -1440,6 +1448,10 @@ static struct spacemit_ccu_clk k1_ccu_mpmu_clks[] = { { 0, NULL }, }; +static const struct k1_ccu_data k1_ccu_mpmu_data = { + .clk = k1_ccu_mpmu_clks, +}; + static struct spacemit_ccu_clk k1_ccu_apbc_clks[] = { { CLK_UART0, &uart0_clk.common.hw }, { CLK_UART2, &uart2_clk.common.hw }, @@ -1544,6 +1556,10 @@ static struct spacemit_ccu_clk k1_ccu_apbc_clks[] = { { 0, NULL }, }; +static const struct k1_ccu_data k1_ccu_apbc_data = { + .clk = k1_ccu_apbc_clks, +}; + static struct spacemit_ccu_clk k1_ccu_apmu_clks[] = { { CLK_CCI550, &cci550_clk.common.hw }, { CLK_CPU_C0_HI, &cpu_c0_hi_clk.common.hw }, @@ -1610,9 +1626,13 @@ static struct spacemit_ccu_clk k1_ccu_apmu_clks[] = { { 0, NULL }, }; -static int spacemit_ccu_register(struct device *dev, - struct regmap *regmap, struct regmap *lock_regmap, - const struct spacemit_ccu_clk *clks) +static const struct k1_ccu_data k1_ccu_apmu_data = { + .clk = k1_ccu_apmu_clks, +}; + +static int k1_ccu_register(struct device *dev, struct regmap *regmap, + struct regmap *lock_regmap, + struct spacemit_ccu_clk *clks) { const struct spacemit_ccu_clk *clk; int i, ret, max_id = 0; @@ -1648,15 +1668,24 @@ static int spacemit_ccu_register(struct device *dev, clk_data->num = max_id + 1; - return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, clk_data); + ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, clk_data); + if (ret) + dev_err(dev, "error %d adding clock hardware provider\n", ret); + + return ret; } static int k1_ccu_probe(struct platform_device *pdev) { struct regmap *base_regmap, *lock_regmap = NULL; struct device *dev = &pdev->dev; + const struct k1_ccu_data *data; int ret; + data = of_device_get_match_data(dev); + if (!data) + return -EINVAL; + base_regmap = device_node_to_regmap(dev->of_node); if (IS_ERR(base_regmap)) return dev_err_probe(dev, PTR_ERR(base_regmap), @@ -1677,8 +1706,7 @@ static int k1_ccu_probe(struct platform_device *pdev) "failed to get lock regmap\n"); } - ret = spacemit_ccu_register(dev, base_regmap, lock_regmap, - of_device_get_match_data(dev)); + ret = k1_ccu_register(dev, base_regmap, lock_regmap, data->clk); if (ret) return dev_err_probe(dev, ret, "failed to register clocks\n"); @@ -1688,19 +1716,19 @@ static int k1_ccu_probe(struct platform_device *pdev) static const struct of_device_id of_k1_ccu_match[] = { { .compatible = "spacemit,k1-pll", - .data = k1_ccu_apbs_clks, + .data = &k1_ccu_apbs_data, }, { .compatible = "spacemit,k1-syscon-mpmu", - .data = k1_ccu_mpmu_clks, + .data = &k1_ccu_mpmu_data, }, { .compatible = "spacemit,k1-syscon-apbc", - .data = k1_ccu_apbc_clks, + .data = &k1_ccu_apbc_data, }, { .compatible = "spacemit,k1-syscon-apmu", - .data = k1_ccu_apmu_clks, + .data = &k1_ccu_apmu_data, }, { } };