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 043DDC3ABD8 for ; Mon, 12 May 2025 18:32:40 +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=z3/T8CNx9jS1xRT72NJkD3kb+mbYjhUOZYV+cZQuZgU=; b=SK6pQzMagJa1g6 5aeUw/Tb4Yy3WLPuqh88fc3Glq/nQEmGWAyu5dGMPsjjua3ygWHo7zjR6Gx78Q28Qmd5+pJz1hPd0 gEMmrMZLB0G/xZVtJLYegMYhCtqLI+/jycvObiCUc9ifA/bJ2n/ymwmfb2LgKnk0JK5ETc2+CXOBq HVl4C+yLfzhxAxwBuEPZ0QV0HvFZTsr2yCN72y7/sM/qciX5FEHgpWOBzHSNaQ8eX+EnUhD3pLowW VwY8qvzc9DaOAeGRl0uE7eyiFTQEGCR0lcuyj+GYhx0+V73ZcIzbgucF4bdeIT6p7kT/xOf9KLGQU yY3HgWqrcewOGu29Ov+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uEXx5-0000000AOsY-2KUI; Mon, 12 May 2025 18:32:35 +0000 Received: from mail-il1-x135.google.com ([2607:f8b0:4864:20::135]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uEXwr-0000000AOmD-2pWh for linux-riscv@lists.infradead.org; Mon, 12 May 2025 18:32:22 +0000 Received: by mail-il1-x135.google.com with SMTP id e9e14a558f8ab-3d817bc6eb0so24953545ab.1 for ; Mon, 12 May 2025 11:32:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1747074740; x=1747679540; 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=qHuJ6WqRUAvgev7G1xc3D9GkPxjqZj5gltQE5BvIVqM=; b=T8PbKC9PFknlojEAIG1MIdksN9eTKAXX+y6k67Ox71ArA3lrE+e8SpUy7gKBN8TpuX 4u/AgY8JetRVEL8ZJm3+coUeYgI8Nh1ilxHOGeQvmCCxf1Phfc/Y0bawA/EEn17vy8KX TJNov/7KKEnfzemfkf7MzAqmqVqAxgGIpDzUmKh/f6hxWqhxq3x48ErF+neKp9OoR40k ju+l9ECqhYzsaRdljIquBYx9TLX3VbpyM5IpPEL0VkH81vpuibKhY9myDHNQSG4/jq1p s35bE4nWCAUBoC4UqL56GnzAOz1YA19Xy3XwfqJB9aQaHjzqywbZ1TQmtP0nRXFskvvN ZvmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747074740; x=1747679540; 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=qHuJ6WqRUAvgev7G1xc3D9GkPxjqZj5gltQE5BvIVqM=; b=lQ15ebFNv9MLBx/4lkP+m+T5GY9yssD5mwi15ZkioFU31C2qNGGNPaI4Istf2MKz8a DST0ennjLnoyM0jtBrH4ScukOnsYipJZeP+Qvotz58psa4HFwYFApOvelponh+J4AHmQ 59k1jMCwfeMZFdve/yLskdzeSycqJqwNFIqZu4Z+diQV/fvbR6ffFxYtngTMa8G+kFyP 76M4gwLJWPIAXBhD0jP6k9W92x9Err2ERP7dJ+Z3nTqHO9SUUVxsA2kYJThCu/Qs0bny MVo9bdvfg0Mq3/GmDEc18ZCpliIu1UrnXKmm0ayM2lTCmdF2DyOnDERAYgJlkeqMcFQz 3K4Q== X-Forwarded-Encrypted: i=1; AJvYcCVzD+u6e3KafFWjxXDuRjpaTSEZOQ7bgv+OXtNAZWMnXEvvylVCEKul4m7lgzn/B69n46iJXD0KwaDaGg==@lists.infradead.org X-Gm-Message-State: AOJu0Yyw/+Bn/lu00K+3ePOlhGA++y3eThVL+SeiEXwrlgjvDtgkIeXW tB9ufTGGt3obtJbKq2hs+MJSVmvnMukC37ExW2YJLed3erEbFWQxWUqgPPJAgxA= X-Gm-Gg: ASbGncsPRn8CW454RqVzAsHH28zDuxcOce4ujVSfl3qMd/oUqJBmFrVZwSzq7H+NwMp GU3xBlGWvIC4GlZ8SguX3Ei3wUY2v00nIsHoeK9AOwmX58T0hVyEqrDqzWP/tnMoYt3eNCQgXmJ O8uRka58MLjAgf5ykJcQ5cy6keyvqQTvkJ/i4r4NCyFYB57YEIxwImQ2Kc4Go84xHT6eeV++Hm2 OZYh+ZKHxA6c3h9bWFmhoKIEh9hgWI+CEK1rn3vp1Y4qJUjivz1KCA/n+7UdDyIUml0ID5iMPi1 kjIs7Qar7bpCXceDiQrlW0kgaIea4It+UyvvrzgfukIB/334aHt0hQkSYLlFYXDXxJOybM8p622 gv+FCxaeP1J9hsXq5UoekbWhxgaWiVjTMGgE= X-Google-Smtp-Source: AGHT+IGUH+gZ5O6Fete7qaAHDA+Q222i/nqrKcsohnG7ZuXIwBBzOkJoTzCRcfNjs5a6IdfGjvFzEg== X-Received: by 2002:a05:6e02:2611:b0:3da:7c94:cd41 with SMTP id e9e14a558f8ab-3da7e1e7b72mr171347565ab.7.1747074740524; Mon, 12 May 2025 11:32:20 -0700 (PDT) Received: from localhost.localdomain (c-73-228-159-35.hsd1.mn.comcast.net. [73.228.159.35]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4fa22496e9fsm1740333173.11.2025.05.12.11.32.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 May 2025 11:32:20 -0700 (PDT) From: Alex Elder To: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org, mturquette@baylibre.com, sboyd@kernel.org, p.zabel@pengutronix.de, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr, dlan@gentoo.org Cc: heylenay@4d2.org, inochiama@outlook.com, guodong@riscstar.com, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, spacemit@lists.linux.dev, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v9 3/6] clk: spacemit: set up reset auxiliary devices Date: Mon, 12 May 2025 13:32:08 -0500 Message-ID: <20250512183212.3465963-4-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250512183212.3465963-1-elder@riscstar.com> References: <20250512183212.3465963-1-elder@riscstar.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250512_113221_712590_041D2D55 X-CRM114-Status: GOOD ( 24.24 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Add a new reset_name field to the spacemit_ccu_data structure. If it is non-null, the CCU implements a reset controller, and the name will be used in the name for the auxiliary device that implements it. Define a new type to hold an auxiliary device as well as the regmap pointer that will be needed by CCU reset controllers. Set up code to initialize and add an auxiliary device for any CCU that implements reset functionality. Make it optional for a CCU to implement a clock controller. This doesn't apply to any of the existing CCUs but will for some new ones that will be added soon. Signed-off-by: Alex Elder --- v9: Use ida_alloc() to assign the unique auxiliary device ID drivers/clk/spacemit/Kconfig | 1 + drivers/clk/spacemit/ccu-k1.c | 104 ++++++++++++++++++++++++++++--- include/soc/spacemit/k1-syscon.h | 12 ++++ 3 files changed, 107 insertions(+), 10 deletions(-) diff --git a/drivers/clk/spacemit/Kconfig b/drivers/clk/spacemit/Kconfig index 4c4df845b3cb2..3854f6ae6d0ea 100644 --- a/drivers/clk/spacemit/Kconfig +++ b/drivers/clk/spacemit/Kconfig @@ -3,6 +3,7 @@ config SPACEMIT_CCU tristate "Clock support for SpacemiT SoCs" depends on ARCH_SPACEMIT || COMPILE_TEST + select AUXILIARY_BUS select MFD_SYSCON help Say Y to enable clock controller unit support for SpacemiT SoCs. diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c index 801150f4ff0f5..1c9ed434ae93e 100644 --- a/drivers/clk/spacemit/ccu-k1.c +++ b/drivers/clk/spacemit/ccu-k1.c @@ -5,12 +5,15 @@ */ #include +#include #include #include +#include #include #include #include #include +#include #include #include "ccu_common.h" @@ -21,10 +24,13 @@ #include struct spacemit_ccu_data { + const char *reset_name; struct clk_hw **hws; size_t num; }; +static DEFINE_IDA(auxiliary_ids); + /* APBS clocks start, APBS region contains and only contains all PLL clocks */ /* @@ -710,8 +716,9 @@ static struct clk_hw *k1_ccu_pll_hws[] = { }; static const struct spacemit_ccu_data k1_ccu_pll_data = { - .hws = k1_ccu_pll_hws, - .num = ARRAY_SIZE(k1_ccu_pll_hws), + /* The PLL CCU implements no resets */ + .hws = k1_ccu_pll_hws, + .num = ARRAY_SIZE(k1_ccu_pll_hws), }; static struct clk_hw *k1_ccu_mpmu_hws[] = { @@ -751,8 +758,9 @@ static struct clk_hw *k1_ccu_mpmu_hws[] = { }; static const struct spacemit_ccu_data k1_ccu_mpmu_data = { - .hws = k1_ccu_mpmu_hws, - .num = ARRAY_SIZE(k1_ccu_mpmu_hws), + .reset_name = "mpmu-reset", + .hws = k1_ccu_mpmu_hws, + .num = ARRAY_SIZE(k1_ccu_mpmu_hws), }; static struct clk_hw *k1_ccu_apbc_hws[] = { @@ -859,8 +867,9 @@ static struct clk_hw *k1_ccu_apbc_hws[] = { }; static const struct spacemit_ccu_data k1_ccu_apbc_data = { - .hws = k1_ccu_apbc_hws, - .num = ARRAY_SIZE(k1_ccu_apbc_hws), + .reset_name = "apbc-reset", + .hws = k1_ccu_apbc_hws, + .num = ARRAY_SIZE(k1_ccu_apbc_hws), }; static struct clk_hw *k1_ccu_apmu_hws[] = { @@ -929,8 +938,9 @@ static struct clk_hw *k1_ccu_apmu_hws[] = { }; static const struct spacemit_ccu_data k1_ccu_apmu_data = { - .hws = k1_ccu_apmu_hws, - .num = ARRAY_SIZE(k1_ccu_apmu_hws), + .reset_name = "apmu-reset", + .hws = k1_ccu_apmu_hws, + .num = ARRAY_SIZE(k1_ccu_apmu_hws), }; static int spacemit_ccu_register(struct device *dev, @@ -941,6 +951,10 @@ static int spacemit_ccu_register(struct device *dev, struct clk_hw_onecell_data *clk_data; int i, ret; + /* Nothing to do if the CCU does not implement any clocks */ + if (!data->hws) + return 0; + clk_data = devm_kzalloc(dev, struct_size(clk_data, hws, data->num), GFP_KERNEL); if (!clk_data) @@ -981,9 +995,74 @@ static int spacemit_ccu_register(struct device *dev, return ret; } +static void spacemit_cadev_release(struct device *dev) +{ + struct auxiliary_device *adev = to_auxiliary_dev(dev); + + ida_free(&auxiliary_ids, adev->id); + kfree(to_spacemit_ccu_adev(adev)); +} + +static void spacemit_adev_unregister(void *data) +{ + struct auxiliary_device *adev = data; + + auxiliary_device_delete(adev); + auxiliary_device_uninit(adev); +} + +static int spacemit_ccu_reset_register(struct device *dev, + struct regmap *regmap, + const char *reset_name) +{ + struct spacemit_ccu_adev *cadev; + struct auxiliary_device *adev; + int ret; + + /* Nothing to do if the CCU does not implement a reset controller */ + if (!reset_name) + return 0; + + cadev = kzalloc(sizeof(*cadev), GFP_KERNEL); + if (!cadev) + return -ENOMEM; + + cadev->regmap = regmap; + + adev = &cadev->adev; + adev->name = reset_name; + adev->dev.parent = dev; + adev->dev.release = spacemit_cadev_release; + adev->dev.of_node = dev->of_node; + ret = ida_alloc(&auxiliary_ids, GFP_KERNEL); + if (ret < 0) + goto err_free_cadev; + adev->id = ret; + + ret = auxiliary_device_init(adev); + if (ret) + goto err_free_aux_id; + + ret = auxiliary_device_add(adev); + if (ret) { + auxiliary_device_uninit(adev); + return ret; + } + + return devm_add_action_or_reset(dev, spacemit_adev_unregister, adev); + +err_free_aux_id: + ida_free(&auxiliary_ids, adev->id); +err_free_cadev: + kfree(cadev); + + return ret; +} + static int k1_ccu_probe(struct platform_device *pdev) { struct regmap *base_regmap, *lock_regmap = NULL; + const struct spacemit_ccu_data *data; struct device *dev = &pdev->dev; int ret; @@ -1012,11 +1091,16 @@ 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)); + data = of_device_get_match_data(dev); + + ret = spacemit_ccu_register(dev, base_regmap, lock_regmap, data); if (ret) return dev_err_probe(dev, ret, "failed to register clocks\n"); + ret = spacemit_ccu_reset_register(dev, base_regmap, data->reset_name); + if (ret) + return dev_err_probe(dev, ret, "failed to register resets\n"); + return 0; } diff --git a/include/soc/spacemit/k1-syscon.h b/include/soc/spacemit/k1-syscon.h index 039a448c51a07..53eff7691f33d 100644 --- a/include/soc/spacemit/k1-syscon.h +++ b/include/soc/spacemit/k1-syscon.h @@ -5,6 +5,18 @@ #ifndef __SOC_K1_SYSCON_H__ #define __SOC_K1_SYSCON_H__ +/* Auxiliary device used to represent a CCU reset controller */ +struct spacemit_ccu_adev { + struct auxiliary_device adev; + struct regmap *regmap; +}; + +static inline struct spacemit_ccu_adev * +to_spacemit_ccu_adev(struct auxiliary_device *adev) +{ + return container_of(adev, struct spacemit_ccu_adev, adev); +} + /* APBS register offset */ #define APBS_PLL1_SWCR1 0x100 #define APBS_PLL1_SWCR2 0x104 -- 2.45.2 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv