From nobody Mon Feb 9 08:55:50 2026 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 5E6D8299923 for ; Mon, 29 Dec 2025 11:04:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767006282; cv=none; b=puP+F1xKE87Q2m+IQgrSDW2vpvZ0zHfrnwrWMfl3OkSlomVch5xDeJsKMlwqtIjkvxZ/+HA/Qux30z4E1oOCu+myebfiChD1CNnXf/00atrawt5XF3tMlEWOLSq6v7mqs1tFGBV3BlEQLrjrRiPvrY0obJIaiyZy1rg0nLaNsVk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767006282; c=relaxed/simple; bh=RsddBKXcXNBN6uteiOLIgOTh3ySE9OyMuf3EJ4yv7QQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cc7PlqLq/Tabge7U0H7fWKzyFF7pPhBzrxC/uVdbB6f9qUgc2Ua+UmjVuKUUSXz5ECx0cV4tQfb8hgNkwFIQeLdg6o2QIh1dzjvml9IYjvjhBZj5EonaxsiaAbXguUplzXIPzFMjWZmkVguv0nHU9WiFzH0J9vD+hDLIlhis+qc= 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=GWL/MsaF; arc=none smtp.client-ip=209.85.210.180 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="GWL/MsaF" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-7fbbb84f034so6002811b3a.0 for ; Mon, 29 Dec 2025 03:04:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=riscstar-com.20230601.gappssmtp.com; s=20230601; t=1767006278; x=1767611078; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=NutY8oGnV9Zcjg1HhCkSuN3oUX9zSpR9l+AYE5RL7so=; b=GWL/MsaFiHDsGuE19S23irXkhExuRc5FnM55o+I1yiE5F2pTtYHXT/j3vh8ZicJ0R6 N7TqtyJyOwkIjkgBa19Qc5LZWsBTXmwPfuvJVK09huvQba/m4KCpyg+zdiu6dvByLcNG F8voPWBtVwKxzCPRm/p5iDMJAMX2VH3Fuely7Dk11PEogIq/IEEdn1CcpKGxeVzea3jJ my+ATO3MgNrNDjs4k5rUCNiJ8myPO4UzqEtaJ9LKHVkvtLHldMWRI8sNMFvlKCGHob82 JsFmakJx619J0O4tKt1ObGsULe57LT2i1fm0vTDxOmhJblNq9GcbnBSyzT7iJhS8bW66 B5QQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767006278; x=1767611078; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=NutY8oGnV9Zcjg1HhCkSuN3oUX9zSpR9l+AYE5RL7so=; b=RV4taMzavdDFFGHpos8ZSeZcFLByVDlpYKHQc9S/R7+Mfz8Dl4RfzHHBpUv3D6foTJ DJMiW7mO549YDdMb4CPjimfH2JMYYUuWeok2W9s0Ztr5W2dNTeW9oq/0lq3RXsVBHfYX cp2JvLEVTkoN9WRl4+4T/murMrtdHqvp9Rl3Q+czctso22CpKWYYJFpFLySF/BJdvMjL qOvMHwQbnRcqGVE9wb0iC2+9dF58zS/us5CeG4QjuEl8fthhwQUm7oizZVR0BPkpPn15 1AMpc9fdKd7tXuNTPoa+sx4cs3s+bgdO49c3Rd0DDRJl1INSeyuaUYeFvEmEzkd6PZFX CChA== X-Forwarded-Encrypted: i=1; AJvYcCX9Zbt7HU2geIW90AJLgHPyJW/ZY6TBS0et+eAvL7PyGvm1d+JzdNubZyfYLbY7FpL4a5hY8oI4Q3t1R68=@vger.kernel.org X-Gm-Message-State: AOJu0YwIMHqPB6kCkdpW41GXXZdGir8W2K1t+bNJyNofLYT9FQtX/TkG 6SSI5ReC7WHhxVa2yxVpdK7eE9VEsZ8sHV//MtMn36G+rfimEbuJVrrVdDHrjcdvQc0= X-Gm-Gg: AY/fxX5CPrM/jdbSQcG2H6lDCYw3lah2RwqcHiXOhOYT3a3kss7zElI5ZBANik1e0Na 5yuzuIWdMJcIDCB6h5eRwFKx13/t3cj9tI2Uc+lTFYnCbJ3iAHP477+rs59ckMv9o1QS4U0uj1c duN/i3KAanuyezqFh4OYov3pBSd2iJblbNHQIgCmfXaFFtZLcuQZBbJv/45vg9Rvj2+0zV9Jkr+ GLfN4RU2IN6LF1XQBxkk+FFpR3ywZ9wVRtXLWPr49uCJoAB3eKnBcyaYtp+lv+pt3KGhezFAGcr Ht9m6e1AhPJYLc8w5f8mzJzc9IQNj74YWExM4h9cJk4qrfG9bGH/wOW3nZKyxawDaeLzAHmSRdI T95OLwMNTo/TXStUYg8kWxA75PhX6VT4ShT2O3L6zZm+GpLaa9Zavf1Cwkop20bzHZRgQ4QxoYw mJUoEqERMr8uyV9FiN50HCkfjIeJyGjnY= X-Google-Smtp-Source: AGHT+IHfeiIksTtfIy4K6stcAIxC74/Hla6q+1XJihM0aXZQApg1DFbJQyfFOwjQsOzrQyXBDO74Fw== X-Received: by 2002:a05:6a00:600c:b0:7e8:4471:8d9 with SMTP id d2e1a72fcca58-7ff66974f9amr26857864b3a.58.1767006278498; Mon, 29 Dec 2025 03:04:38 -0800 (PST) Received: from [127.0.1.1] ([2a12:a305:4::40d7]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7ff7aa32916sm29338817b3a.8.2025.12.29.03.04.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Dec 2025 03:04:38 -0800 (PST) From: Guodong Xu Date: Mon, 29 Dec 2025 19:04:06 +0800 Subject: [PATCH 3/4] reset: spacemit: Extract common K1 reset code Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251229-k3-reset-v1-3-eda0747bded3@riscstar.com> References: <20251229-k3-reset-v1-0-eda0747bded3@riscstar.com> In-Reply-To: <20251229-k3-reset-v1-0-eda0747bded3@riscstar.com> To: Philipp Zabel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Yixun Lan Cc: Alex Elder , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, spacemit@lists.linux.dev, Guodong Xu X-Mailer: b4 0.14.3 Extract the common reset controller code from the K1 driver into separate reset-spacemit-common.{c,h} files. This prepares for additional SpacemiT SoCs that share the same reset controller architecture. The common code now includes handlers for reset assert deassert operations and probing for auxiliary bus devices. Signed-off-by: Guodong Xu --- drivers/reset/spacemit/Kconfig | 17 +++- drivers/reset/spacemit/Makefile | 2 + drivers/reset/spacemit/reset-spacemit-common.c | 79 +++++++++++++++++ drivers/reset/spacemit/reset-spacemit-common.h | 53 ++++++++++++ drivers/reset/spacemit/reset-spacemit-k1.c | 113 +++------------------= ---- 5 files changed, 158 insertions(+), 106 deletions(-) diff --git a/drivers/reset/spacemit/Kconfig b/drivers/reset/spacemit/Kconfig index 552884e8b72a..56a4858b30e1 100644 --- a/drivers/reset/spacemit/Kconfig +++ b/drivers/reset/spacemit/Kconfig @@ -1,10 +1,20 @@ # SPDX-License-Identifier: GPL-2.0-only =20 -config RESET_SPACEMIT_K1 - tristate "SpacemiT K1 reset driver" +menu "Reset support for SpacemiT platforms" depends on ARCH_SPACEMIT || COMPILE_TEST - depends on SPACEMIT_K1_CCU + +config RESET_SPACEMIT_COMMON + tristate select AUXILIARY_BUS + help + Common reset controller infrastructure for SpacemiT SoCs. + This provides shared code and helper functions used by + reset drivers for various SpacemiT SoC families. + +config RESET_SPACEMIT_K1 + tristate "Support for SpacemiT K1 SoC" + depends on SPACEMIT_K1_CCU + select RESET_SPACEMIT_COMMON default SPACEMIT_K1_CCU help Support for reset controller in SpacemiT K1 SoC. @@ -12,3 +22,4 @@ config RESET_SPACEMIT_K1 unit (CCU) driver to provide reset control functionality for various peripherals and subsystems in the SoC. =20 +endmenu diff --git a/drivers/reset/spacemit/Makefile b/drivers/reset/spacemit/Makef= ile index de7e358c74fd..fecda9f211b2 100644 --- a/drivers/reset/spacemit/Makefile +++ b/drivers/reset/spacemit/Makefile @@ -1,3 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_RESET_SPACEMIT_COMMON) +=3D reset-spacemit-common.o + obj-$(CONFIG_RESET_SPACEMIT_K1) +=3D reset-spacemit-k1.o =20 diff --git a/drivers/reset/spacemit/reset-spacemit-common.c b/drivers/reset= /spacemit/reset-spacemit-common.c new file mode 100644 index 000000000000..e4b3f0e2c59d --- /dev/null +++ b/drivers/reset/spacemit/reset-spacemit-common.c @@ -0,0 +1,79 @@ +// SPDX-License-Identifier: GPL-2.0-only + +/* SpacemiT reset controller driver - common implementation */ + +#include +#include +#include + +#include + +#include "reset-spacemit-common.h" + +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 =3D container_of(rcdev, struct ccu_reset_controller, rcdev); + data =3D &controller->data->reset_data[id]; + mask =3D data->assert_mask | data->deassert_mask; + val =3D 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); +} + +const struct reset_control_ops spacemit_reset_control_ops =3D { + .assert =3D spacemit_reset_assert, + .deassert =3D spacemit_reset_deassert, +}; +EXPORT_SYMBOL_GPL(spacemit_reset_control_ops); + +static int spacemit_reset_controller_register(struct device *dev, + struct ccu_reset_controller *controller) +{ + struct reset_controller_dev *rcdev =3D &controller->rcdev; + + rcdev->ops =3D &spacemit_reset_control_ops; + rcdev->owner =3D THIS_MODULE; + rcdev->of_node =3D dev->of_node; + rcdev->nr_resets =3D controller->data->count; + + return devm_reset_controller_register(dev, &controller->rcdev); +} + +int spacemit_reset_probe(struct auxiliary_device *adev, + const struct auxiliary_device_id *id) +{ + struct spacemit_ccu_adev *rdev =3D to_spacemit_ccu_adev(adev); + struct ccu_reset_controller *controller; + struct device *dev =3D &adev->dev; + + controller =3D devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL); + if (!controller) + return -ENOMEM; + controller->data =3D (const struct ccu_reset_controller_data *)id->driver= _data; + controller->regmap =3D rdev->regmap; + + return spacemit_reset_controller_register(dev, controller); +} +EXPORT_SYMBOL_NS_GPL(spacemit_reset_probe, "RESET_SPACEMIT"); + +MODULE_DESCRIPTION("SpacemiT reset controller driver - common code"); +MODULE_LICENSE("GPL"); + diff --git a/drivers/reset/spacemit/reset-spacemit-common.h b/drivers/reset= /spacemit/reset-spacemit-common.h new file mode 100644 index 000000000000..9900a92f2c88 --- /dev/null +++ b/drivers/reset/spacemit/reset-spacemit-common.h @@ -0,0 +1,53 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * SpacemiT reset controller driver - common definitions + */ + +#ifndef _RESET_SPACEMIT_COMMON_H_ +#define _RESET_SPACEMIT_COMMON_H_ + +#include +#include +#include +#include + +struct ccu_reset_data { + u32 offset; + u32 assert_mask; + u32 deassert_mask; +}; + +struct ccu_reset_controller_data { + const struct ccu_reset_data *reset_data; /* array */ + size_t count; +}; + +struct ccu_reset_controller { + struct reset_controller_dev rcdev; + const struct ccu_reset_controller_data *data; + struct regmap *regmap; +}; + +#define RESET_DATA(_offset, _assert_mask, _deassert_mask) \ + { \ + .offset =3D (_offset), \ + .assert_mask =3D (_assert_mask), \ + .deassert_mask =3D (_deassert_mask), \ + } + +/* Common reset operations */ +extern const struct reset_control_ops spacemit_reset_control_ops; + +/* Common probe function */ +int spacemit_reset_probe(struct auxiliary_device *adev, + const struct auxiliary_device_id *id); + +/* Common auxiliary device ID macro */ +#define SPACEMIT_AUX_DEV_ID(_prefix, _unit) \ + { \ + .name =3D "spacemit_ccu." _K_RST(_unit), \ + .driver_data =3D (kernel_ulong_t)&_prefix ## _ ## _unit ## _reset_data, \ + } + +#endif /* _RESET_SPACEMIT_COMMON_H_ */ + diff --git a/drivers/reset/spacemit/reset-spacemit-k1.c b/drivers/reset/spa= cemit/reset-spacemit-k1.c index 8922e14fa836..111acbdb5040 100644 --- a/drivers/reset/spacemit/reset-spacemit-k1.c +++ b/drivers/reset/spacemit/reset-spacemit-k1.c @@ -1,41 +1,13 @@ // SPDX-License-Identifier: GPL-2.0-only =20 -/* SpacemiT reset controller driver */ +/* SpacemiT K1 reset controller driver */ =20 -#include -#include -#include #include -#include -#include -#include =20 -#include #include +#include =20 -struct ccu_reset_data { - u32 offset; - u32 assert_mask; - u32 deassert_mask; -}; - -struct ccu_reset_controller_data { - const struct ccu_reset_data *reset_data; /* array */ - size_t count; -}; - -struct ccu_reset_controller { - struct reset_controller_dev rcdev; - const struct ccu_reset_controller_data *data; - struct regmap *regmap; -}; - -#define RESET_DATA(_offset, _assert_mask, _deassert_mask) \ - { \ - .offset =3D (_offset), \ - .assert_mask =3D (_assert_mask), \ - .deassert_mask =3D (_deassert_mask), \ - } +#include "reset-spacemit-common.h" =20 static const struct ccu_reset_data k1_mpmu_resets[] =3D { [RESET_WDT] =3D RESET_DATA(MPMU_WDTPCR, BIT(2), 0), @@ -214,91 +186,26 @@ static const struct ccu_reset_controller_data k1_apbc= 2_reset_data =3D { .count =3D ARRAY_SIZE(k1_apbc2_resets), }; =20 -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 =3D container_of(rcdev, struct ccu_reset_controller, rcdev); - data =3D &controller->data->reset_data[id]; - mask =3D data->assert_mask | data->deassert_mask; - val =3D 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 =3D { - .assert =3D spacemit_reset_assert, - .deassert =3D spacemit_reset_deassert, -}; - -static int spacemit_reset_controller_register(struct device *dev, - struct ccu_reset_controller *controller) -{ - struct reset_controller_dev *rcdev =3D &controller->rcdev; - - rcdev->ops =3D &spacemit_reset_control_ops; - rcdev->owner =3D THIS_MODULE; - rcdev->of_node =3D dev->of_node; - rcdev->nr_resets =3D controller->data->count; - - return devm_reset_controller_register(dev, &controller->rcdev); -} - -static int spacemit_reset_probe(struct auxiliary_device *adev, - const struct auxiliary_device_id *id) -{ - struct spacemit_ccu_adev *rdev =3D to_spacemit_ccu_adev(adev); - struct ccu_reset_controller *controller; - struct device *dev =3D &adev->dev; - - controller =3D devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL); - if (!controller) - return -ENOMEM; - controller->data =3D (const struct ccu_reset_controller_data *)id->driver= _data; - controller->regmap =3D rdev->regmap; - - return spacemit_reset_controller_register(dev, controller); -} - -#define K1_AUX_DEV_ID(_unit) \ - { \ - .name =3D "spacemit_ccu." _K_RST(_unit), \ - .driver_data =3D (kernel_ulong_t)&k1_ ## _unit ## _reset_data, \ - } +#define K1_AUX_DEV_ID(_unit) SPACEMIT_AUX_DEV_ID(k1, _unit) =20 -static const struct auxiliary_device_id spacemit_reset_ids[] =3D { +static const struct auxiliary_device_id spacemit_k1_reset_ids[] =3D { K1_AUX_DEV_ID(mpmu), K1_AUX_DEV_ID(apbc), K1_AUX_DEV_ID(apmu), K1_AUX_DEV_ID(rcpu), K1_AUX_DEV_ID(rcpu2), K1_AUX_DEV_ID(apbc2), - { }, + { /* sentinel */ } }; -MODULE_DEVICE_TABLE(auxiliary, spacemit_reset_ids); +MODULE_DEVICE_TABLE(auxiliary, spacemit_k1_reset_ids); =20 static struct auxiliary_driver spacemit_k1_reset_driver =3D { .probe =3D spacemit_reset_probe, - .id_table =3D spacemit_reset_ids, + .id_table =3D spacemit_k1_reset_ids, }; module_auxiliary_driver(spacemit_k1_reset_driver); =20 +MODULE_IMPORT_NS("RESET_SPACEMIT"); MODULE_AUTHOR("Alex Elder "); -MODULE_DESCRIPTION("SpacemiT reset controller driver"); +MODULE_DESCRIPTION("SpacemiT K1 reset controller driver"); MODULE_LICENSE("GPL"); --=20 2.43.0