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 573C3C83F1A for ; Thu, 10 Jul 2025 22:28:51 +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=+FyPIX5YST3zFylEx1GdWOWTzhms807H5eyzGGwKGEA=; b=nd3OphkiJKGkRYM/2KbUy3F4TU AY0zzcgfofmEIZjYlfqGnWgyrETkpBvyi8QZExKhlHhQhm5wTyuKHnR5ktlMo6M0IdVb9MuTdsUtk LzoXK1tuZucJzXNcun2BFvKL/oFGJsEVbujibOt2zkmtwtOgRtsaObzOKlexHlrCVCV9hdZGGJzap ENnDUTgBSWbtjRi59ZlnglxWQZin1Nt63GD8kAHb2bCuoemTDsD2cMoSNl+EE50LrYDGN/AUo7DNS YUAbzUqHa30rNBrdNw1W3aPnAdRr4CqfPpbhmvLOaVunseEfUamisrD1QWmURLQ6B9VwHh4yBMoeM eVDgMcNQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uZzkx-0000000D9wD-3Vpz; Thu, 10 Jul 2025 22:28:43 +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 1uZxYr-0000000Ct56-1QX3 for linux-arm-kernel@bombadil.infradead.org; Thu, 10 Jul 2025 20:08:05 +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=+FyPIX5YST3zFylEx1GdWOWTzhms807H5eyzGGwKGEA=; b=K892IDuncnC0Q8c/coQoltEzoV R5J/HuyfTJfqFLoc3jzTn/nbUv6J55kvyj9x162drWHXETwEKuWrFNX+TRdhkUn8VIy3So/rJiXxu qpvhddP7Vt/MlO5boiRe/MlIsLLQaegeyz55bX/tZ+l7sQm0vKwN52bSu96Gf+FWrTakiVxYBmvkB uXcySbN3eTN7EECKe0cpR2lJmKYMvbDUL9P30EkrtLG0l1lDqXiq/2Eybp0v1QzbW5DE5Bb+B9G4V b9KleLWVcLodrG2lxJcD5YnMwOnrE7GoJJjqYkkgQNUmS4AjWkBubmU3D6kjAjxPdxibEoYCDh2Lz 0eOXIvTQ==; Received: from esa.microchip.iphmx.com ([68.232.154.123]) by desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uZxYn-000000098p4-15oR for linux-arm-kernel@lists.infradead.org; Thu, 10 Jul 2025 20:08:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1752178081; x=1783714081; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+MGF8oUECtyGKv0W1oc3OMpdvH9gAxZJGHtBxoptgJs=; b=L3Y2QkS6eiVsyBlyAkVWruuB8uCcl/ulJm+z2pXT2Y0Ff1uqtQmox8IV z5gEvso6Bsf4eu9riDlrDhp8P5Mx6zUzhBUZE1AdbzKyzs18AKwCB9Wox U8565HFbALASzYCgMfs8DYWWSjzmHszEuU6+vzW/qUkswf2wmO6zyDjsS RaDr7FUgrvroUx5iBJKW9AsR/GkiQbSJXdQlep2vyurnKGkXqeclyIxV9 W5fONXV3KgSVMnW5pLw+jTSWfwfVLISMq7i/Q2QDU5bQv0X9fymoAq5IN VPP2tl0ErxkqBHYVlnrSidYAaxljLp0ICd8Fg/ifQmgLM4McqnVj1dz57 w==; X-CSE-ConnectionGUID: VcY24SkbRKSMnNSaLxS1vA== X-CSE-MsgGUID: /sT6QqFQRwid3mMhXrBWcQ== X-IronPort-AV: E=Sophos;i="6.16,301,1744095600"; d="scan'208";a="44448161" X-Amp-Result: SKIPPED(no attachment in message) Received: from unknown (HELO email.microchip.com) ([170.129.1.10]) by esa2.microchip.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES128-GCM-SHA256; 10 Jul 2025 13:07:53 -0700 Received: from chn-vm-ex04.mchp-main.com (10.10.85.152) by chn-vm-ex04.mchp-main.com (10.10.85.152) 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:31 -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:31 -0700 From: To: , , , , CC: , , , , Subject: [PATCH v3 06/32] clk: at91: clk-main: switch to clk parent data Date: Thu, 10 Jul 2025 13:06:59 -0700 Message-ID: <33cec8a2f82e1bc747aa4315e47d535b7cec5a63.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_210802_183027_3DA0B885 X-CRM114-Status: GOOD ( 14.49 ) 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 Use struct clk_parent_data instead of parent_hw for the main clock. Signed-off-by: Claudiu Beznea [ryan.wanner@microchip: Add SAMA7D65 and SAM9X75 SoCs to use parent_data.] Signed-off-by: Ryan Wanner --- drivers/clk/at91/clk-main.c | 16 ++++++++-------- drivers/clk/at91/pmc.h | 4 ++-- drivers/clk/at91/sam9x7.c | 21 ++++++++++----------- drivers/clk/at91/sama7d65.c | 21 ++++++++++----------- drivers/clk/at91/sama7g5.c | 21 ++++++++++----------- 5 files changed, 40 insertions(+), 43 deletions(-) diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c index 9b462becc693..514c5690253f 100644 --- a/drivers/clk/at91/clk-main.c +++ b/drivers/clk/at91/clk-main.c @@ -402,7 +402,7 @@ struct clk_hw * __init at91_clk_register_rm9200_main(struct regmap *regmap, const char *name, const char *parent_name, - struct clk_hw *parent_hw) + struct clk_parent_data *parent_data) { struct clk_rm9200_main *clkmain; struct clk_init_data init = {}; @@ -412,7 +412,7 @@ at91_clk_register_rm9200_main(struct regmap *regmap, if (!name) return ERR_PTR(-EINVAL); - if (!(parent_name || parent_hw)) + if (!(parent_name || parent_data)) return ERR_PTR(-EINVAL); clkmain = kzalloc(sizeof(*clkmain), GFP_KERNEL); @@ -421,8 +421,8 @@ at91_clk_register_rm9200_main(struct regmap *regmap, init.name = name; init.ops = &rm9200_main_ops; - if (parent_hw) - init.parent_hws = (const struct clk_hw **)&parent_hw; + if (parent_data) + init.parent_data = (const struct clk_parent_data *)parent_data; else init.parent_names = &parent_name; init.num_parents = 1; @@ -552,7 +552,7 @@ struct clk_hw * __init at91_clk_register_sam9x5_main(struct regmap *regmap, const char *name, const char **parent_names, - struct clk_hw **parent_hws, + struct clk_parent_data *parent_data, int num_parents) { struct clk_sam9x5_main *clkmain; @@ -564,7 +564,7 @@ at91_clk_register_sam9x5_main(struct regmap *regmap, if (!name) return ERR_PTR(-EINVAL); - if (!(parent_hws || parent_names) || !num_parents) + if (!(parent_data || parent_names) || !num_parents) return ERR_PTR(-EINVAL); clkmain = kzalloc(sizeof(*clkmain), GFP_KERNEL); @@ -573,8 +573,8 @@ at91_clk_register_sam9x5_main(struct regmap *regmap, init.name = name; init.ops = &sam9x5_main_ops; - if (parent_hws) - init.parent_hws = (const struct clk_hw **)parent_hws; + if (parent_data) + init.parent_data = (const struct clk_parent_data *)parent_data; else init.parent_names = parent_names; init.num_parents = num_parents; diff --git a/drivers/clk/at91/pmc.h b/drivers/clk/at91/pmc.h index b6f2aca1e1fd..e32a5e85d08f 100644 --- a/drivers/clk/at91/pmc.h +++ b/drivers/clk/at91/pmc.h @@ -195,11 +195,11 @@ struct clk_hw * __init at91_clk_register_rm9200_main(struct regmap *regmap, const char *name, const char *parent_name, - struct clk_hw *parent_hw); + struct clk_parent_data *parent_data); struct clk_hw * __init at91_clk_register_sam9x5_main(struct regmap *regmap, const char *name, const char **parent_names, - struct clk_hw **parent_hws, int num_parents); + struct clk_parent_data *parent_data, int num_parents); struct clk_hw * __init at91_clk_register_master_pres(struct regmap *regmap, const char *name, diff --git a/drivers/clk/at91/sam9x7.c b/drivers/clk/at91/sam9x7.c index d7dc5f381ebe..eaae05ba21ad 100644 --- a/drivers/clk/at91/sam9x7.c +++ b/drivers/clk/at91/sam9x7.c @@ -747,7 +747,7 @@ static void __init sam9x7_pmc_setup(struct device_node *np) struct regmap *regmap; struct clk_hw *hw, *main_rc_hw, *main_osc_hw, *main_xtal_hw; struct clk_hw *td_slck_hw, *md_slck_hw, *usbck_hw; - static struct clk_parent_data parent_data; + struct clk_parent_data parent_data[2]; struct clk_hw *parent_hws[9]; int i, j; @@ -780,15 +780,14 @@ static void __init sam9x7_pmc_setup(struct device_node *np) if (IS_ERR(main_rc_hw)) goto err_free; - parent_data.name = main_xtal_name; - parent_data.fw_name = main_xtal_name; - main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, &parent_data, 0); + main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, + &AT91_CLK_PD_NAME(main_xtal_name, main_xtal_index), 0); if (IS_ERR(main_osc_hw)) goto err_free; - parent_hws[0] = main_rc_hw; - parent_hws[1] = main_osc_hw; - hw = at91_clk_register_sam9x5_main(regmap, "mainck", NULL, parent_hws, 2); + parent_data[0] = AT91_CLK_PD_HW(main_rc_hw); + parent_data[1] = AT91_CLK_PD_HW(main_osc_hw); + hw = at91_clk_register_sam9x5_main(regmap, "mainck", NULL, parent_data, 2); if (IS_ERR(hw)) goto err_free; @@ -805,12 +804,12 @@ static void __init sam9x7_pmc_setup(struct device_node *np) case PLL_TYPE_FRAC: switch (sam9x7_plls[i][j].p) { case SAM9X7_PLL_PARENT_MAINCK: - parent_data = AT91_CLK_PD_NAME("mainck", -1); + parent_data[0] = AT91_CLK_PD_NAME("mainck", -1); hw = sam9x7_pmc->chws[PMC_MAIN]; break; case SAM9X7_PLL_PARENT_MAIN_XTAL: - parent_data = AT91_CLK_PD_NAME(main_xtal_name, - main_xtal_index); + parent_data[0] = AT91_CLK_PD_NAME(main_xtal_name, + main_xtal_index); hw = main_xtal_hw; break; default: @@ -825,7 +824,7 @@ static void __init sam9x7_pmc_setup(struct device_node *np) hw = sam9x60_clk_register_frac_pll(regmap, &pmc_pll_lock, sam9x7_plls[i][j].n, - &parent_data, parent_rate, i, + parent_data, parent_rate, i, sam9x7_plls[i][j].c, sam9x7_plls[i][j].l, sam9x7_plls[i][j].f); diff --git a/drivers/clk/at91/sama7d65.c b/drivers/clk/at91/sama7d65.c index 372e530f4107..1d461db0438f 100644 --- a/drivers/clk/at91/sama7d65.c +++ b/drivers/clk/at91/sama7d65.c @@ -1098,7 +1098,7 @@ static void __init sama7d65_pmc_setup(struct device_node *np) struct regmap *regmap; struct clk_hw *hw, *main_rc_hw, *main_osc_hw, *main_xtal_hw; struct clk_hw *td_slck_hw, *md_slck_hw; - static struct clk_parent_data parent_data; + struct clk_parent_data parent_data[2]; struct clk_hw *parent_hws[10]; bool bypass; int i, j; @@ -1134,16 +1134,15 @@ static void __init sama7d65_pmc_setup(struct device_node *np) bypass = of_property_read_bool(np, "atmel,osc-bypass"); - parent_data.name = main_xtal_name; - parent_data.fw_name = main_xtal_name; main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, - &parent_data, bypass); + &AT91_CLK_PD_NAME(main_xtal_name, main_xtal_index), + bypass); if (IS_ERR(main_osc_hw)) goto err_free; - parent_hws[0] = main_rc_hw; - parent_hws[1] = main_osc_hw; - hw = at91_clk_register_sam9x5_main(regmap, "mainck", NULL, parent_hws, 2); + parent_data[0] = AT91_CLK_PD_HW(main_rc_hw); + parent_data[1] = AT91_CLK_PD_HW(main_osc_hw); + hw = at91_clk_register_sam9x5_main(regmap, "mainck", NULL, parent_data, 2); if (IS_ERR(hw)) goto err_free; @@ -1160,12 +1159,12 @@ static void __init sama7d65_pmc_setup(struct device_node *np) case PLL_TYPE_FRAC: switch (sama7d65_plls[i][j].p) { case SAMA7D65_PLL_PARENT_MAINCK: - parent_data = AT91_CLK_PD_NAME("mainck", -1); + parent_data[0] = AT91_CLK_PD_NAME("mainck", -1); hw = sama7d65_pmc->chws[PMC_MAIN]; break; case SAMA7D65_PLL_PARENT_MAIN_XTAL: - parent_data = AT91_CLK_PD_NAME(main_xtal_name, - main_xtal_index); + parent_data[0] = AT91_CLK_PD_NAME(main_xtal_name, + main_xtal_index); hw = main_xtal_hw; break; default: @@ -1178,7 +1177,7 @@ static void __init sama7d65_pmc_setup(struct device_node *np) hw = sam9x60_clk_register_frac_pll(regmap, &pmc_pll_lock, sama7d65_plls[i][j].n, - &parent_data, parent_rate, i, + parent_data, parent_rate, i, sama7d65_plls[i][j].c, sama7d65_plls[i][j].l, sama7d65_plls[i][j].f); diff --git a/drivers/clk/at91/sama7g5.c b/drivers/clk/at91/sama7g5.c index f28fe419ae5e..f816a5551277 100644 --- a/drivers/clk/at91/sama7g5.c +++ b/drivers/clk/at91/sama7g5.c @@ -977,7 +977,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np) struct regmap *regmap; struct clk_hw *hw, *main_rc_hw, *main_osc_hw, *main_xtal_hw; struct clk_hw *td_slck_hw, *md_slck_hw; - static struct clk_parent_data parent_data; + struct clk_parent_data parent_data[2]; struct clk_hw *parent_hws[10]; bool bypass; int i, j; @@ -1013,16 +1013,15 @@ static void __init sama7g5_pmc_setup(struct device_node *np) bypass = of_property_read_bool(np, "atmel,osc-bypass"); - parent_data.name = main_xtal_name; - parent_data.fw_name = main_xtal_name; main_osc_hw = at91_clk_register_main_osc(regmap, "main_osc", NULL, - &parent_data, bypass); + &AT91_CLK_PD_NAME(main_xtal_name, main_xtal_index), + bypass); if (IS_ERR(main_osc_hw)) goto err_free; - parent_hws[0] = main_rc_hw; - parent_hws[1] = main_osc_hw; - hw = at91_clk_register_sam9x5_main(regmap, "mainck", NULL, parent_hws, 2); + parent_data[0] = AT91_CLK_PD_HW(main_rc_hw); + parent_data[1] = AT91_CLK_PD_HW(main_osc_hw); + hw = at91_clk_register_sam9x5_main(regmap, "mainck", NULL, parent_data, 2); if (IS_ERR(hw)) goto err_free; @@ -1039,12 +1038,12 @@ static void __init sama7g5_pmc_setup(struct device_node *np) case PLL_TYPE_FRAC: switch (sama7g5_plls[i][j].p) { case SAMA7G5_PLL_PARENT_MAINCK: - parent_data = AT91_CLK_PD_NAME("mainck", -1); + parent_data[0] = AT91_CLK_PD_NAME("mainck", -1); hw = sama7g5_pmc->chws[PMC_MAIN]; break; case SAMA7G5_PLL_PARENT_MAIN_XTAL: - parent_data = AT91_CLK_PD_NAME(main_xtal_name, - main_xtal_index); + parent_data[0] = AT91_CLK_PD_NAME(main_xtal_name, + main_xtal_index); hw = main_xtal_hw; break; default: @@ -1058,7 +1057,7 @@ static void __init sama7g5_pmc_setup(struct device_node *np) hw = sam9x60_clk_register_frac_pll(regmap, &pmc_pll_lock, sama7g5_plls[i][j].n, - &parent_data, parent_rate, i, + parent_data, parent_rate, i, sama7g5_plls[i][j].c, sama7g5_plls[i][j].l, sama7g5_plls[i][j].f); -- 2.43.0