From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182]) (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 02EEC28DF0C for ; Mon, 14 Apr 2025 19:17:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744658247; cv=none; b=kI4x3b+0RSpfPr1h+TJi9TOCqCMdFxiaU/KaKwfEUOMtmKC8K+pPXIT6mTQEQyUsaor2AQ6jQ7ET9ntnXTRfIySU6J1qp7gF6xWDAwA8FVfwUFHqX2fNDFHEM0Wa5a1Ohe6rX0HvsNnUFZ71FB3ijL29KRGFOyYXfvNgiWWegFM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744658247; c=relaxed/simple; bh=0tMSZnnN0uUhaUUyllJnXkn0kZUelbYWyQyl83JEU20=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RrZ69VRsK12AVk2yNUGUJOCZ8aQuM+F/YWP18y2Oa03o/ZeXYYXuBBtnKrbo3kdLoxp+o0ByfbinB52Rhu2YTAHntcYMsi7Y7+SW/rCYGK0Ud5q3KN435/QQ+LKcKkW2XeQR8V/5PLyOgRFNRfa3DMwTuSz/VW5gRE2xzEpnzEE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com; spf=pass smtp.mailfrom=riscstar.com; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b=gEY79tnv; arc=none smtp.client-ip=209.85.166.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=riscstar.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=riscstar.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=riscstar-com.20230601.gappssmtp.com header.i=@riscstar-com.20230601.gappssmtp.com header.b="gEY79tnv" Received: by mail-il1-f182.google.com with SMTP id e9e14a558f8ab-3d5e68418b5so37182695ab.2 for ; Mon, 14 Apr 2025 12:17:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1744658245; x=1745263045; darn=lists.linux.dev; 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=5Gm/aZH/kO5vouQmivfvsOxccJ1q8Se/O3GQobXDRsw=; b=gEY79tnvVqFLzCn/sG2pQ9mj/zmACcJV6tCBBxEUMpaAKQs1HHdnV1sre120ZSsQOt WDNt2Kt4nRtjN+1I/FSPx3scrAmn3UqzpEoWiA2jB1PtC2uVDNf5Umzj3xEa1Fc+cB2g AxD6AuiX+VNPMhw9maH80Fr9pb/LDXw0Cm7yT2xShv7RuVuifXFv0sOFNWIXjJq6HLJm Kkw154svSAyjp6lMR16+AQSZ0Mu3IKjwhMDCQ11iCckvb9eDqOkWZB18lWXzG0yx265a HNYiwUpFODysEecjpQtW8+Ns3CFFvmDAOLA4FxTnM+k5lvznieVRhHqbmaNDJYfGdaLt knag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744658245; x=1745263045; 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=5Gm/aZH/kO5vouQmivfvsOxccJ1q8Se/O3GQobXDRsw=; b=H46IMBHrQy7xTAOicWS4CqG3VVJhQeZogA14VoPnqdY0qBDiSjLLpE8yakXA6M8xD2 kQjzhDhgzbu8cqxPafDI6DuTXQaOK5Mxc2yr85Kzbado+tv29cJHWziEGQ754wpE6XD6 FoBr28zBFfJD6Q5yp/9uX3lhW5VQMOWB8aTdrQhCdO7M1bVV/3gYwCJ3JuUNnlEvoX/C kWvHXKiOV4K5VGCrrF77vy6SxTQ+qOsMbpC5DND0i3WUCsJnP+84qUIdHjxrY452zJz8 ZSG3KAgUqJbFSkq+fAZpCfIrcy10WJtOORbibDiOGc+nWeDYP6WXKVjLT+L+7LyjTsSL oYwA== X-Forwarded-Encrypted: i=1; AJvYcCXiBKDFgqb8BOE/aWyOCRb4noocYkSb7l1x5T0VtAtgc5ybhgn2UDVqbbe8ogL0GMjlkWmxu4aEAg==@lists.linux.dev X-Gm-Message-State: AOJu0YwrUXj+KOhBhffTx63WNUQ4EAqVcTzSVRA26uwsAl8J+ndT/DrL i797+CT71VpA366n+GqAVce5nSzAlHA1PFFqPSA29D0XIY7x0to7lUIwtAd0p0g= X-Gm-Gg: ASbGncuH4L1mhKKRqWAnh7rL6gAz8NmEKgO/YuN05QdPXgT/yJgFU9b/jSoLW0qNzlS 3pcHNUJk+pljpbBlA4lLMC4x2O3E8uW7q930g2eRa2xaK6xg335z+AYP0awztZ5ILOxkGfALvpb YVzbcbSvOxiB10DdFM16Wxa8DRp4sf8QaTes6mE+y/86vM7MwhrmVJdfyCKKEfjZdJIyTSeHzTB JxnJk2FigLaVZci3ZycCFn+K0RjwfvxGKtPvG7/QdDpDyQx5gmSEdVUywkpl1NV3NDVUTFwuna0 KmyImbFvLdJqKhF3QcTpXeJsh4J+nZBvdOKpPrh/8Xa69wuUpmgbz135mKiJxLmQY6fDvxpjF6Z y0yKKZRwM4TMLCw== X-Google-Smtp-Source: AGHT+IGOxfDnhHNiznYS8q5dIns7Gd3Y5nX+rCfx2C7pXyEaBqFpX/9ByXKN0AFavSlx3js9Rz+fyA== X-Received: by 2002:a05:6e02:1888:b0:3d5:d71f:75b3 with SMTP id e9e14a558f8ab-3d7ec265c2emr131876555ab.15.1744658245022; Mon, 14 Apr 2025 12:17:25 -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-4f505e026d1sm2715662173.94.2025.04.14.12.17.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Apr 2025 12:17:24 -0700 (PDT) From: Alex Elder To: mturquette@baylibre.com, sboyd@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: p.zabel@pengutronix.de, dlan@gentoo.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 v4 3/7] clk: spacemit: add reset controller support Date: Mon, 14 Apr 2025 14:17:10 -0500 Message-ID: <20250414191715.2264758-4-elder@riscstar.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20250414191715.2264758-1-elder@riscstar.com> References: <20250414191715.2264758-1-elder@riscstar.com> Precedence: bulk X-Mailing-List: spacemit@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Define ccu_reset_data as a structure that contains the constant register offset and bitmasks used to assert and deassert a reset control on a SpacemiT K1 CCU. Add a pointer to an array of those structures to the spacemit_ccu_data structure, along with a field indicating how many elements are in that array. Resets will be optional, and if none are defined the reset array pointer will be null. Define a new ccu_reset_controller structure, which (for a CCU with resets) contains a pointer to the constant reset data, the regmap to be used for the controller, and an embedded a reset controller structure. Each reset control is asserted or deasserted by updating bits in a register. The bits used are defined by an assert mask and a deassert mask. In some cases, one (non-zero) mask asserts reset and a different (non-zero) mask deasserts it. Otherwise one mask is nonzero, and the other is zero. Either way, the bits in both masks are cleared, then either the assert mask or the deassert mask is set in a register to affect the state of a reset control. Signed-off-by: Alex Elder --- drivers/clk/spacemit/ccu-k1.c | 86 +++++++++++++++++++++++++++++++++-- 1 file changed, 83 insertions(+), 3 deletions(-) diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c index 4db91c1b1d280..020e751a9f305 100644 --- a/drivers/clk/spacemit/ccu-k1.c +++ b/drivers/clk/spacemit/ccu-k1.c @@ -11,6 +11,7 @@ #include #include #include +#include #include "ccu_common.h" #include "ccu_pll.h" @@ -129,9 +130,23 @@ #define APMU_EMAC0_CLK_RES_CTRL 0x3e4 #define APMU_EMAC1_CLK_RES_CTRL 0x3ec +struct ccu_reset_data { + u32 offset; + u32 assert_mask; + u32 deassert_mask; +}; + struct spacemit_ccu_data { - struct clk_hw **clk_hws; + struct clk_hw **clk_hws; /* array */ size_t clk_num; + const struct ccu_reset_data *reset_data; /* array */ + size_t reset_num; +}; + +struct ccu_reset_controller { + struct regmap *regmap; + const struct spacemit_ccu_data *data; + struct reset_controller_dev rcdev; }; /* APBS clocks start, APBS region contains and only contains all PLL clocks */ @@ -1042,6 +1057,39 @@ static const struct spacemit_ccu_data k1_ccu_apmu_data = { .clk_num = ARRAY_SIZE(k1_ccu_apmu_hws), }; +static int spacemit_reset_update(struct reset_controller_dev *rcdev, + unsigned long id, bool assert) +{ + struct ccu_reset_controller *controller; + const struct ccu_reset_data *data; + u32 mask; + u32 val; + + controller = container_of(rcdev, struct ccu_reset_controller, rcdev); + data = &controller->data->reset_data[id]; + mask = data->assert_mask | data->deassert_mask; + val = assert ? data->assert_mask : data->deassert_mask; + + return regmap_update_bits(controller->regmap, data->offset, mask, val); +} + +static int spacemit_reset_assert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + return spacemit_reset_update(rcdev, id, true); +} + +static int spacemit_reset_deassert(struct reset_controller_dev *rcdev, + unsigned long id) +{ + return spacemit_reset_update(rcdev, id, false); +} + +static const struct reset_control_ops spacemit_reset_control_ops = { + .assert = spacemit_reset_assert, + .deassert = spacemit_reset_deassert, +}; + static int spacemit_ccu_register(struct device *dev, struct regmap *regmap, struct regmap *lock_regmap, @@ -1090,9 +1138,37 @@ static int spacemit_ccu_register(struct device *dev, return ret; } +static int spacemit_reset_controller_register(struct device *dev, + struct regmap *regmap, + const struct spacemit_ccu_data *data) +{ + struct ccu_reset_controller *controller; + struct reset_controller_dev *rcdev; + + /* Resets are optional */ + if (!data->reset_data) + return 0; + + controller = devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL); + if (!controller) + return -ENOMEM; + + controller->regmap = regmap; + controller->data = data; + + rcdev = &controller->rcdev; + rcdev->ops = &spacemit_reset_control_ops; + rcdev->owner = THIS_MODULE; + rcdev->of_node = dev->of_node; + rcdev->nr_resets = data->reset_num; + + return devm_reset_controller_register(dev, rcdev); +} + 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; @@ -1121,11 +1197,15 @@ 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_reset_controller_register(dev, base_regmap, data); + if (ret) + return dev_err_probe(dev, ret, "failed to register reset controller\n"); + return 0; } -- 2.45.2