From nobody Sun Feb 8 06:00:29 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C23FC001E0 for ; Tue, 1 Aug 2023 10:36:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232533AbjHAKgk (ORCPT ); Tue, 1 Aug 2023 06:36:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232242AbjHAKgd (ORCPT ); Tue, 1 Aug 2023 06:36:33 -0400 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0864ADB; Tue, 1 Aug 2023 03:36:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1690886192; x=1722422192; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=AyHQfuQ25AxPTEIiRutOr2ogGOuarDxm7sZRM0h1amw=; b=m9toAB7sFDDXjnctND8mrDeSnmwujAIEamfSFOwXWFt7jsxmLkBZ250Q x1sMXdZlYASWCmP2nZTmy8tkAGdmZFRepqemD20Hv1j4MI26dA+TcmS9R 81fFpgk/BKtPSUncUkyvHMCKp8t3mEPcONiQHvbVraA6rWQpmdZMunTTw 3ZYcCnEAHXdkHu1hCiEhO/svWh8xmfdxdmQRyfyWRO+r0W00vOfL5lBOB 9bwLFRyoIizGBl/YGQQjbiDBPqu3EmrSDx0W3unwOJU2AO/fyfR7d0cOi jmCW4FwNHjQBQWYN08V7pOQE+ZCOhpeKiH5ZA+dJBxvg8uqHE76Jc8b5M g==; X-IronPort-AV: E=Sophos;i="6.01,246,1684792800"; d="scan'208";a="32226639" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 01 Aug 2023 12:36:25 +0200 Received: from localhost.localdomain (SCHIFFERM-M2.tq-net.de [10.121.49.20]) by vtuxmail01.tq-net.de (Postfix) with ESMTPA id D6DFC280084; Tue, 1 Aug 2023 12:36:24 +0200 (CEST) From: Matthias Schiffer To: Santosh Shilimkar , Michael Turquette , Stephen Boyd Cc: Jai Luthra , linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux@ew.tq-group.com, Matthias Schiffer Subject: [PATCH 1/3] clk: keystone: syscon-clk: use struct instead of array for match data Date: Tue, 1 Aug 2023 12:36:07 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allow to store information with the match data that is not specific to the individual clock entries. Counting the number of elements to a sentinel at runtime is replaced with the usual ARRAY_SIZE() approach. No functional change intended. Fixes: 6acab96ee337 ("clk: keystone: syscon-clk: Add support for audio refc= lk") Signed-off-by: Matthias Schiffer --- drivers/clk/keystone/syscon-clk.c | 55 +++++++++++++++++++------------ 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/drivers/clk/keystone/syscon-clk.c b/drivers/clk/keystone/sysco= n-clk.c index d33f74119488..68ac536f564e 100644 --- a/drivers/clk/keystone/syscon-clk.c +++ b/drivers/clk/keystone/syscon-clk.c @@ -18,12 +18,17 @@ struct ti_syscon_gate_clk_priv { u32 idx; }; =20 -struct ti_syscon_gate_clk_data { +struct ti_syscon_gate_clk_entry { char *name; u32 offset; u32 bit_idx; }; =20 +struct ti_syscon_gate_clk_data { + const struct ti_syscon_gate_clk_entry *clks; + size_t num_clks; +}; + static struct ti_syscon_gate_clk_priv *to_ti_syscon_gate_clk_priv(struct clk_hw *hw) { @@ -64,7 +69,7 @@ static const struct clk_ops ti_syscon_gate_clk_ops =3D { static struct clk_hw *ti_syscon_gate_clk_register(struct device *dev, struct regmap *regmap, const char *parent_name, - const struct ti_syscon_gate_clk_data *data) + const struct ti_syscon_gate_clk_entry *data) { struct ti_syscon_gate_clk_priv *priv; struct clk_init_data init; @@ -107,10 +112,10 @@ static struct clk_hw =20 static int ti_syscon_gate_clk_probe(struct platform_device *pdev) { - const struct ti_syscon_gate_clk_data *data, *p; + const struct ti_syscon_gate_clk_data *data; struct clk_hw_onecell_data *hw_data; struct device *dev =3D &pdev->dev; - int num_clks, num_parents, i; + int num_parents, i; const char *parent_name; struct regmap *regmap; =20 @@ -123,10 +128,6 @@ static int ti_syscon_gate_clk_probe(struct platform_de= vice *pdev) return dev_err_probe(dev, PTR_ERR(regmap), "failed to get regmap\n"); =20 - num_clks =3D 0; - for (p =3D data; p->name; p++) - num_clks++; - num_parents =3D of_clk_get_parent_count(dev->of_node); if (of_device_is_compatible(dev->of_node, "ti,am62-audio-refclk") && num_parents =3D=3D 0) { @@ -134,21 +135,21 @@ static int ti_syscon_gate_clk_probe(struct platform_d= evice *pdev) "must specify a parent clock\n"); } =20 - hw_data =3D devm_kzalloc(dev, struct_size(hw_data, hws, num_clks), + hw_data =3D devm_kzalloc(dev, struct_size(hw_data, hws, data->num_clks), GFP_KERNEL); if (!hw_data) return -ENOMEM; =20 - hw_data->num =3D num_clks; + hw_data->num =3D data->num_clks; =20 parent_name =3D of_clk_get_parent_name(dev->of_node, 0); - for (i =3D 0; i < num_clks; i++) { + for (i =3D 0; i < data->num_clks; i++) { hw_data->hws[i] =3D ti_syscon_gate_clk_register(dev, regmap, parent_name, - &data[i]); + &data->clks[i]); if (IS_ERR(hw_data->hws[i])) dev_warn(dev, "failed to register %s\n", - data[i].name); + data->clks[i].name); } =20 return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, @@ -162,17 +163,20 @@ static int ti_syscon_gate_clk_probe(struct platform_d= evice *pdev) .bit_idx =3D (_bit_idx), \ } =20 -static const struct ti_syscon_gate_clk_data am654_clk_data[] =3D { +static const struct ti_syscon_gate_clk_entry am654_clks[] =3D { TI_SYSCON_CLK_GATE("ehrpwm_tbclk0", 0x0, 0), TI_SYSCON_CLK_GATE("ehrpwm_tbclk1", 0x4, 0), TI_SYSCON_CLK_GATE("ehrpwm_tbclk2", 0x8, 0), TI_SYSCON_CLK_GATE("ehrpwm_tbclk3", 0xc, 0), TI_SYSCON_CLK_GATE("ehrpwm_tbclk4", 0x10, 0), TI_SYSCON_CLK_GATE("ehrpwm_tbclk5", 0x14, 0), - { /* Sentinel */ }, +}; +static const struct ti_syscon_gate_clk_data am654_clk_data =3D { + .clks =3D am654_clks, + .num_clks =3D ARRAY_SIZE(am654_clks), }; =20 -static const struct ti_syscon_gate_clk_data am64_clk_data[] =3D { +static const struct ti_syscon_gate_clk_entry am64_clks[] =3D { TI_SYSCON_CLK_GATE("epwm_tbclk0", 0x0, 0), TI_SYSCON_CLK_GATE("epwm_tbclk1", 0x0, 1), TI_SYSCON_CLK_GATE("epwm_tbclk2", 0x0, 2), @@ -182,19 +186,28 @@ static const struct ti_syscon_gate_clk_data am64_clk_= data[] =3D { TI_SYSCON_CLK_GATE("epwm_tbclk6", 0x0, 6), TI_SYSCON_CLK_GATE("epwm_tbclk7", 0x0, 7), TI_SYSCON_CLK_GATE("epwm_tbclk8", 0x0, 8), - { /* Sentinel */ }, +}; +static const struct ti_syscon_gate_clk_data am64_clk_data =3D { + .clks =3D am64_clks, + .num_clks =3D ARRAY_SIZE(am64_clks), }; =20 -static const struct ti_syscon_gate_clk_data am62_clk_data[] =3D { +static const struct ti_syscon_gate_clk_entry am62_clks[] =3D { TI_SYSCON_CLK_GATE("epwm_tbclk0", 0x0, 0), TI_SYSCON_CLK_GATE("epwm_tbclk1", 0x0, 1), TI_SYSCON_CLK_GATE("epwm_tbclk2", 0x0, 2), - { /* Sentinel */ }, +}; +static const struct ti_syscon_gate_clk_data am62_clk_data =3D { + .clks =3D am62_clks, + .num_clks =3D ARRAY_SIZE(am62_clks), }; =20 -static const struct ti_syscon_gate_clk_data am62_audio_clk_data[] =3D { +static const struct ti_syscon_gate_clk_entry am62_audio_clks[] =3D { TI_SYSCON_CLK_GATE("audio_refclk", 0x0, 15), - { /* Sentinel */ }, +}; +static const struct ti_syscon_gate_clk_data am62_audio_clk_data =3D { + .clks =3D am62_audio_clks, + .num_clks =3D ARRAY_SIZE(am62_audio_clks), }; =20 static const struct of_device_id ti_syscon_gate_clk_ids[] =3D { --=20 TQ-Systems GmbH | M=C3=BChlstra=C3=9Fe 2, Gut Delling | 82229 Seefeld, Germ= any Amtsgericht M=C3=BCnchen, HRB 105018 Gesch=C3=A4ftsf=C3=BChrer: Detlef Schneider, R=C3=BCdiger Stahl, Stefan Sch= neider https://www.tq-group.com/ From nobody Sun Feb 8 06:00:29 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F95DC0015E for ; Tue, 1 Aug 2023 10:36:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232320AbjHAKgg (ORCPT ); Tue, 1 Aug 2023 06:36:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231296AbjHAKgc (ORCPT ); Tue, 1 Aug 2023 06:36:32 -0400 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE487A1; Tue, 1 Aug 2023 03:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1690886191; x=1722422191; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Gr7mUKw52rv98qS4sLygIA4eRzxDQj2rwvDemhyr358=; b=EuxsX51x6V90n4BQuCGMVAPlcUyVl+OhOfxPXI4EMyrZXNdRz7BRsBLo hOHkTX96QkGuRRltKnmGKBjHnLtAwTrnCprTrEoaLZUL2AHNyFTw/znvq wqThLetZmGo5EA7SD8Ouy0zIcYrDMwtfS1/ksTNeQI3NBgBHIlggIqJBm q/vktwjjDGpIgHXXK8BPsnkMLRYR7W4Zb9AnbKcUxfyJlENfYsegw1Hbx 7lUC48eLB8pyLW5Gj7YDTBNHM2J4omNxROJ3OVWmJ+E/EAxPxo0HKHaC2 2EN5JBWfI/ZxDK+vv6B4yGW26/FuKrI/56SUrQjfbhtNXzrOcPq4Sh/Ri g==; X-IronPort-AV: E=Sophos;i="6.01,246,1684792800"; d="scan'208";a="32226640" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 01 Aug 2023 12:36:25 +0200 Received: from localhost.localdomain (SCHIFFERM-M2.tq-net.de [10.121.49.20]) by vtuxmail01.tq-net.de (Postfix) with ESMTPA id 097CE280085; Tue, 1 Aug 2023 12:36:25 +0200 (CEST) From: Matthias Schiffer To: Santosh Shilimkar , Michael Turquette , Stephen Boyd Cc: Jai Luthra , linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux@ew.tq-group.com, Matthias Schiffer Subject: [PATCH 2/3] clk: keystone: syscon-clk: specify whether a parent is required in match data Date: Tue, 1 Aug 2023 12:36:08 +0200 Message-Id: <9a3ad0aeff409a35cfb6e398a9235de31a8d70e5.1690885413.git.matthias.schiffer@ew.tq-group.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Avoid checking the compatible string again in the probe function. No functional change intended. Fixes: 6acab96ee337 ("clk: keystone: syscon-clk: Add support for audio refc= lk") Signed-off-by: Matthias Schiffer --- drivers/clk/keystone/syscon-clk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clk/keystone/syscon-clk.c b/drivers/clk/keystone/sysco= n-clk.c index 68ac536f564e..9626a877e072 100644 --- a/drivers/clk/keystone/syscon-clk.c +++ b/drivers/clk/keystone/syscon-clk.c @@ -27,6 +27,7 @@ struct ti_syscon_gate_clk_entry { struct ti_syscon_gate_clk_data { const struct ti_syscon_gate_clk_entry *clks; size_t num_clks; + bool needs_parent; }; =20 static struct @@ -129,11 +130,9 @@ static int ti_syscon_gate_clk_probe(struct platform_de= vice *pdev) "failed to get regmap\n"); =20 num_parents =3D of_clk_get_parent_count(dev->of_node); - if (of_device_is_compatible(dev->of_node, "ti,am62-audio-refclk") && - num_parents =3D=3D 0) { + if (data->needs_parent && num_parents =3D=3D 0) return dev_err_probe(dev, -EINVAL, "must specify a parent clock\n"); - } =20 hw_data =3D devm_kzalloc(dev, struct_size(hw_data, hws, data->num_clks), GFP_KERNEL); @@ -208,6 +207,7 @@ static const struct ti_syscon_gate_clk_entry am62_audio= _clks[] =3D { static const struct ti_syscon_gate_clk_data am62_audio_clk_data =3D { .clks =3D am62_audio_clks, .num_clks =3D ARRAY_SIZE(am62_audio_clks), + .needs_parent =3D true, }; =20 static const struct of_device_id ti_syscon_gate_clk_ids[] =3D { --=20 TQ-Systems GmbH | M=C3=BChlstra=C3=9Fe 2, Gut Delling | 82229 Seefeld, Germ= any Amtsgericht M=C3=BCnchen, HRB 105018 Gesch=C3=A4ftsf=C3=BChrer: Detlef Schneider, R=C3=BCdiger Stahl, Stefan Sch= neider https://www.tq-group.com/ From nobody Sun Feb 8 06:00:29 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D461C0015E for ; Tue, 1 Aug 2023 10:36:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232972AbjHAKgq (ORCPT ); Tue, 1 Aug 2023 06:36:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232284AbjHAKge (ORCPT ); Tue, 1 Aug 2023 06:36:34 -0400 Received: from mx1.tq-group.com (mx1.tq-group.com [93.104.207.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B07DFE9; Tue, 1 Aug 2023 03:36:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tq-group.com; i=@tq-group.com; q=dns/txt; s=key1; t=1690886193; x=1722422193; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=71D94zn0r09sDIOSC/l60WT+v/gYihO1La2/Jx5ioYc=; b=Mn5wPl4rHmyp0bg1Bs4XdsH/wMabJc6vLpYPexrw9Nxd7clQm09W426I EZCubDzYDCKkOQlSeWdZU1fS5BFwsP9cFArGjtofKVFEvYzmuvHBNKSoG Bub6LZdij8osCjxWozupqYr2JSX2m+LASemaX2JAdh3q0ce9sXRaJ3JE6 F38mhld9rKlRhch/WrdsCPj+DzESDNBqVSLEC8HDBbMXP4SxiJPZUjiuP lApCQXm6QJIccm4rFuhcCEe7D/tNMFYuQ7+CHVIA/MTSgOzEgCNkbyRKk TkrSjGX6TcYVq+9nVWzTofcDK4P5zNy1geTFUMujMBnEE8w9Yyjzb8rft w==; X-IronPort-AV: E=Sophos;i="6.01,246,1684792800"; d="scan'208";a="32226641" Received: from vtuxmail01.tq-net.de ([10.115.0.20]) by mx1.tq-group.com with ESMTP; 01 Aug 2023 12:36:25 +0200 Received: from localhost.localdomain (SCHIFFERM-M2.tq-net.de [10.121.49.20]) by vtuxmail01.tq-net.de (Postfix) with ESMTPA id 30605280086; Tue, 1 Aug 2023 12:36:25 +0200 (CEST) From: Matthias Schiffer To: Santosh Shilimkar , Michael Turquette , Stephen Boyd Cc: Jai Luthra , linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux@ew.tq-group.com, Matthias Schiffer Subject: [PATCH 3/3] clk: keystone: syscon-clk: use of_clk_hw_simple_get() for audio refclk Date: Tue, 1 Aug 2023 12:36:09 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The binding documentation for ti,am62-audio-refclk specifies that it has 0 clock cells (and Device Trees using the binding as documented have already existed in vendor kernels for some time). Fix the driver to use of_clk_hw_simple_get() instead of of_clk_hw_onecell_get(), as attempting to reference the clock in the Device Tree will fail otherwise. Fixes: 6acab96ee337 ("clk: keystone: syscon-clk: Add support for audio refc= lk") Signed-off-by: Matthias Schiffer --- drivers/clk/keystone/syscon-clk.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/clk/keystone/syscon-clk.c b/drivers/clk/keystone/sysco= n-clk.c index 9626a877e072..a539dbf2f48e 100644 --- a/drivers/clk/keystone/syscon-clk.c +++ b/drivers/clk/keystone/syscon-clk.c @@ -28,6 +28,7 @@ struct ti_syscon_gate_clk_data { const struct ti_syscon_gate_clk_entry *clks; size_t num_clks; bool needs_parent; + bool simple; /* Use of_clk_hw_simple_get() rather than onecell */ }; =20 static struct @@ -129,6 +130,10 @@ static int ti_syscon_gate_clk_probe(struct platform_de= vice *pdev) return dev_err_probe(dev, PTR_ERR(regmap), "failed to get regmap\n"); =20 + if (data->simple && data->num_clks !=3D 1) + return dev_err_probe(dev, -EINVAL, + "simple clocks must have exactly 1 entry\n"); + num_parents =3D of_clk_get_parent_count(dev->of_node); if (data->needs_parent && num_parents =3D=3D 0) return dev_err_probe(dev, -EINVAL, @@ -151,8 +156,12 @@ static int ti_syscon_gate_clk_probe(struct platform_de= vice *pdev) data->clks[i].name); } =20 - return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, - hw_data); + if (data->simple) + return devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, + hw_data->hws[0]); + else + return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, + hw_data); } =20 #define TI_SYSCON_CLK_GATE(_name, _offset, _bit_idx) \ @@ -208,6 +217,7 @@ static const struct ti_syscon_gate_clk_data am62_audio_= clk_data =3D { .clks =3D am62_audio_clks, .num_clks =3D ARRAY_SIZE(am62_audio_clks), .needs_parent =3D true, + .simple =3D true, }; =20 static const struct of_device_id ti_syscon_gate_clk_ids[] =3D { --=20 TQ-Systems GmbH | M=C3=BChlstra=C3=9Fe 2, Gut Delling | 82229 Seefeld, Germ= any Amtsgericht M=C3=BCnchen, HRB 105018 Gesch=C3=A4ftsf=C3=BChrer: Detlef Schneider, R=C3=BCdiger Stahl, Stefan Sch= neider https://www.tq-group.com/