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 DE96FC3ABC6 for ; Thu, 8 May 2025 19:54:27 +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=rYONF1re1B3zlpzr4/AS0xCeEa/R5d2oaik6IOqCvDI=; b=VAA2b9RY4ST3AC 8hc46t9vT9MerlnrifPERFPbQvcjkCssCXMS4MfilpEvboxph4WDwWo3wHaMjJcQ0H0Pqz5iVna2V ekw0103SEog0fCAPszoivK0wsCyz8vlFQs8VdlDvwR1H6Qs5lWeuye6TsVQ1otegh3z9vgedmUpyA Khys80MJwfOzhpEMTuS909CNYQ2DuVsl9/j6kKAuyf5jQe9pxEnXT/y1MTXz7akLfRdhTuWpgrfvc oXxiMjRkeU7YcPogyH9G8vioA8R4Ucyu070mozI1o3iLavFoqhokOSJFEoQHYDaq5cp4deHYl8ZAF PZiHzOs4WH90l7FlmWsw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uD7K1-00000001hFL-3fgd; Thu, 08 May 2025 19:54:21 +0000 Received: from mail-io1-xd33.google.com ([2607:f8b0:4864:20::d33]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uD7Jz-00000001hDf-2N0T for linux-riscv@lists.infradead.org; Thu, 08 May 2025 19:54:20 +0000 Received: by mail-io1-xd33.google.com with SMTP id ca18e2360f4ac-85dac9728cdso36521339f.0 for ; Thu, 08 May 2025 12:54:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1746734058; x=1747338858; 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=r06uiGf7LKwLLkidgxdzaXRW8dtg/cHi/0enoG+J9mg=; b=ZlktJ5D49cQUmv/IRVbfm8WaD3hev8hEj2DEKC6j62rYfCteU1sNgNgAJveX14fB4d CEE8UsfRnp19MCwhJLuCPnqTEiOES24Z1zi6o42kyH7rsqOyrk1firi6e5+kj0cpz3TH 0JTiXszYtd8sRpmvqFm9di6eS26J+XRNayOnGEZzpQhnmqdUg7i/3DuUi6psKvwrkWKg C9r3wglB51du/bZ6oDCkOrLOMbnGQdzDvATtCNF4w9brMlKOWvkc/JqnZ6oGifVGTo23 rCzgVmE+a3FcN8zVfLZ7eK+5lMViGvtL1TjwcQ0TY+qbU+0AF0jFHyKEDS7QroR8sDzV yhdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746734058; x=1747338858; 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=r06uiGf7LKwLLkidgxdzaXRW8dtg/cHi/0enoG+J9mg=; b=R18AoALoqWaEbPVyHDyykpMdJhKaqzVs9UtTAxFwT/MNlAGVRO9KFmfaAj4ogZj6KX VN1YaBXKqbBSCDB+FDlm0oyLr++o3PJaI1Mykd1JT1mUANKrJEmYQ3pGtJgskqs9rI75 zOID+Rg+8IdsrvoS82KN0M0TRAfXylH3ACQi3+x4/crqLgazBdBmNlf5ZAo0W/F6rR1R YT7caClTFUfuC6gPEm+JQ1Hw7wINLd4mpC5YxeLD5fb93bALoLLo7rlU0HqbLNG+OhvS GJgSS+m27ONPjGFr7saETW8GezuB/qnMzDbFtCep7ilUeQoLcXJWbgFY0kYIt8GW0FKe v9sA== X-Forwarded-Encrypted: i=1; AJvYcCX34fqXIDRRocUZqP8Z7uUgh6Vw1sLl7WhGCasWY6g8/xFl6O6Ld1ciNGuHxPy+v7mXIdFaRLuJuLHO6g==@lists.infradead.org X-Gm-Message-State: AOJu0YzEaefQkSZ0LaO+8og03C6MOzg7xXzceFqm8s87VdMOVzm8B2QX 7imFm9ajtFsbontUCRO/UDgUIEQNnzo9zQtwOjo48GfTHQjgrbjWapGKP2nsIRI= X-Gm-Gg: ASbGncsNjh/Tes70G78KOxiPyo8paosgoW/wqD71EQg2v19DUcT9/QRGy/UdLpINl7Z tVLIsIEUfOTVIzAITj2XAdXYrEL+O8/fezWIYRcjmMpyObn2JEkixKiRNRMRggFjW9/2X7Lx8fa 7c4jRnp99cvG2dDz7NHzvk8R8uB+JRUmYK1NtjsIoFnOzfK6DMlGNc4xYNDM6MZwRAlIgLehuNS D57r4W1fL5QfgcfSiwkPVCkxLUzBsUXQ43k1ltWamWRyrFQee84C+QDuD7el9BAafNflNyLQ/QL +gMDs8A4mvFA3bDn76CBUxaQmWpt+dsluRWyihi9Bx1lQZKbEVlx9usIpmp2FDXx4I34pv423g9 jJNDpOnx053fFfg== X-Google-Smtp-Source: AGHT+IHsNDTIe/NXdxRfO7WQawDdywrVbLCIbfPNKwj4snYFs74Rqbnh+J4CCW3w7bAfdONDwtaabw== X-Received: by 2002:a05:6602:154c:b0:864:4a9c:1bd7 with SMTP id ca18e2360f4ac-86763392674mr160893439f.0.1746734058501; Thu, 08 May 2025 12:54:18 -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-4fa226850e1sm93983173.134.2025.05.08.12.54.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 May 2025 12:54:18 -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 v7 3/6] clk: spacemit: set up reset auxiliary devices Date: Thu, 8 May 2025 14:54:05 -0500 Message-ID: <20250508195409.2962633-4-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250508195409.2962633-1-elder@riscstar.com> References: <20250508195409.2962633-1-elder@riscstar.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250508_125419_604317_B4E89A81 X-CRM114-Status: GOOD ( 22.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: , 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 --- v7: - The SPACEMIT_CCU config option now selects AUXILIARY_BUS drivers/clk/spacemit/Kconfig | 1 + drivers/clk/spacemit/ccu-k1.c | 89 ++++++++++++++++++++++++++++---- include/soc/spacemit/k1-syscon.h | 12 +++++ 3 files changed, 92 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..b9c574f9e0d7f 100644 --- a/drivers/clk/spacemit/ccu-k1.c +++ b/drivers/clk/spacemit/ccu-k1.c @@ -5,6 +5,7 @@ */ #include +#include #include #include #include @@ -21,6 +22,7 @@ #include struct spacemit_ccu_data { + const char *reset_name; struct clk_hw **hws; size_t num; }; @@ -710,8 +712,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 +754,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 +863,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 +934,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 +947,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 +991,63 @@ 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); + + 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; + static u32 next_id; + int ret; + + /* Nothing to do if the CCU does not implement a reset controller */ + if (!reset_name) + return 0; + + cadev = devm_kzalloc(dev, 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; + adev->id = next_id++; + + ret = auxiliary_device_init(adev); + if (ret) + return ret; + + ret = auxiliary_device_add(adev); + if (ret) { + auxiliary_device_uninit(adev); + return ret; + } + + return devm_add_action_or_reset(dev, spacemit_adev_unregister, adev); +} + 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 +1076,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