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 78237E8FDB1 for ; Mon, 29 Dec 2025 11:04:52 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2rBX60dVKoMKLb+p5hpzRPhlv7LPyUHJ6ouEM2O7eaA=; b=OlSd9de8prfUhv r77CFy8Nd3ALeUxiZD70CHXCgHXo4yJeNRsPoVOpsm3ThLAAK3rCLih+VA2FaXZ2jwQ0aa1bUOANL eX4LP+BMhCv45otzwyQYHsYWHxS7iSBQk2lE3k6OxJqkXv3PM9O8nrCgOGIRfy8Q16gTKr1Z8kZfY V/0YcTtRoWr3+Zax10iAIpus9hEMOLMd9ozLGknHums5SEjMdT1HRKBL1asmMAxG2C2HuEQoNMxTn S8PhkQKQyrjms28szqoySTu/e+fU+XQrYdTX2H0OOMCRFB0033AcI4vUqAXwuzWnUPwSEWd+kzOx+ ZhPZiNHA1JpjeqYQ68Rg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vaB3J-00000003ayN-16iq; Mon, 29 Dec 2025 11:04:41 +0000 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vaB3H-00000003axe-0Kgd for linux-riscv@lists.infradead.org; Mon, 29 Dec 2025 11:04:40 +0000 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-7fbbb84f034so6002812b3a.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=lists.infradead.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=XJkhO3uD3exSkBMZFhGnazyImoKC9bCDjx1O6gHyd6D3vkEq7Hec5yGkiN4UHx2z+0 fBc0kQR6TQYD9sEh72nisJHesozvxlztzNbxSpVrcQ5J2PTnZa72RRhGRvU935E/UbtY VoqQKRaVaqAJyTFkM8aSISBMvtaKiXyxwsBAubN3boXb53d8z4vX0/oxuovT+vOt66+n BZLVUW0rzo15m+fvHyS75llpeoaxzlmIQh3XY9XIyd3aD5boylpus/YHt0A8ra+gVELC royWfOBq++4lrrpPT1wK9EMY+BR/XsRxv9EfynPRWwl7jdhdlWHB7qQtWdmM3EkyaBAa g9rA== 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=Ej3HEM6QrhyamBFQlsRcLkd1blEKlJ9SXxgW4+LsoCuuZkNkFF03BH4T4JgimoXdc7 eVegIoJ9j0jgqMSAw9MIFAAZCeASSmD1K3PGuNJsu45jEvQ/Woyn87FiVIZt7qOGWyMb 5wwvdVIuaag2NMYdevVf32159QArQC9x5+apaaEhUKD0ODUYsq7rFbWH/QVK4E0RuDGM qxeRlLcCvR+Mfi2rULkazdaCPh59N6w3/bZDerpfBl4c3LYGnj1OT56Ffga+Ajm6/Iiz MJojnYCYbOepzqJe0ID/t6tjZruoIvfmkxlqAPX5B417eNx2o40k72Sc7AUKZaimwoe1 GmHw== X-Forwarded-Encrypted: i=1; AJvYcCV+FRzp2XUtbtaXSmhjJmcUJI05jTAeAIzktjb7GoAX9pwTwJCcTG5k7XawDDE5+Lrjdj/xDfZtb90pYw==@lists.infradead.org X-Gm-Message-State: AOJu0YxRj9K0SPj/YZu424DTEpli+V+Y0lWlY2NkuPHro5ZH/6lT76QH mhtriILWNe9wnBgH0uuMFnzHyNJrcdgSqk5i2/CbFEK4Evn80MLEFSjlOQ7/tpLl0nU= X-Gm-Gg: AY/fxX7u2iXJIj0oAkUlggxAhPK0ba8N20fKhmHgOtUlZxTLCicjRIZgcKrZ5JjJcGB xJdXzqJSnfNLdkS8RXmhu3IRC4O1otuP1FwLb8hmZsYLTVt6aAqwBofAvhNeCLHm/orTLNxyLWe uRy3emT5VOGHBbFZUrFh8WXjp5rsbnmKBPpuH0ha0yhkThv8tWTbPYbWLCrxqMZ2yR2bwwHboly 2dveMhwouL974+IN0CYjVB48bIKtN0dd8D3BOwf0rCPygQm14YOJ+t9MoCtJWP+bVOx8sFt3QS1 xmQE1ziFDvVpCFZtUCh1hm+L3xCAyqUHzsefRbcziKQWCe3nBofthIq/I4h/MgcDjqWtAlzs5YB krol7LpFbC3gCip0pinPDoQMDzSfFFdhtT/I4WWDTXemfvev9G9qlH6sqRelSGrrckvEnQ06TN0 yQ/qzLe8DVHUgnzecslkuJm29vSidoe7M= 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 MIME-Version: 1.0 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251229_030439_143249_35F7B5DC X-CRM114-Status: GOOD ( 20.79 ) 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 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 -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. +endmenu diff --git a/drivers/reset/spacemit/Makefile b/drivers/reset/spacemit/Makefile 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) += reset-spacemit-common.o + obj-$(CONFIG_RESET_SPACEMIT_K1) += reset-spacemit-k1.o 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 = 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); +} + +const struct reset_control_ops spacemit_reset_control_ops = { + .assert = spacemit_reset_assert, + .deassert = 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 = &controller->rcdev; + + rcdev->ops = &spacemit_reset_control_ops; + rcdev->owner = THIS_MODULE; + rcdev->of_node = dev->of_node; + rcdev->nr_resets = 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 = to_spacemit_ccu_adev(adev); + struct ccu_reset_controller *controller; + struct device *dev = &adev->dev; + + controller = devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL); + if (!controller) + return -ENOMEM; + controller->data = (const struct ccu_reset_controller_data *)id->driver_data; + controller->regmap = 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 = (_offset), \ + .assert_mask = (_assert_mask), \ + .deassert_mask = (_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 = "spacemit_ccu." _K_RST(_unit), \ + .driver_data = (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/spacemit/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 -/* SpacemiT reset controller driver */ +/* SpacemiT K1 reset controller driver */ -#include -#include -#include #include -#include -#include -#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 = (_offset), \ - .assert_mask = (_assert_mask), \ - .deassert_mask = (_deassert_mask), \ - } +#include "reset-spacemit-common.h" static const struct ccu_reset_data k1_mpmu_resets[] = { [RESET_WDT] = RESET_DATA(MPMU_WDTPCR, BIT(2), 0), @@ -214,91 +186,26 @@ static const struct ccu_reset_controller_data k1_apbc2_reset_data = { .count = ARRAY_SIZE(k1_apbc2_resets), }; -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_reset_controller_register(struct device *dev, - struct ccu_reset_controller *controller) -{ - struct reset_controller_dev *rcdev = &controller->rcdev; - - rcdev->ops = &spacemit_reset_control_ops; - rcdev->owner = THIS_MODULE; - rcdev->of_node = dev->of_node; - rcdev->nr_resets = 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 = to_spacemit_ccu_adev(adev); - struct ccu_reset_controller *controller; - struct device *dev = &adev->dev; - - controller = devm_kzalloc(dev, sizeof(*controller), GFP_KERNEL); - if (!controller) - return -ENOMEM; - controller->data = (const struct ccu_reset_controller_data *)id->driver_data; - controller->regmap = rdev->regmap; - - return spacemit_reset_controller_register(dev, controller); -} - -#define K1_AUX_DEV_ID(_unit) \ - { \ - .name = "spacemit_ccu." _K_RST(_unit), \ - .driver_data = (kernel_ulong_t)&k1_ ## _unit ## _reset_data, \ - } +#define K1_AUX_DEV_ID(_unit) SPACEMIT_AUX_DEV_ID(k1, _unit) -static const struct auxiliary_device_id spacemit_reset_ids[] = { +static const struct auxiliary_device_id spacemit_k1_reset_ids[] = { 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); static struct auxiliary_driver spacemit_k1_reset_driver = { .probe = spacemit_reset_probe, - .id_table = spacemit_reset_ids, + .id_table = spacemit_k1_reset_ids, }; module_auxiliary_driver(spacemit_k1_reset_driver); +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"); -- 2.43.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv