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 CEAB0C83F1A for ; Thu, 10 Jul 2025 21:53:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date :Subject:CC:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0HLpy2zvKVwmKYvz3Wd+0cp34LozOoNix9a8XmDVFmo=; b=QJk/+/9z8bZCS88kbLTZ4du6tb SFp5XTfS0jhOhUQLjyNidYycCRg5u3julTR6L587srzwNEvZyLMLjlQQQIQ6cuR69xx0+pSaegq7y SQ3aDP3gK2UteY4LE6prUZqky1TjzKbjdQcQe/9F1fCBvd8J9DlXONGS+49o1XGLr+Lf8ogAs5aVb EulBPnjgY2pYhpO57h6mLkPpxnsQwEn15olIBQfeGNG1INg+tlzcTX8yoHZG1//fMvDfdFgwAs6Ib I6F/DOaK8AAjlq39XBrG1Eu9/EA3ostZA7E0Ge3AM8hI0xgPGXyVQZRNxFmUET5e7q7TZ/i9dRnSW FGe7xtNw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uZzCP-0000000D6L5-2Cyf; Thu, 10 Jul 2025 21:53:01 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uZxYc-0000000Ct1H-0T6z for linux-arm-kernel@bombadil.infradead.org; Thu, 10 Jul 2025 20:07:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Content-Transfer-Encoding :MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From: Sender:Reply-To:Content-ID:Content-Description; bh=0HLpy2zvKVwmKYvz3Wd+0cp34LozOoNix9a8XmDVFmo=; b=a8AR/DwPV3/e0gJwYeOJxf7CJF z02rcLtPLz/FIAPkdu1+ZXqMzfoxrc/ckgZ6gIczCL8Dy3dRqVLdcJ7UlTTgp6XyJBqd0EynzoldU 1zRytA9Rg7wZzXptU2+Vs753qaiKBnXHMQt2E/GZSRvZMjeJpIOCjXETTTY6PLqUbcxVL1OgwJpRO BtvTqeG7jQOCQ73IV0VzQKt25UzwTAeKFEWkdH8v4v+XNAIKngb/8HBnfs4VdMiyphbhqGK8zLlUJ lxa4+mPvA7bhvjlT2AHt+X1ycUcEeE4Ainss3B1D5Tihf3Szz5CLQTgOnwDHeIRTqGKfxL1ZTatZ+ 5Ep/c6Xg==; Received: from esa.microchip.iphmx.com ([68.232.153.233]) by desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uZxYY-000000098mU-2q6Z for linux-arm-kernel@lists.infradead.org; Thu, 10 Jul 2025 20:07:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1752178067; x=1783714067; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ffLCRQIseVGjgdlMeKiALJlGivY7LZoOp7kTEnqo5rQ=; b=ytEMMSWqEp0l9J46LURefixduSnGYQEPoR6SnGnBQPXAfvkd4VVoUFTN fLFWvdSGeI9bqb2b4yBsWZ5rFHhWC8ZgAAZnVG0OruFqhGAhqXxXY6MUn MX12p7r/+FPRwmqmxBVGr5z+iWgZcbBez8sYRnVHn5CMHNi5HDhqERcUV N4uCO+zprPSymk5jSCoDB3V3gWX23Iq7hbv+Dq+2k0oxJUR4Z2b8kSRRD CrfMfRbt5LvadjQZVDGPNiL7u93TSueNA3DbHiCx3Lt22FHt1UNVyop4l Aw877WTyzzABgXwRY9IqsKTILlhBu0D2/6vnDmge/36WMFwPXoaub0CHN g==; X-CSE-ConnectionGUID: qOQSLemoQZOGUxBCHa7nXg== X-CSE-MsgGUID: X3WHjXb/QnCLo4wwssao0w== X-IronPort-AV: E=Sophos;i="6.16,301,1744095600"; d="scan'208";a="275215679" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa5.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 10 Jul 2025 13:07:38 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex01.mchp-main.com (10.10.85.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.44; Thu, 10 Jul 2025 13:07:33 -0700 Received: from ryan-Precision-3630-Tower.microchip.com (10.10.85.11) by chn-vm-ex04.mchp-main.com (10.10.85.152) with Microsoft SMTP Server id 15.1.2507.44 via Frontend Transport; Thu, 10 Jul 2025 13:07:33 -0700 From: To: , , , , CC: , , , , Subject: [PATCH v3 21/32] clk: at91: dt-compat: switch to parent_hw and parent_data Date: Thu, 10 Jul 2025 13:07:14 -0700 Message-ID: <0b5a52aebc5e6159d05957e2d0ab7b685f83a42f.1752176711.git.Ryan.Wanner@microchip.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250710_210747_381323_B941DDC8 X-CRM114-Status: GOOD ( 13.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Claudiu Beznea Switch old dt-compat clocks to use parent_hw and parent_data. Having parent_hw instead of parent names improves to clock registration speed and re-parenting. Signed-off-by: Claudiu Beznea Signed-off-by: Ryan Wanner --- drivers/clk/at91/dt-compat.c | 80 +++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 24 deletions(-) diff --git a/drivers/clk/at91/dt-compat.c b/drivers/clk/at91/dt-compat.c index fa8658d3be7b..15f65a19d991 100644 --- a/drivers/clk/at91/dt-compat.c +++ b/drivers/clk/at91/dt-compat.c @@ -43,7 +43,8 @@ static void __init of_sama5d2_clk_audio_pll_frac_setup(struct device_node *np) parent_name = of_clk_get_parent_name(np, 0); - hw = at91_clk_register_audio_pll_frac(regmap, name, parent_name, NULL); + hw = at91_clk_register_audio_pll_frac(regmap, name, NULL, + &AT91_CLK_PD_NAME(parent_name, 0)); if (IS_ERR(hw)) return; @@ -69,7 +70,8 @@ static void __init of_sama5d2_clk_audio_pll_pad_setup(struct device_node *np) parent_name = of_clk_get_parent_name(np, 0); - hw = at91_clk_register_audio_pll_pad(regmap, name, parent_name, NULL); + hw = at91_clk_register_audio_pll_pad(regmap, name, NULL, + &AT91_CLK_PD_NAME(parent_name, 0)); if (IS_ERR(hw)) return; @@ -95,7 +97,7 @@ static void __init of_sama5d2_clk_audio_pll_pmc_setup(struct device_node *np) parent_name = of_clk_get_parent_name(np, 0); - hw = at91_clk_register_audio_pll_pmc(regmap, name, parent_name, NULL); + hw = at91_clk_register_audio_pll_pmc(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name, 0)); if (IS_ERR(hw)) return; @@ -129,6 +131,7 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np) struct clk_hw *hw; unsigned int num_parents; const char *parent_names[GENERATED_SOURCE_MAX]; + struct clk_parent_data parent_data[GENERATED_SOURCE_MAX]; struct device_node *gcknp, *parent_np; struct clk_range range = CLK_RANGE(0, 0); struct regmap *regmap; @@ -149,6 +152,8 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np) if (IS_ERR(regmap)) return; + for (unsigned int i = 0; i < num_parents; i++) + parent_data[i] = AT91_CLK_PD_NAME(parent_names[i], i); for_each_child_of_node(np, gcknp) { int chg_pid = INT_MIN; @@ -171,7 +176,7 @@ static void __init of_sama5d2_clk_generated_setup(struct device_node *np) hw = at91_clk_register_generated(regmap, &pmc_pcr_lock, &dt_pcr_layout, name, - parent_names, NULL, NULL, + NULL, parent_data, NULL, num_parents, id, &range, chg_pid); if (IS_ERR(hw)) @@ -201,7 +206,7 @@ static void __init of_sama5d4_clk_h32mx_setup(struct device_node *np) parent_name = of_clk_get_parent_name(np, 0); - hw = at91_clk_register_h32mx(regmap, name, parent_name, NULL); + hw = at91_clk_register_h32mx(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name, 0)); if (IS_ERR(hw)) return; @@ -228,6 +233,8 @@ static void __init of_sama5d2_clk_i2s_mux_setup(struct device_node *np) return; for_each_child_of_node(np, i2s_mux_np) { + struct clk_parent_data parent_data[2]; + if (of_property_read_u8(i2s_mux_np, "reg", &bus_id)) continue; @@ -238,8 +245,10 @@ static void __init of_sama5d2_clk_i2s_mux_setup(struct device_node *np) if (ret != 2) continue; + parent_data[0] = AT91_CLK_PD_NAME(parent_names[0], 0); + parent_data[1] = AT91_CLK_PD_NAME(parent_names[1], 1); hw = at91_clk_i2s_mux_register(regmap_sfr, i2s_mux_np->name, - parent_names, NULL, 2, bus_id); + NULL, parent_data, 2, bus_id); if (IS_ERR(hw)) continue; @@ -269,7 +278,8 @@ static void __init of_at91rm9200_clk_main_osc_setup(struct device_node *np) if (IS_ERR(regmap)) return; - hw = at91_clk_register_main_osc(regmap, name, parent_name, NULL, bypass); + hw = at91_clk_register_main_osc(regmap, name, NULL, + &AT91_CLK_PD_NAME(parent_name, 0), bypass); if (IS_ERR(hw)) return; @@ -323,7 +333,7 @@ static void __init of_at91rm9200_clk_main_setup(struct device_node *np) if (IS_ERR(regmap)) return; - hw = at91_clk_register_rm9200_main(regmap, name, parent_name, NULL); + hw = at91_clk_register_rm9200_main(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name, 0)); if (IS_ERR(hw)) return; @@ -336,6 +346,7 @@ static void __init of_at91sam9x5_clk_main_setup(struct device_node *np) { struct clk_hw *hw; const char *parent_names[2]; + struct clk_parent_data parent_data[2]; unsigned int num_parents; const char *name = np->name; struct regmap *regmap; @@ -354,7 +365,9 @@ static void __init of_at91sam9x5_clk_main_setup(struct device_node *np) of_property_read_string(np, "clock-output-names", &name); - hw = at91_clk_register_sam9x5_main(regmap, name, parent_names, NULL, + parent_data[0] = AT91_CLK_PD_NAME(parent_names[0], 0); + parent_data[1] = AT91_CLK_PD_NAME(parent_names[1], 1); + hw = at91_clk_register_sam9x5_main(regmap, name, NULL, parent_data, num_parents); if (IS_ERR(hw)) return; @@ -396,6 +409,7 @@ of_at91_clk_master_setup(struct device_node *np, struct clk_hw *hw; unsigned int num_parents; const char *parent_names[MASTER_SOURCE_MAX]; + struct clk_parent_data parent_data[MASTER_SOURCE_MAX]; const char *name = np->name; struct clk_master_characteristics *characteristics; struct regmap *regmap; @@ -419,13 +433,15 @@ of_at91_clk_master_setup(struct device_node *np, if (IS_ERR(regmap)) return; + for (unsigned int i = 0; i < MASTER_SOURCE_MAX; i++) + parent_data[i] = AT91_CLK_PD_NAME(parent_names[i], i); hw = at91_clk_register_master_pres(regmap, "masterck_pres", num_parents, - parent_names, NULL, layout, + NULL, parent_data, layout, characteristics, &mck_lock); if (IS_ERR(hw)) goto out_free_characteristics; - hw = at91_clk_register_master_div(regmap, name, "masterck_pres", NULL, + hw = at91_clk_register_master_div(regmap, name, NULL, &AT91_CLK_PD_HW(hw), layout, characteristics, &mck_lock, CLK_SET_RATE_GATE, 0); if (IS_ERR(hw)) @@ -489,8 +505,8 @@ of_at91_clk_periph_setup(struct device_node *np, u8 type) name = periphclknp->name; if (type == PERIPHERAL_AT91RM9200) { - hw = at91_clk_register_peripheral(regmap, name, - parent_name, NULL, id); + hw = at91_clk_register_peripheral(regmap, name, NULL, + &AT91_CLK_PD_NAME(parent_name, 0), id); } else { struct clk_range range = CLK_RANGE(0, 0); unsigned long flags = 0; @@ -511,8 +527,8 @@ of_at91_clk_periph_setup(struct device_node *np, u8 type) &pmc_pcr_lock, &dt_pcr_layout, name, - parent_name, NULL, + &AT91_CLK_PD_NAME(parent_name, 0), id, &range, INT_MIN, flags); @@ -665,7 +681,8 @@ of_at91_clk_pll_setup(struct device_node *np, if (!characteristics) return; - hw = at91_clk_register_pll(regmap, name, parent_name, NULL, id, layout, + hw = at91_clk_register_pll(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name, 0), + id, layout, characteristics); if (IS_ERR(hw)) goto out_free_characteristics; @@ -724,7 +741,7 @@ of_at91sam9x5_clk_plldiv_setup(struct device_node *np) if (IS_ERR(regmap)) return; - hw = at91_clk_register_plldiv(regmap, name, parent_name, NULL); + hw = at91_clk_register_plldiv(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name, 0)); if (IS_ERR(hw)) return; @@ -743,6 +760,7 @@ of_at91_clk_prog_setup(struct device_node *np, struct clk_hw *hw; unsigned int num_parents; const char *parent_names[PROG_SOURCE_MAX]; + struct clk_parent_data parent_data[PROG_SOURCE_MAX]; const char *name; struct device_node *progclknp, *parent_np; struct regmap *regmap; @@ -763,6 +781,8 @@ of_at91_clk_prog_setup(struct device_node *np, if (IS_ERR(regmap)) return; + for (unsigned int i = 0; i < PROG_SOURCE_MAX; i++) + parent_data[i] = AT91_CLK_PD_NAME(parent_names[i], i); for_each_child_of_node(np, progclknp) { if (of_property_read_u32(progclknp, "reg", &id)) continue; @@ -771,7 +791,7 @@ of_at91_clk_prog_setup(struct device_node *np, name = progclknp->name; hw = at91_clk_register_programmable(regmap, name, - parent_names, NULL, num_parents, + NULL, parent_data, num_parents, id, layout, mux_table); if (IS_ERR(hw)) continue; @@ -805,6 +825,7 @@ static void __init of_at91sam9260_clk_slow_setup(struct device_node *np) { struct clk_hw *hw; const char *parent_names[2]; + struct clk_parent_data parent_data[2]; unsigned int num_parents; const char *name = np->name; struct regmap *regmap; @@ -823,7 +844,9 @@ static void __init of_at91sam9260_clk_slow_setup(struct device_node *np) of_property_read_string(np, "clock-output-names", &name); - hw = at91_clk_register_sam9260_slow(regmap, name, parent_names, NULL, + parent_data[0] = AT91_CLK_PD_NAME(parent_names[0], 0); + parent_data[1] = AT91_CLK_PD_NAME(parent_names[1], 1); + hw = at91_clk_register_sam9260_slow(regmap, name, NULL, parent_data, num_parents); if (IS_ERR(hw)) return; @@ -841,6 +864,7 @@ static void __init of_at91sam9x5_clk_smd_setup(struct device_node *np) struct clk_hw *hw; unsigned int num_parents; const char *parent_names[SMD_SOURCE_MAX]; + struct clk_parent_data parent_data[SMD_SOURCE_MAX]; const char *name = np->name; struct regmap *regmap; struct device_node *parent_np; @@ -859,7 +883,9 @@ static void __init of_at91sam9x5_clk_smd_setup(struct device_node *np) if (IS_ERR(regmap)) return; - hw = at91sam9x5_clk_register_smd(regmap, name, parent_names, NULL, + for (unsigned int i = 0; i < SMD_SOURCE_MAX; i++) + parent_data[i] = AT91_CLK_PD_NAME(parent_names[i], i); + hw = at91sam9x5_clk_register_smd(regmap, name, NULL, parent_data, num_parents); if (IS_ERR(hw)) return; @@ -909,7 +935,8 @@ static void __init of_at91rm9200_clk_sys_setup(struct device_node *np) if (!strcmp(sysclknp->name, "ddrck")) flags = CLK_IS_CRITICAL; - hw = at91_clk_register_system(regmap, name, parent_name, NULL, + hw = at91_clk_register_system(regmap, name, NULL, + &AT91_CLK_PD_NAME(parent_name, 0), id, flags); if (IS_ERR(hw)) continue; @@ -928,6 +955,7 @@ static void __init of_at91sam9x5_clk_usb_setup(struct device_node *np) struct clk_hw *hw; unsigned int num_parents; const char *parent_names[USB_SOURCE_MAX]; + struct clk_parent_data parent_data[USB_SOURCE_MAX]; const char *name = np->name; struct regmap *regmap; struct device_node *parent_np; @@ -946,7 +974,9 @@ static void __init of_at91sam9x5_clk_usb_setup(struct device_node *np) if (IS_ERR(regmap)) return; - hw = at91sam9x5_clk_register_usb(regmap, name, parent_names, NULL, + for (unsigned int i = 0; i < USB_SOURCE_MAX; i++) + parent_data[i] = AT91_CLK_PD_NAME(parent_names[i], i); + hw = at91sam9x5_clk_register_usb(regmap, name, NULL, parent_data, num_parents); if (IS_ERR(hw)) return; @@ -976,7 +1006,7 @@ static void __init of_at91sam9n12_clk_usb_setup(struct device_node *np) if (IS_ERR(regmap)) return; - hw = at91sam9n12_clk_register_usb(regmap, name, parent_name, NULL); + hw = at91sam9n12_clk_register_usb(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name, 0)); if (IS_ERR(hw)) return; @@ -1009,7 +1039,8 @@ static void __init of_at91rm9200_clk_usb_setup(struct device_node *np) of_node_put(parent_np); if (IS_ERR(regmap)) return; - hw = at91rm9200_clk_register_usb(regmap, name, parent_name, NULL, divisors); + hw = at91rm9200_clk_register_usb(regmap, name, NULL, &AT91_CLK_PD_NAME(parent_name, 0), + divisors); if (IS_ERR(hw)) return; @@ -1056,7 +1087,8 @@ static void __init of_at91sam9x5_clk_utmi_setup(struct device_node *np) regmap_sfr = NULL; } - hw = at91_clk_register_utmi(regmap_pmc, regmap_sfr, name, parent_name, NULL); + hw = at91_clk_register_utmi(regmap_pmc, regmap_sfr, name, NULL, + &AT91_CLK_PD_NAME(parent_name, 0)); if (IS_ERR(hw)) return; -- 2.43.0