From nobody Tue Feb 10 19:14:59 2026 Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) (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 92663296FBD for ; Mon, 12 May 2025 18:32:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747074743; cv=none; b=Q5QYgUopGxzoymVtxJ1AQhTuJfkwxVFg1pD/36kkES+fabKof+4DL14TFadVhuJMz7besQR7dUIfoCnqfU3YuNsIjk+pscCoe/nTdVqGAMENP5zoX6kuFbZqqIh80iWZFC0AsnPp1SdzZsVf/XOkYw9x2wFubSOpAeCgaeiO4Tk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747074743; c=relaxed/simple; bh=xgpCiUJGtvGf1BAHGTAuudGf6F2I/Rj1q8VF0JNlic8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=S011hJ5oix500rJ0EBg2UMFX0K0SGomQCW4E3Ao30xvNVVwuwjUfCl8BU66kCGrWdRO6sjHcNxJkeBrPIVZeN7yPM+aot5AgyvCl6dbEyo8R3jeyQmP0HErq1/O16Tv1awXioHfKEwR6B5yAg+6LSw4vb4pd26QqlX+3Ck8OEEg= 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=xUxsMn++; arc=none smtp.client-ip=209.85.166.178 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="xUxsMn++" Received: by mail-il1-f178.google.com with SMTP id e9e14a558f8ab-3d90208e922so23479135ab.3 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=vger.kernel.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=xUxsMn++EKBq1FB6xzQPd6PDcHG216TrJhBRb5OkWZ6ksdAu2fmLR86H8CMS/plhM2 djBDtuNR2NltqUlYc8ScpdvbZrPQTAew725VIdKWEdxcNXvONO9Vn4IS2MQ+eR+Nq7W7 NOns+Ej/ZLcgwfZNSuWvkLI7jXHW0smbiuEr/de9ZbmIHAdF4ZADgtBpvBXGCfx0+pkT /BviHsU0w5fLyOKaMywpzm+2AZCgIFOwB5uPE00nrOgSZX4+TCGPsIdAq+eMdKT3J0wq OGkchI9/zrc3fgBQuyXmVURvyE6U7v2YwI3YqLyFP2d11fUSgsjukjPjHzGpSWu06mx8 PMfg== 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=A1VDkbg6/cNPlpicqZ/weh/bcOcl/EpLh7jjevXb+oihnkOpAQipwqrWM7q6a3jDTy G5xxUxSfp9SWn5jEcFtZMJ9Fq2Ib5POJZHeYad4vZnBBmd2n3yha7Bd5mkvoMrr5Nmjk l8lgBuiNY3TCpzjeFcceCB25AwziCppCDILOhvQB9hAG0FSqAeIp9Kdf+VKONigGWTPN Y644kl6vFXOXXe20h/vMwlwvea0UWah5PySRWjGc0mitLIdpXa8ZiXO4NoX01ImmyA/I 4fzXHdde2dwYdddK0NU2jaifswToJb72fHZl4oWQoc/0BJ34hJCJH4WY3Ls9whBcXOx+ fTjw== X-Forwarded-Encrypted: i=1; AJvYcCXaaRL6Gl5SNu5zpYj7kVMFb1H+dx1pfUA91CVFxL5hdCfqDKpAtdbGfuxLDEq1sJHAmpfJnKwzxTmol50=@vger.kernel.org X-Gm-Message-State: AOJu0YyMbyTxhVpv8yXK3+wcEpCaWPYldaEJ4+PFpyXLroc9S11+L9tu pWeHwlpH9m88iEH+IiJTS8auDXo62Yjs6yDU0UQRjxs6N72a6FragKv1Izx5p8o= X-Gm-Gg: ASbGncu1em/vFrCc+oCYJiLeMFGZxeNRn+RvL8w4xIsC2MPZWtSciFkOHvCh5x2IogZ neWIGSNQDt9zEHY4qsDCI9zIkvfIOrKRs2fVP1VB5WxiTqILviTCvrFtpI3Cx2ngGaiv1SZ96pf xvjLWYEsW5KHVWybRxB7iMy4Bch4neeOzfkDvwOk0qMiL2kO4/EXwDjemtN5JsFKO4cMWEaXPXd AEiai4sd1j3xYQ3yorITjH5jx0E6XP+RQ2MFykDw6ikuV1bLSkz6nDE7mZi6hTq1OHBOBDBv5vs eDWTC0IVrDaZLNr9mqJRSM1sUrlbimOyLbMPX3dwf3qVcHeSyCfHE+34pNkvtS5OfImxXAeQ5DO J1VyWVaYgkZSq1hbEhbgGpjAxv44wNW0co1g= 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> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Haylen Chu --- 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 @@ */ =20 #include +#include #include #include +#include #include #include #include #include +#include #include =20 #include "ccu_common.h" @@ -21,10 +24,13 @@ #include =20 struct spacemit_ccu_data { + const char *reset_name; struct clk_hw **hws; size_t num; }; =20 +static DEFINE_IDA(auxiliary_ids); + /* APBS clocks start, APBS region contains and only contains all PLL clock= s */ =20 /* @@ -710,8 +716,9 @@ static struct clk_hw *k1_ccu_pll_hws[] =3D { }; =20 static const struct spacemit_ccu_data k1_ccu_pll_data =3D { - .hws =3D k1_ccu_pll_hws, - .num =3D ARRAY_SIZE(k1_ccu_pll_hws), + /* The PLL CCU implements no resets */ + .hws =3D k1_ccu_pll_hws, + .num =3D ARRAY_SIZE(k1_ccu_pll_hws), }; =20 static struct clk_hw *k1_ccu_mpmu_hws[] =3D { @@ -751,8 +758,9 @@ static struct clk_hw *k1_ccu_mpmu_hws[] =3D { }; =20 static const struct spacemit_ccu_data k1_ccu_mpmu_data =3D { - .hws =3D k1_ccu_mpmu_hws, - .num =3D ARRAY_SIZE(k1_ccu_mpmu_hws), + .reset_name =3D "mpmu-reset", + .hws =3D k1_ccu_mpmu_hws, + .num =3D ARRAY_SIZE(k1_ccu_mpmu_hws), }; =20 static struct clk_hw *k1_ccu_apbc_hws[] =3D { @@ -859,8 +867,9 @@ static struct clk_hw *k1_ccu_apbc_hws[] =3D { }; =20 static const struct spacemit_ccu_data k1_ccu_apbc_data =3D { - .hws =3D k1_ccu_apbc_hws, - .num =3D ARRAY_SIZE(k1_ccu_apbc_hws), + .reset_name =3D "apbc-reset", + .hws =3D k1_ccu_apbc_hws, + .num =3D ARRAY_SIZE(k1_ccu_apbc_hws), }; =20 static struct clk_hw *k1_ccu_apmu_hws[] =3D { @@ -929,8 +938,9 @@ static struct clk_hw *k1_ccu_apmu_hws[] =3D { }; =20 static const struct spacemit_ccu_data k1_ccu_apmu_data =3D { - .hws =3D k1_ccu_apmu_hws, - .num =3D ARRAY_SIZE(k1_ccu_apmu_hws), + .reset_name =3D "apmu-reset", + .hws =3D k1_ccu_apmu_hws, + .num =3D ARRAY_SIZE(k1_ccu_apmu_hws), }; =20 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; =20 + /* Nothing to do if the CCU does not implement any clocks */ + if (!data->hws) + return 0; + clk_data =3D 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; } =20 +static void spacemit_cadev_release(struct device *dev) +{ + struct auxiliary_device *adev =3D 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 =3D 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 =3D kzalloc(sizeof(*cadev), GFP_KERNEL); + if (!cadev) + return -ENOMEM; + + cadev->regmap =3D regmap; + + adev =3D &cadev->adev; + adev->name =3D reset_name; + adev->dev.parent =3D dev; + adev->dev.release =3D spacemit_cadev_release; + adev->dev.of_node =3D dev->of_node; + ret =3D ida_alloc(&auxiliary_ids, GFP_KERNEL); + if (ret < 0) + goto err_free_cadev; + adev->id =3D ret; + + ret =3D auxiliary_device_init(adev); + if (ret) + goto err_free_aux_id; + + ret =3D 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 =3D NULL; + const struct spacemit_ccu_data *data; struct device *dev =3D &pdev->dev; int ret; =20 @@ -1012,11 +1091,16 @@ static int k1_ccu_probe(struct platform_device *pde= v) "failed to get lock regmap\n"); } =20 - ret =3D spacemit_ccu_register(dev, base_regmap, lock_regmap, - of_device_get_match_data(dev)); + data =3D of_device_get_match_data(dev); + + ret =3D spacemit_ccu_register(dev, base_regmap, lock_regmap, data); if (ret) return dev_err_probe(dev, ret, "failed to register clocks\n"); =20 + ret =3D 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; } =20 diff --git a/include/soc/spacemit/k1-syscon.h b/include/soc/spacemit/k1-sys= con.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__ =20 +/* 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 --=20 2.45.2