From nobody Fri Dec 19 17:36:01 2025 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 6EE552DE1E6 for ; Thu, 6 Nov 2025 19:59:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762459187; cv=none; b=f6X0dbJqoXHciZXXBNn+kbdgTopAzTzTos85AuWDm3U5lKZlZ/HJdwF83AB+KoQ7M6sHFenr0yxtC2hGlFKWSUXG73aYkvy4fc1rGA/1T5fM8CPQDxLzZnlFb3pWj2ZSI4BNvtrxt+TtthOvIKKA4gZYbJPgU9g2XpxyPvv8nrs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762459187; c=relaxed/simple; bh=0uIR8Qg8yt3OmnrdjUH1eJLhte55yFIneXSQYFVOiCY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gdDeKzzzubYeVPqsF/P24xITv+GKz96isNReko+hcgfNgJZooSjpMA9fSaO3d6F5HLH+edwpo5LEpEWTOUxbwPkI9c79K+4UoC8T7nuoAHxraB+pNsSd27eB4MHixmdL846Mz4/yA31PZTRfsp1OvCuy0oKR7YTUCpIYxC2YNa0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=JHCDdm+V; arc=none smtp.client-ip=209.85.221.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="JHCDdm+V" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-429c7869704so5716f8f.2 for ; Thu, 06 Nov 2025 11:59:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762459184; x=1763063984; 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=q/ctzYR0cJkPKD2JP2ySHJQqhhHfUgTf2W4E572ADBk=; b=JHCDdm+VaiftJZM7n18t+x4WQtVK6ko/if31MhJUeDylwpBq3XyfTR955vhW4mU6Hk oowLEM/QwI4pTAwBvJWOHtjZEPMf/fg/94JX37uHBexYleIyskAMfQ4yiSGf+RjGkusY DQNWCQ7AI8mD1M+eskUhsNkA5slt4hhOhUkg8DI0n7djSMUT+ghN5ZfNBN/7AQuZxApH HBhXdrArXdbhTVA6sDiA8CbF9bJiYVMqSIPwg1sgjpMM9nmycKnKdBjlAPMi0BVycqb2 oqMEAYVfdEwKqWetEXZrJopiQnC+uQkmYICptjuVOf21gHfCBOTaPWtfgZUdGPJzk4wS 9UjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762459184; x=1763063984; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=q/ctzYR0cJkPKD2JP2ySHJQqhhHfUgTf2W4E572ADBk=; b=qaqgWre8z9cai1uks9dkSrtlv2brr25BOyR6C8wvvWRi7UiSSqxBiSAvYbhQo5Ekid zuMEAwWZ0dBAnqPy+mtj08nzgZRDHaqbtCefptV8dPfQvb6/KlEc9juraYDUOjiMQqxP nDblOKD3RWlsjvTTA5mrzrbCsMZrdgF0UEmvQTur/3N9Fsw+uWkjGJLSKKjjizCvpJnz sTCUagdaCE9LWIJzn0+pI80FuEf8ywyfPr8NBtjTBFUciU5WrsGFCLn/jigBqKDb032h NVBZm7++1H9vK85ghE9izis3j9Dk33F3f8BECmTPyI5CrpHQbKPNhoRR9cV9USyVIzoz I5dg== X-Forwarded-Encrypted: i=1; AJvYcCWPC3qVu1kE05pZDs7vYcKCt6V4LGs7oWyqUhsJVeTA+1x3wbSeLJK8qyhT3QwpMIOTOliBw6XVInvobiI=@vger.kernel.org X-Gm-Message-State: AOJu0YysJusKycMKDeTXNaOiWCgendhxLjf2R5aUHPxFIrEZnBn7gCat eL9gzqWjq3Yu/yqbaGuYlZLEvvSG+44LKLXvwMLQOr9hlr6KDLn3iS+v X-Gm-Gg: ASbGncsCY6+GAYb8OjQGnGgkBLL05sPaEhuuEIlAdZo10WWLxEdcfGeCY3NgabdkOOf TQwMO1P0yNN+149n7YjDrtkjf+TvgrnbsUztOnlKmHzhBYteoVmJdedPADEdXMoKqP0TC405D4g UWG4I7oPC8xawmvTyi0bWTSPOX9fJ29blwwsY/NVwz35s570D/gXCgbNBOKDWQE6wmh0eWlAZpb wLuzmSPsHnFkm9LRT457LUoZfvxpLBy8G1qpJC2AGIi38vwjOWg+CFT754Bp9mtUf9w1dY4vw/j V7037MEQGSjPkrNsgvFO3NULiHdEHOFJuodl2lKWSeQL0XlrGUjGedkGjV9Nc7on4ttZk9zqrS3 uCyhqVGfHhPmrhTfPVKKD/4rv5ELMXE+uHcy9qMImLexqCs8W6bamyZcDno4oDDdCy2RKqCVpOe M5gyg0G7HG5gt+V7eYyEdFVhe3pMX2/w== X-Google-Smtp-Source: AGHT+IGQDx7RvvjrjkDSZGpRYT8YPQC4M9SiZCedTbsw4bmTNh1TUkV57bJnfaRioQ2iiFwpXZh41w== X-Received: by 2002:a05:6000:2dc3:b0:429:d3e9:667 with SMTP id ffacd0b85a97d-42ae588195emr365883f8f.18.1762459183629; Thu, 06 Nov 2025 11:59:43 -0800 (PST) Received: from Ansuel-XPS24 (93-34-90-37.ip49.fastwebnet.it. [93.34.90.37]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-42abe62bfa0sm990037f8f.5.2025.11.06.11.59.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Nov 2025 11:59:42 -0800 (PST) From: Christian Marangi To: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Felix Fietkau , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [PATCH v3 1/5] clk: en7523: convert driver to regmap API Date: Thu, 6 Nov 2025 20:59:28 +0100 Message-ID: <20251106195935.1767696-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251106195935.1767696-1-ansuelsmth@gmail.com> References: <20251106195935.1767696-1-ansuelsmth@gmail.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" Convert driver to regmap API, in preparation for support of Airoha AN7523 as the SCU will be an MFD and the regmap will be provided in the parent node. Signed-off-by: Christian Marangi --- drivers/clk/clk-en7523.c | 137 ++++++++++++++++++++++----------------- 1 file changed, 76 insertions(+), 61 deletions(-) diff --git a/drivers/clk/clk-en7523.c b/drivers/clk/clk-en7523.c index 15bbdeb60b8e..314e7450313f 100644 --- a/drivers/clk/clk-en7523.c +++ b/drivers/clk/clk-en7523.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only =20 +#include #include #include #include @@ -34,6 +35,7 @@ #define REG_RESET_CONTROL_PCIE2 BIT(26) /* EN7581 */ #define REG_NP_SCU_PCIC 0x88 +#define REG_PCIE_CTRL GENMASK(7, 0) #define REG_NP_SCU_SSTR 0x9c #define REG_PCIE_XSI0_SEL_MASK GENMASK(14, 13) #define REG_PCIE_XSI1_SEL_MASK GENMASK(12, 11) @@ -63,14 +65,14 @@ struct en_clk_desc { }; =20 struct en_clk_gate { - void __iomem *base; + struct regmap *map; struct clk_hw hw; }; =20 struct en_rst_data { const u16 *bank_ofs; const u16 *idx_map; - void __iomem *base; + struct regmap *map; struct reset_controller_dev rcdev; }; =20 @@ -388,44 +390,44 @@ static u32 en7523_get_div(const struct en_clk_desc *d= esc, u32 val) static int en7523_pci_is_enabled(struct clk_hw *hw) { struct en_clk_gate *cg =3D container_of(hw, struct en_clk_gate, hw); + u32 val; =20 - return !!(readl(cg->base + REG_PCI_CONTROL) & REG_PCI_CONTROL_REFCLK_EN1); + regmap_read(cg->map, REG_PCI_CONTROL, &val); + return !!(val & REG_PCI_CONTROL_REFCLK_EN1); } =20 static int en7523_pci_prepare(struct clk_hw *hw) { struct en_clk_gate *cg =3D container_of(hw, struct en_clk_gate, hw); - void __iomem *np_base =3D cg->base; - u32 val, mask; + struct regmap *map =3D cg->map; + u32 mask; =20 /* Need to pull device low before reset */ - val =3D readl(np_base + REG_PCI_CONTROL); - val &=3D ~(REG_PCI_CONTROL_PERSTOUT1 | REG_PCI_CONTROL_PERSTOUT); - writel(val, np_base + REG_PCI_CONTROL); + regmap_clear_bits(map, REG_PCI_CONTROL, + REG_PCI_CONTROL_PERSTOUT1 | + REG_PCI_CONTROL_PERSTOUT); usleep_range(1000, 2000); =20 /* Enable PCIe port 1 */ - val |=3D REG_PCI_CONTROL_REFCLK_EN1; - writel(val, np_base + REG_PCI_CONTROL); + regmap_set_bits(map, REG_PCI_CONTROL, + REG_PCI_CONTROL_REFCLK_EN1); usleep_range(1000, 2000); =20 /* Reset to default */ - val =3D readl(np_base + REG_RESET_CONTROL1); mask =3D REG_RESET_CONTROL_PCIE1 | REG_RESET_CONTROL_PCIE2 | REG_RESET_CONTROL_PCIEHB; - writel(val & ~mask, np_base + REG_RESET_CONTROL1); + regmap_clear_bits(map, REG_RESET_CONTROL1, mask); usleep_range(1000, 2000); - writel(val | mask, np_base + REG_RESET_CONTROL1); + regmap_set_bits(map, REG_RESET_CONTROL1, mask); msleep(100); - writel(val & ~mask, np_base + REG_RESET_CONTROL1); + regmap_clear_bits(map, REG_RESET_CONTROL1, mask); usleep_range(5000, 10000); =20 /* Release device */ mask =3D REG_PCI_CONTROL_PERSTOUT1 | REG_PCI_CONTROL_PERSTOUT; - val =3D readl(np_base + REG_PCI_CONTROL); - writel(val & ~mask, np_base + REG_PCI_CONTROL); + regmap_clear_bits(map, REG_PCI_CONTROL, mask); usleep_range(1000, 2000); - writel(val | mask, np_base + REG_PCI_CONTROL); + regmap_set_bits(map, REG_PCI_CONTROL, mask); msleep(250); =20 return 0; @@ -434,16 +436,13 @@ static int en7523_pci_prepare(struct clk_hw *hw) static void en7523_pci_unprepare(struct clk_hw *hw) { struct en_clk_gate *cg =3D container_of(hw, struct en_clk_gate, hw); - void __iomem *np_base =3D cg->base; - u32 val; + struct regmap *map =3D cg->map; =20 - val =3D readl(np_base + REG_PCI_CONTROL); - val &=3D ~REG_PCI_CONTROL_REFCLK_EN1; - writel(val, np_base + REG_PCI_CONTROL); + regmap_clear_bits(map, REG_PCI_CONTROL, REG_PCI_CONTROL_REFCLK_EN1); } =20 static struct clk_hw *en7523_register_pcie_clk(struct device *dev, - void __iomem *np_base) + struct regmap *clk_map) { const struct en_clk_soc_data *soc_data =3D device_get_match_data(dev); struct clk_init_data init =3D { @@ -456,7 +455,7 @@ static struct clk_hw *en7523_register_pcie_clk(struct d= evice *dev, if (!cg) return NULL; =20 - cg->base =3D np_base; + cg->map =3D clk_map; cg->hw.init =3D &init; =20 if (init.ops->unprepare) @@ -474,21 +473,20 @@ static int en7581_pci_is_enabled(struct clk_hw *hw) u32 val, mask; =20 mask =3D REG_PCI_CONTROL_REFCLK_EN0 | REG_PCI_CONTROL_REFCLK_EN1; - val =3D readl(cg->base + REG_PCI_CONTROL); + regmap_read(cg->map, REG_PCI_CONTROL, &val); return (val & mask) =3D=3D mask; } =20 static int en7581_pci_enable(struct clk_hw *hw) { struct en_clk_gate *cg =3D container_of(hw, struct en_clk_gate, hw); - void __iomem *np_base =3D cg->base; - u32 val, mask; + struct regmap *map =3D cg->map; + u32 mask; =20 mask =3D REG_PCI_CONTROL_REFCLK_EN0 | REG_PCI_CONTROL_REFCLK_EN1 | REG_PCI_CONTROL_PERSTOUT1 | REG_PCI_CONTROL_PERSTOUT2 | REG_PCI_CONTROL_PERSTOUT; - val =3D readl(np_base + REG_PCI_CONTROL); - writel(val | mask, np_base + REG_PCI_CONTROL); + regmap_set_bits(map, REG_PCI_CONTROL, mask); =20 return 0; } @@ -496,19 +494,18 @@ static int en7581_pci_enable(struct clk_hw *hw) static void en7581_pci_disable(struct clk_hw *hw) { struct en_clk_gate *cg =3D container_of(hw, struct en_clk_gate, hw); - void __iomem *np_base =3D cg->base; - u32 val, mask; + struct regmap *map =3D cg->map; + u32 mask; =20 mask =3D REG_PCI_CONTROL_REFCLK_EN0 | REG_PCI_CONTROL_REFCLK_EN1 | REG_PCI_CONTROL_PERSTOUT1 | REG_PCI_CONTROL_PERSTOUT2 | REG_PCI_CONTROL_PERSTOUT; - val =3D readl(np_base + REG_PCI_CONTROL); - writel(val & ~mask, np_base + REG_PCI_CONTROL); + regmap_clear_bits(map, REG_PCI_CONTROL, mask); usleep_range(1000, 2000); } =20 static void en7523_register_clocks(struct device *dev, struct clk_hw_onece= ll_data *clk_data, - void __iomem *base, void __iomem *np_base) + struct regmap *map, struct regmap *clk_map) { struct clk_hw *hw; u32 rate; @@ -517,10 +514,12 @@ static void en7523_register_clocks(struct device *dev= , struct clk_hw_onecell_dat for (i =3D 0; i < ARRAY_SIZE(en7523_base_clks); i++) { const struct en_clk_desc *desc =3D &en7523_base_clks[i]; u32 reg =3D desc->div_reg ? desc->div_reg : desc->base_reg; - u32 val =3D readl(base + desc->base_reg); + u32 val; + + regmap_read(map, desc->base_reg, &val); =20 rate =3D en7523_get_base_rate(desc, val); - val =3D readl(base + reg); + regmap_read(map, reg, &val); rate /=3D en7523_get_div(desc, val); =20 hw =3D clk_hw_register_fixed_rate(dev, desc->name, NULL, 0, rate); @@ -533,30 +532,47 @@ static void en7523_register_clocks(struct device *dev= , struct clk_hw_onecell_dat clk_data->hws[desc->id] =3D hw; } =20 - hw =3D en7523_register_pcie_clk(dev, np_base); + hw =3D en7523_register_pcie_clk(dev, clk_map); clk_data->hws[EN7523_CLK_PCIE] =3D hw; } =20 +static const struct regmap_config en7523_clk_regmap_config =3D { + .reg_bits =3D 32, + .val_bits =3D 32, + .reg_stride =3D 4, +}; + static int en7523_clk_hw_init(struct platform_device *pdev, struct clk_hw_onecell_data *clk_data) { void __iomem *base, *np_base; + struct regmap *map, *clk_map; =20 base =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) return PTR_ERR(base); =20 + map =3D devm_regmap_init_mmio(&pdev->dev, base, + &en7523_clk_regmap_config); + if (IS_ERR(map)) + return PTR_ERR(map); + np_base =3D devm_platform_ioremap_resource(pdev, 1); if (IS_ERR(np_base)) return PTR_ERR(np_base); =20 - en7523_register_clocks(&pdev->dev, clk_data, base, np_base); + clk_map =3D devm_regmap_init_mmio(&pdev->dev, np_base, + &en7523_clk_regmap_config); + if (IS_ERR(clk_map)) + return PTR_ERR(clk_map); + + en7523_register_clocks(&pdev->dev, clk_data, map, clk_map); =20 return 0; } =20 static void en7581_register_clocks(struct device *dev, struct clk_hw_onece= ll_data *clk_data, - struct regmap *map, void __iomem *base) + struct regmap *map, struct regmap *clk_map) { struct clk_hw *hw; u32 rate; @@ -593,7 +609,7 @@ static void en7581_register_clocks(struct device *dev, = struct clk_hw_onecell_dat clk_data->hws[desc->id] =3D hw; } =20 - hw =3D en7523_register_pcie_clk(dev, base); + hw =3D en7523_register_pcie_clk(dev, clk_map); clk_data->hws[EN7523_CLK_PCIE] =3D hw; } =20 @@ -601,15 +617,10 @@ static int en7523_reset_update(struct reset_controlle= r_dev *rcdev, unsigned long id, bool assert) { struct en_rst_data *rst_data =3D container_of(rcdev, struct en_rst_data, = rcdev); - void __iomem *addr =3D rst_data->base + rst_data->bank_ofs[id / RST_NR_PE= R_BANK]; - u32 val; + u32 addr =3D rst_data->bank_ofs[id / RST_NR_PER_BANK]; =20 - val =3D readl(addr); - if (assert) - val |=3D BIT(id % RST_NR_PER_BANK); - else - val &=3D ~BIT(id % RST_NR_PER_BANK); - writel(val, addr); + regmap_update_bits(rst_data->map, addr, BIT(id % RST_NR_PER_BANK), + assert ? BIT(id % RST_NR_PER_BANK) : 0); =20 return 0; } @@ -630,9 +641,11 @@ static int en7523_reset_status(struct reset_controller= _dev *rcdev, unsigned long id) { struct en_rst_data *rst_data =3D container_of(rcdev, struct en_rst_data, = rcdev); - void __iomem *addr =3D rst_data->base + rst_data->bank_ofs[id / RST_NR_PE= R_BANK]; + u32 addr =3D rst_data->bank_ofs[id / RST_NR_PER_BANK]; + u32 val; =20 - return !!(readl(addr) & BIT(id % RST_NR_PER_BANK)); + regmap_read(rst_data->map, addr, &val); + return !!(val & BIT(id % RST_NR_PER_BANK)); } =20 static int en7523_reset_xlate(struct reset_controller_dev *rcdev, @@ -652,7 +665,7 @@ static const struct reset_control_ops en7581_reset_ops = =3D { .status =3D en7523_reset_status, }; =20 -static int en7581_reset_register(struct device *dev, void __iomem *base) +static int en7581_reset_register(struct device *dev, struct regmap *map) { struct en_rst_data *rst_data; =20 @@ -662,7 +675,7 @@ static int en7581_reset_register(struct device *dev, vo= id __iomem *base) =20 rst_data->bank_ofs =3D en7581_rst_ofs; rst_data->idx_map =3D en7581_rst_map; - rst_data->base =3D base; + rst_data->map =3D map; =20 rst_data->rcdev.nr_resets =3D ARRAY_SIZE(en7581_rst_map); rst_data->rcdev.of_xlate =3D en7523_reset_xlate; @@ -678,9 +691,8 @@ static int en7581_reset_register(struct device *dev, vo= id __iomem *base) static int en7581_clk_hw_init(struct platform_device *pdev, struct clk_hw_onecell_data *clk_data) { - struct regmap *map; + struct regmap *map, *clk_map; void __iomem *base; - u32 val; =20 map =3D syscon_regmap_lookup_by_compatible("airoha,en7581-chip-scu"); if (IS_ERR(map)) @@ -690,15 +702,18 @@ static int en7581_clk_hw_init(struct platform_device = *pdev, if (IS_ERR(base)) return PTR_ERR(base); =20 - en7581_register_clocks(&pdev->dev, clk_data, map, base); + clk_map =3D devm_regmap_init_mmio(&pdev->dev, base, &en7523_clk_regmap_co= nfig); + if (IS_ERR(clk_map)) + return PTR_ERR(clk_map); + + en7581_register_clocks(&pdev->dev, clk_data, map, clk_map); =20 - val =3D readl(base + REG_NP_SCU_SSTR); - val &=3D ~(REG_PCIE_XSI0_SEL_MASK | REG_PCIE_XSI1_SEL_MASK); - writel(val, base + REG_NP_SCU_SSTR); - val =3D readl(base + REG_NP_SCU_PCIC); - writel(val | 3, base + REG_NP_SCU_PCIC); + regmap_clear_bits(clk_map, REG_NP_SCU_SSTR, + REG_PCIE_XSI0_SEL_MASK | REG_PCIE_XSI1_SEL_MASK); + regmap_update_bits(clk_map, REG_NP_SCU_PCIC, REG_PCIE_CTRL, + FIELD_PREP(REG_PCIE_CTRL, 3)); =20 - return en7581_reset_register(&pdev->dev, base); + return en7581_reset_register(&pdev->dev, clk_map); } =20 static int en7523_clk_probe(struct platform_device *pdev) --=20 2.51.0 From nobody Fri Dec 19 17:36:01 2025 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 8F7AC2DCC1C for ; Thu, 6 Nov 2025 19:59:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762459188; cv=none; b=m6gs6IV0wPuu68lj9+QAHJDJIDHEQfsT7aXr0WzaMQ0oLFTYuqNB4RyZAhnTm0zvutRZ8GRjru95Llkhkbr7JxoS8OuZ0i0jDCLLAjLIMVsc4kY9twoipbyQ1FoNTKJcmoLm0vhSdAhwqn/xe739bVeNyOx5dJAocBocVR2wivA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762459188; c=relaxed/simple; bh=XVTIKGDo9ThWVGg8qcTaNRRTvL4SJHb9lTtxpWqTLR8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=scPDFAWpCIiq1N5xnQ+KxSNeSvMJDqtgSH4825jBG9uJwmge1bqdvgbGGyNKHANFSXzrR2CDmOUBlfxFgBYoz5r8EKWMPCXhR0K4RMwLqT+lA7IGo/cXx12S+XJpEpYH177FPWshjmT6/erCypPnAoB77rnnN9MYIk5YZVBjtwk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P2FUT7Ls; arc=none smtp.client-ip=209.85.128.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P2FUT7Ls" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-477563bcaacso127665e9.1 for ; Thu, 06 Nov 2025 11:59:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762459185; x=1763063985; 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=pskgOVcQzGBDwVn3zzaWjuy3GbH8LGu28I4+iALHLrM=; b=P2FUT7LsBsiU6GnjcZNCkpoPY8GmlU06WipPPWS11sVCDDXYtvUydGadQJjJlOBtPD QnIbv3AdbfuilT2hxaj7rGykcv1cWGaWhq0LpSfBgoA6aRjTlYWhm4/rOfl+HtF+0/nv sj1u7se8xdJhJXY0dQeRaKF7dmNqlBSDlL2ROOleWcQmuWCqFjSBR9i2agpsT76O+za8 mQIWInDQ8seY96aNYe2P2TFL+zDvyufLpGXV/I86W8lH28V/m3lHtChXGY4Y8G4Q2nL1 IKVpnv4TpbnrZUYnFmLKs0QtuIRc2wfHVTwP2MKyKCsC+hrcr7roBSEv+UqIQhgJPMrt ON0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762459185; x=1763063985; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=pskgOVcQzGBDwVn3zzaWjuy3GbH8LGu28I4+iALHLrM=; b=cdFVHnLi7l1sy53lH6Xllzb1ZvUkpSYAq3kgjg3Sp7IPpzLSnDjWXJlhWNomCSpcao Xj/CMDmCw9f5GndPguer3NpVUFVQaSsWGsuHQkIK+IE+Dz8VoNuvUcg7F3qD9Y/oGCbc BLPMWzt1BckOxymYMqcNXHJu02d5bwV8WFGd/+7dVc6KZO76NQxRd1+EQ9IdAtVg/52A 0X+t/Apf8CE673r8/zZEa9rKfHdZ8EdM4pSKW495zxIJpONQYvp+x6C7N7JvNf1big9o X40lGWvV2Fixkd+JygYxjrNRp1kB28NPd9+ijgXnW6uZDOC5ilLsez7tiFKsLa09vDN3 zcNw== X-Forwarded-Encrypted: i=1; AJvYcCUoCPMbAWtQQQOpGourCgZGQUv5WsG6ZhtVgV+ur6s/mSsZXOB9ex+5Ulj7HS56/4qUTMLngVGly1QhaXw=@vger.kernel.org X-Gm-Message-State: AOJu0YyLR505m666RvNs+ZECJqslosq+nDLSeUPlaszHAHtRWeB8pU+V sLY8NSWNAwo2OFyqa4gSD49L4hxvfMtL7ngSiE1uVjA5uSdKtvmzBXWr X-Gm-Gg: ASbGnct3+usgIZodxRr84Ee6PoEnzJqpZKcMRuG/p3xfEh/MhsTV7uZA0X7SArRcplN q3Ohnen8CnO2aN/3tMmU/R7bhI24zYcogLcgpcg8W35JqgBJVe9JR3ObHq073Sz2vFJkLBHihSr I3NbNybO4CxA1f2dhFbMi4VdpSf+1MvGAV1xm12nQ76JoHtwYF7nzsQZH1qc3vwejs/quEKEEOi fjrUF81/eE0DsIta6nnpk+EigSy5g2lqviZmc0stuGyjm9Sg53v/6nCUhxiMgXp94dODGKc1JQg rgXbLFjL1zloxHaKu0u4UX04qJ+Wf9hbIt1sORY63o3hn3znsnIZFxOaCQxSi+U6cvLBrBL2AOW rk8Ndq4F9MsVvz0Dyf/v217A0P2plF9sl+HoFqcIai9uEQvgxI4zztNo4B2Cb6GcgnfrZyvHR/W L0ilPwPmEUTOhKtXAcGxvZSdw7JK/CMw== X-Google-Smtp-Source: AGHT+IEefEb23D7rQRXsWY+IYQ7blyDScwcNUJaMoeGyD2G8x7lssAcK9wUXEK+8MlfDjlAHquSykw== X-Received: by 2002:a05:600c:1d28:b0:475:dd59:d8d8 with SMTP id 5b1f17b1804b1-4776bc88c55mr4372585e9.8.1762459184729; Thu, 06 Nov 2025 11:59:44 -0800 (PST) Received: from Ansuel-XPS24 (93-34-90-37.ip49.fastwebnet.it. [93.34.90.37]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-42abe62bfa0sm990037f8f.5.2025.11.06.11.59.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Nov 2025 11:59:44 -0800 (PST) From: Christian Marangi To: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Felix Fietkau , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [PATCH v3 2/5] clk: en7523: generalize register clocks function Date: Thu, 6 Nov 2025 20:59:29 +0100 Message-ID: <20251106195935.1767696-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251106195935.1767696-1-ansuelsmth@gmail.com> References: <20251106195935.1767696-1-ansuelsmth@gmail.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" Generalize register clocks function for Airoha EN7523 and EN7581 clocks driver. The same logic is applied for both clock hence code can be reduced and simplified by putting the base_clocks struct in the soc_data and passing that to a generic register clocks function. While at it rework some function to return error and use devm variant for clk_hw_regiser. Signed-off-by: Christian Marangi --- drivers/clk/clk-en7523.c | 148 +++++++++++++++++---------------------- 1 file changed, 66 insertions(+), 82 deletions(-) diff --git a/drivers/clk/clk-en7523.c b/drivers/clk/clk-en7523.c index 314e7450313f..b040f0f0d727 100644 --- a/drivers/clk/clk-en7523.c +++ b/drivers/clk/clk-en7523.c @@ -78,8 +78,10 @@ struct en_rst_data { =20 struct en_clk_soc_data { u32 num_clocks; + const struct en_clk_desc *base_clks; const struct clk_ops pcie_ops; int (*hw_init)(struct platform_device *pdev, + const struct en_clk_soc_data *soc_data, struct clk_hw_onecell_data *clk_data); }; =20 @@ -450,10 +452,11 @@ static struct clk_hw *en7523_register_pcie_clk(struct= device *dev, .ops =3D &soc_data->pcie_ops, }; struct en_clk_gate *cg; + int err; =20 cg =3D devm_kzalloc(dev, sizeof(*cg), GFP_KERNEL); if (!cg) - return NULL; + return ERR_PTR(-ENOMEM); =20 cg->map =3D clk_map; cg->hw.init =3D &init; @@ -461,12 +464,62 @@ static struct clk_hw *en7523_register_pcie_clk(struct= device *dev, if (init.ops->unprepare) init.ops->unprepare(&cg->hw); =20 - if (clk_hw_register(dev, &cg->hw)) - return NULL; + err =3D devm_clk_hw_register(dev, &cg->hw); + if (err) + return ERR_PTR(err); =20 return &cg->hw; } =20 +static int en75xx_register_clocks(struct device *dev, + const struct en_clk_soc_data *soc_data, + struct clk_hw_onecell_data *clk_data, + struct regmap *map, struct regmap *clk_map) +{ + struct clk_hw *hw; + u32 rate; + int i; + + for (i =3D 0; i < soc_data->num_clocks - 1; i++) { + const struct en_clk_desc *desc =3D &soc_data->base_clks[i]; + u32 val, reg =3D desc->div_reg ? desc->div_reg : desc->base_reg; + int err; + + err =3D regmap_read(map, desc->base_reg, &val); + if (err) { + pr_err("Failed reading fixed clk rate %s: %d\n", + desc->name, err); + return err; + } + rate =3D en7523_get_base_rate(desc, val); + + err =3D regmap_read(map, reg, &val); + if (err) { + pr_err("Failed reading fixed clk div %s: %d\n", + desc->name, err); + return err; + } + rate /=3D en7523_get_div(desc, val); + + hw =3D clk_hw_register_fixed_rate(dev, desc->name, NULL, 0, rate); + if (IS_ERR(hw)) { + pr_err("Failed to register clk %s: %ld\n", + desc->name, PTR_ERR(hw)); + return PTR_ERR(hw); + } + + clk_data->hws[desc->id] =3D hw; + } + + hw =3D en7523_register_pcie_clk(dev, clk_map); + if (IS_ERR(hw)) + return PTR_ERR(hw); + + clk_data->hws[EN7523_CLK_PCIE] =3D hw; + + return 0; +} + static int en7581_pci_is_enabled(struct clk_hw *hw) { struct en_clk_gate *cg =3D container_of(hw, struct en_clk_gate, hw); @@ -504,38 +557,6 @@ static void en7581_pci_disable(struct clk_hw *hw) usleep_range(1000, 2000); } =20 -static void en7523_register_clocks(struct device *dev, struct clk_hw_onece= ll_data *clk_data, - struct regmap *map, struct regmap *clk_map) -{ - struct clk_hw *hw; - u32 rate; - int i; - - for (i =3D 0; i < ARRAY_SIZE(en7523_base_clks); i++) { - const struct en_clk_desc *desc =3D &en7523_base_clks[i]; - u32 reg =3D desc->div_reg ? desc->div_reg : desc->base_reg; - u32 val; - - regmap_read(map, desc->base_reg, &val); - - rate =3D en7523_get_base_rate(desc, val); - regmap_read(map, reg, &val); - rate /=3D en7523_get_div(desc, val); - - hw =3D clk_hw_register_fixed_rate(dev, desc->name, NULL, 0, rate); - if (IS_ERR(hw)) { - pr_err("Failed to register clk %s: %ld\n", - desc->name, PTR_ERR(hw)); - continue; - } - - clk_data->hws[desc->id] =3D hw; - } - - hw =3D en7523_register_pcie_clk(dev, clk_map); - clk_data->hws[EN7523_CLK_PCIE] =3D hw; -} - static const struct regmap_config en7523_clk_regmap_config =3D { .reg_bits =3D 32, .val_bits =3D 32, @@ -543,6 +564,7 @@ static const struct regmap_config en7523_clk_regmap_con= fig =3D { }; =20 static int en7523_clk_hw_init(struct platform_device *pdev, + const struct en_clk_soc_data *soc_data, struct clk_hw_onecell_data *clk_data) { void __iomem *base, *np_base; @@ -566,51 +588,7 @@ static int en7523_clk_hw_init(struct platform_device *= pdev, if (IS_ERR(clk_map)) return PTR_ERR(clk_map); =20 - en7523_register_clocks(&pdev->dev, clk_data, map, clk_map); - - return 0; -} - -static void en7581_register_clocks(struct device *dev, struct clk_hw_onece= ll_data *clk_data, - struct regmap *map, struct regmap *clk_map) -{ - struct clk_hw *hw; - u32 rate; - int i; - - for (i =3D 0; i < ARRAY_SIZE(en7581_base_clks); i++) { - const struct en_clk_desc *desc =3D &en7581_base_clks[i]; - u32 val, reg =3D desc->div_reg ? desc->div_reg : desc->base_reg; - int err; - - err =3D regmap_read(map, desc->base_reg, &val); - if (err) { - pr_err("Failed reading fixed clk rate %s: %d\n", - desc->name, err); - continue; - } - rate =3D en7523_get_base_rate(desc, val); - - err =3D regmap_read(map, reg, &val); - if (err) { - pr_err("Failed reading fixed clk div %s: %d\n", - desc->name, err); - continue; - } - rate /=3D en7523_get_div(desc, val); - - hw =3D clk_hw_register_fixed_rate(dev, desc->name, NULL, 0, rate); - if (IS_ERR(hw)) { - pr_err("Failed to register clk %s: %ld\n", - desc->name, PTR_ERR(hw)); - continue; - } - - clk_data->hws[desc->id] =3D hw; - } - - hw =3D en7523_register_pcie_clk(dev, clk_map); - clk_data->hws[EN7523_CLK_PCIE] =3D hw; + return en75xx_register_clocks(&pdev->dev, soc_data, clk_data, map, clk_ma= p); } =20 static int en7523_reset_update(struct reset_controller_dev *rcdev, @@ -689,10 +667,12 @@ static int en7581_reset_register(struct device *dev, = struct regmap *map) } =20 static int en7581_clk_hw_init(struct platform_device *pdev, + const struct en_clk_soc_data *soc_data, struct clk_hw_onecell_data *clk_data) { struct regmap *map, *clk_map; void __iomem *base; + int ret; =20 map =3D syscon_regmap_lookup_by_compatible("airoha,en7581-chip-scu"); if (IS_ERR(map)) @@ -706,7 +686,9 @@ static int en7581_clk_hw_init(struct platform_device *p= dev, if (IS_ERR(clk_map)) return PTR_ERR(clk_map); =20 - en7581_register_clocks(&pdev->dev, clk_data, map, clk_map); + ret =3D en75xx_register_clocks(&pdev->dev, soc_data, clk_data, map, clk_m= ap); + if (ret) + return ret; =20 regmap_clear_bits(clk_map, REG_NP_SCU_SSTR, REG_PCIE_XSI0_SEL_MASK | REG_PCIE_XSI1_SEL_MASK); @@ -732,7 +714,7 @@ static int en7523_clk_probe(struct platform_device *pde= v) return -ENOMEM; =20 clk_data->num =3D soc_data->num_clocks; - r =3D soc_data->hw_init(pdev, clk_data); + r =3D soc_data->hw_init(pdev, soc_data, clk_data); if (r) return r; =20 @@ -740,6 +722,7 @@ static int en7523_clk_probe(struct platform_device *pde= v) } =20 static const struct en_clk_soc_data en7523_data =3D { + .base_clks =3D en7523_base_clks, .num_clocks =3D ARRAY_SIZE(en7523_base_clks) + 1, .pcie_ops =3D { .is_enabled =3D en7523_pci_is_enabled, @@ -750,6 +733,7 @@ static const struct en_clk_soc_data en7523_data =3D { }; =20 static const struct en_clk_soc_data en7581_data =3D { + .base_clks =3D en7581_base_clks, /* We increment num_clocks by 1 to account for additional PCIe clock */ .num_clocks =3D ARRAY_SIZE(en7581_base_clks) + 1, .pcie_ops =3D { --=20 2.51.0 From nobody Fri Dec 19 17:36:01 2025 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (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 BDC4F355030 for ; Thu, 6 Nov 2025 19:59:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762459189; cv=none; b=AYjCdfgXrROC7NTUZ+p9F5RQVZUsJ3P2gXjoilp8W+NUTjS1lNgSIArTZ3rdf3749nGwirIEXD4seuSl5BOIaN7f75SVRjHo3srDc25nFTkXOlAh5L9pLLGCrtRwlTiqT/t4YoWmwHKGaZ7TE9ZSkXcDi4Qal+lQcPHPEQUbrfY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762459189; c=relaxed/simple; bh=I8gVSNxw2aOO4ZdP0s2HcOB6Vs9l7ZVMP8y4tYKEw8M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nQ6amwBv2AfNug5aMfYeNVv+lGO20Jkl0zRQFvTc/6YpmH6LW38eRx1NsvQDr+zwmmM0ReCqPUtBhGw5rQLGlz8HQBmeghTfO8bebywIivtpZBr8Puj8sHAzvhJSMyYYS8Dd6MHLVLDF7FlWsk0MOK2rxRcVXCck08aLQvHnYh0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ifE25RUs; arc=none smtp.client-ip=209.85.221.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ifE25RUs" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-429c8632fcbso9020f8f.1 for ; Thu, 06 Nov 2025 11:59:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762459186; x=1763063986; 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=l76VTWaL5JNJWQVkhMGxzjJJc96x+kz2NkszPplq7c0=; b=ifE25RUsMNw2vSR1pkbyhbaCC+gNIB8zeoK9vS8CtQIO+ImDGdPwZXuQ/8RPkfn9BR Ax+lEW4D/Lx8KxQwPuas2VkiZW3+fEmb45psvAtKNQpqTFXx/+G50mtg8CXsz684mzC+ CvS2yiZO8BRhLBiegs/aYQbrAibQ0SUjLMkQjPzPlLdcauh5SpGqqyl2dPVUmhfmDy6F hPpWQo98NAFTcEjidenKEclGZSZZrWOo8Fj+mVmpKEpIOJkKLmpLuEVI7LGUJxvLCZ2q V2HMPs042r8HTTsPzpVBB2AxLM9n7fiLgLe4m+/QtUpGPZc5gafU8JgoMAxxZoHB+HzE t8pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762459186; x=1763063986; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=l76VTWaL5JNJWQVkhMGxzjJJc96x+kz2NkszPplq7c0=; b=U8KQBrAKVRkCkBjCeu3fPLAEuV9jfv6X/ueSjrAm/MIvkxJkdgb2fLVAR2wheKjUWP HckZ1rMAFSxsFZAsnujgq0VQ0XJouUsfnlHnXwhljWjs4ExWPkPkC2O+/m7rGLsYgy0J MruQz6aiPXDApKIw2N6zAafAImCc3voSjzx5p4w0jXSCrcxrl8Gs7I7xprIpnBclQWlo uZBtLQwp237cQPjvhmts4hr8bt3hfYj8mIZ1VWpvzJxLG7lScv0XrD9PQhrjEYACQmK+ z8ZaJU5INfNUbVH2r3FHV7uddFo4C3IHW7EJqDL0G1bMAy0nl+cZpnorepnfbbHH2CRr 5BgQ== X-Forwarded-Encrypted: i=1; AJvYcCWwA7gOK8qq9ztc5p7d6qNuxCa6f6jLhbOmqsOpABigDVlanuPbw1lXKeqpJj+6yXsGqzCR0YCNOj+JVH8=@vger.kernel.org X-Gm-Message-State: AOJu0YxGT3ELwV+adn93Wsce5agUMpIpgeCsvvt0GpG1D/QWkYo+SM+F KDILlVyQTHMAvZYCIg3eXXc2AJxfRuw7ApuySiRxBCINyM38qzKRvWZd X-Gm-Gg: ASbGncsiLxQfMqMcBSeKC5e7lhHKdcpqIdqd+FdfGdm2dkuZUzaFlEUZiWeOiQUvn5m i8j+ZyiQATX8HL6Rlwr1SR4VqVTttsNU0TC/TccsQRko8QeVL0Ec1EIKzlKfD/kb1/p3z962mWO +rG2cjwrNpV9mazH7RYuJMPtdrX+WP1Hlg7Hpjt+uYZOascmqs7JPJ4S/vA2Tpoy2EW1fLA4QlL c8DV/2LWgC477a2cxX0VhFCsaUzzYEzQ1UMjGLuZ51Q5xLcwML9e3hz2Tlera9bhWJD4M09xQB7 BOCO4Si77+0e/CkGnpe+Vspg4tBDkCzeRZQMthzjoX2/Th15XEonyXBtCGGwU7QGTPH7dtvAx+b 1JXHwS4lQXo1UiyRHH49OgGTUvEYS07A0imqK4+IDWKoHbSmgjr0CRjYA90FGRIkX4ZqwULKqSP 5yMm07GPgKgTuKtRTYIOoiDns0yu8Exg== X-Google-Smtp-Source: AGHT+IGybaf/NHxxtkPxDjDcb06HnUaaOs9P0uCx6jOwYau+YGwUCltbbYeXhcnTI89446yRK7nF1g== X-Received: by 2002:a05:6000:4186:b0:429:ce0c:e661 with SMTP id ffacd0b85a97d-42aefb487b9mr302347f8f.54.1762459185944; Thu, 06 Nov 2025 11:59:45 -0800 (PST) Received: from Ansuel-XPS24 (93-34-90-37.ip49.fastwebnet.it. [93.34.90.37]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-42abe62bfa0sm990037f8f.5.2025.11.06.11.59.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Nov 2025 11:59:45 -0800 (PST) From: Christian Marangi To: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Felix Fietkau , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [PATCH v3 3/5] clk: en7523: reword and clean clk_probe variables Date: Thu, 6 Nov 2025 20:59:30 +0100 Message-ID: <20251106195935.1767696-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251106195935.1767696-1-ansuelsmth@gmail.com> References: <20251106195935.1767696-1-ansuelsmth@gmail.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" Rework and clean en7523_clk_probe variables to make them consistent with the rest of the source. Also apply some minor cleanup for pdev variables. Signed-off-by: Christian Marangi --- drivers/clk/clk-en7523.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/clk/clk-en7523.c b/drivers/clk/clk-en7523.c index b040f0f0d727..d98990a157d3 100644 --- a/drivers/clk/clk-en7523.c +++ b/drivers/clk/clk-en7523.c @@ -700,25 +700,27 @@ static int en7581_clk_hw_init(struct platform_device = *pdev, =20 static int en7523_clk_probe(struct platform_device *pdev) { - struct device_node *node =3D pdev->dev.of_node; const struct en_clk_soc_data *soc_data; struct clk_hw_onecell_data *clk_data; - int r; + struct device *dev =3D &pdev->dev; + int err; =20 - soc_data =3D device_get_match_data(&pdev->dev); + soc_data =3D device_get_match_data(dev); =20 - clk_data =3D devm_kzalloc(&pdev->dev, - struct_size(clk_data, hws, soc_data->num_clocks), + clk_data =3D devm_kzalloc(dev, + struct_size(clk_data, hws, + soc_data->num_clocks), GFP_KERNEL); if (!clk_data) return -ENOMEM; =20 clk_data->num =3D soc_data->num_clocks; - r =3D soc_data->hw_init(pdev, soc_data, clk_data); - if (r) - return r; + err =3D soc_data->hw_init(pdev, soc_data, clk_data); + if (err) + return err; =20 - return of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); + return of_clk_add_hw_provider(dev->of_node, of_clk_hw_onecell_get, + clk_data); } =20 static const struct en_clk_soc_data en7523_data =3D { --=20 2.51.0 From nobody Fri Dec 19 17:36:01 2025 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 F32523557F4 for ; Thu, 6 Nov 2025 19:59:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762459190; cv=none; b=AEzu4ZOoF/XTWCVN1r/XEzHgyqQHH41Rbac0rVrTDXmc3EwScRFR4pyaEBJb7vgTUt7+RvIux+/TVN2Ksp+2Z8rtznJPUD/WXRd15BaMhUs+yGufvaSAn0In4ZvSFS33bReOQ29sb5rXcOVoxnVk3cmXIf6fEvh5lAOkFJoSQQQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762459190; c=relaxed/simple; bh=/R514fKOK+2g49FV+f4Uba6tfg9QFz1wdCbUg8UP41Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=muDXnKTLO8uQEdM8P/02Kw1rz6Y5PQo15+TBXsKk3KhzYie2hi4S2tIDGGO9I7vsHAjlN8UDPKC0kA8nHyZtgoCyrP7wE86wgg3soFD3pvj3w/U2hMW/5LBNKUbLfX+E6NBYqQyVrF62TUXpUJxcv5l4SIMzL6PX3cu6MGWSA4w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=bMFhGAYm; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="bMFhGAYm" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-3ecdf2b1751so16931f8f.0 for ; Thu, 06 Nov 2025 11:59:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762459187; x=1763063987; 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=zsmY3T9nhGnwnZqNUu/A4lIOPK61+rKAAQB8Ljjp+h8=; b=bMFhGAYmwh6xA5XFaqn/YEzMdh+Fo5XcUKu5o7/JwmcQOzHs0AKEoL4dr6wZJO8yY2 5lUbK989FgFZxWoW5lp11/iPvHKR4d47dR3QFq2pSNi1pIPy9KGwp8UHAK8imSEMSFi0 drRooew3IN3dzsi93WX/5yArAO0Tvy5rix3JgLN0a72Ztp2npYkJAmiri9TYgX/TCVGW RsJceFlYkd4S7gDt10gnVIZzymme8L0UGbbVgbEDyXY+k7c96SpFy2PwQPZOSkif0vdA F/PNb0zakduL/rttSpFehjgWdwApVPa+5mmVrT/TR1Dzd7V+s0ZFhZEf+8F1w3eSP75J ZUmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762459187; x=1763063987; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=zsmY3T9nhGnwnZqNUu/A4lIOPK61+rKAAQB8Ljjp+h8=; b=oXBVlNalFnWfW57ehoQ8M15ErcVLYetS9pXbE/5X364GsS3gc6CNhzfJ6HwK4cDsxg zocmbUHF08QH0VyLTS1t+jbAOMNArTGCcCgMAOakY0cjVzBVx0snq0QiBhqIFS8Gt4jr JYH3f2fbBfbWCq8BDqTacgnKT8F8kHLZgi0njd2Vi/SxBMb1s2q0xyksA9eR68gvSN0s UN8Gv3eDD1EHFaJ0kACkzRFjbC82yWi5XOKvFrbH0mNiyGDbFKGIbmt/bgW9d/9V9O+x IH9czOLatWsWXmcGogKgPgug79cnGGgvEJiuj8auqa/XSnmW3nZbtMFCIbqs2/qGzzjL 5ZLw== X-Forwarded-Encrypted: i=1; AJvYcCVr9JXQdB36nfnPxe2ryxL0s+8OgtLdGzq7y/NA3eOXn74jvJRhfhdcbjY0R0gWtUyKMHU4BndLN2yMsrE=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2hIT+Ks5AWaTWj3QnP5SLAjePNuklgDxp3KdKpQFIYwqJOYB/ Zwgk/r785x+Ip8l0NxyYWncIezWc/TlCIUeRjqixQt64+yBzqGgnPIx3 X-Gm-Gg: ASbGncv2PEtrttN3fRFLfwiPmmKsYM7zWPD0KX7fBv5tfSBnr8bEcFKmRYLqAJkbJ1R cF5cyQBUSHG7P+1CI7Jlw1okL/fNqQF6+/u/cLphcaP50zFvD1CcYkE7NeCmEvmXm0k5Q4U0bTI gw1nXdg1c6xUAz1wgoyVaEbpUPEk1BGLrlrMFdfaCK0qx+neBlBnNJs1iBfu6NQe1t01kN65b7E QBnec/RXWSf58ngefXFICpmNwWGQRhwOX0zdEPi/i9twQXX9vZcgA3Vz7tTX6lto+qBMrsnCIjT IMWblmCkndmXVwFEtArL58AHGgsVhRucQMD6L5Kg7FKEXKYoiiW9dDBc1dB/bqW8fpW/ZWu0/Za Y8OgffiwROT1aiZIo7zXk9WiSErgLCQkeaJ6cPpzbavkGZwquDb7UK00xLEDELkr1FSmLVUugJ1 CYrTB4WMbn3rA7ECszL+b0Qas8swltjw== X-Google-Smtp-Source: AGHT+IEzBKlIvTV8ffYyff9tHH2RG00vyDkY/IGQTxBjk3kUl2uwjgvvux7mB+aIjTctwNdzgpnsQw== X-Received: by 2002:a05:6000:2dca:b0:429:d48c:edf with SMTP id ffacd0b85a97d-42ae588117dmr400321f8f.24.1762459186988; Thu, 06 Nov 2025 11:59:46 -0800 (PST) Received: from Ansuel-XPS24 (93-34-90-37.ip49.fastwebnet.it. [93.34.90.37]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-42abe62bfa0sm990037f8f.5.2025.11.06.11.59.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Nov 2025 11:59:46 -0800 (PST) From: Christian Marangi To: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Felix Fietkau , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [PATCH v3 4/5] dt-bindings: clock: airoha: Document support for AN7583 clock Date: Thu, 6 Nov 2025 20:59:31 +0100 Message-ID: <20251106195935.1767696-5-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251106195935.1767696-1-ansuelsmth@gmail.com> References: <20251106195935.1767696-1-ansuelsmth@gmail.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" Document support for Airoha AN7583 clock based on the EN7523 clock schema. Add additional binding for additional clock and reset lines. Signed-off-by: Christian Marangi Reviewed-by: Krzysztof Kozlowski --- .../bindings/clock/airoha,en7523-scu.yaml | 5 +- include/dt-bindings/clock/en7523-clk.h | 3 + .../dt-bindings/reset/airoha,an7583-reset.h | 62 +++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 include/dt-bindings/reset/airoha,an7583-reset.h diff --git a/Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml= b/Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml index fe2c5c1baf43..2d53b96356c5 100644 --- a/Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +++ b/Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml @@ -30,6 +30,7 @@ properties: compatible: items: - enum: + - airoha,an7583-scu - airoha,en7523-scu - airoha,en7581-scu =20 @@ -69,7 +70,9 @@ allOf: - if: properties: compatible: - const: airoha,en7581-scu + enum: + - airoha,an7583-scu + - airoha,en7581-scu then: properties: reg: diff --git a/include/dt-bindings/clock/en7523-clk.h b/include/dt-bindings/c= lock/en7523-clk.h index edfa64045f52..0fbbcb7b1b25 100644 --- a/include/dt-bindings/clock/en7523-clk.h +++ b/include/dt-bindings/clock/en7523-clk.h @@ -14,4 +14,7 @@ =20 #define EN7581_CLK_EMMC 8 =20 +#define AN7583_CLK_MDIO0 9 +#define AN7583_CLK_MDIO1 10 + #endif /* _DT_BINDINGS_CLOCK_AIROHA_EN7523_H_ */ diff --git a/include/dt-bindings/reset/airoha,an7583-reset.h b/include/dt-b= indings/reset/airoha,an7583-reset.h new file mode 100644 index 000000000000..7ff07986f8ba --- /dev/null +++ b/include/dt-bindings/reset/airoha,an7583-reset.h @@ -0,0 +1,62 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +/* + * Copyright (c) 2024 AIROHA Inc + * Author: Christian Marangi + */ + +#ifndef __DT_BINDINGS_RESET_CONTROLLER_AIROHA_AN7583_H_ +#define __DT_BINDINGS_RESET_CONTROLLER_AIROHA_AN7583_H_ + +/* RST_CTRL2 */ +#define AN7583_XPON_PHY_RST 0 +#define AN7583_GPON_OLT_RST 1 +#define AN7583_CPU_TIMER2_RST 2 +#define AN7583_HSUART_RST 3 +#define AN7583_UART4_RST 4 +#define AN7583_UART5_RST 5 +#define AN7583_I2C2_RST 6 +#define AN7583_XSI_MAC_RST 7 +#define AN7583_XSI_PHY_RST 8 +#define AN7583_NPU_RST 9 +#define AN7583_TRNG_MSTART_RST 10 +#define AN7583_DUAL_HSI0_RST 11 +#define AN7583_DUAL_HSI1_RST 12 +#define AN7583_DUAL_HSI0_MAC_RST 13 +#define AN7583_DUAL_HSI1_MAC_RST 14 +#define AN7583_XPON_XFI_RST 15 +#define AN7583_WDMA_RST 16 +#define AN7583_WOE0_RST 17 +#define AN7583_HSDMA_RST 18 +#define AN7583_TDMA_RST 19 +#define AN7583_EMMC_RST 20 +#define AN7583_SOE_RST 21 +#define AN7583_XFP_MAC_RST 22 +#define AN7583_MDIO0 23 +#define AN7583_MDIO1 24 +/* RST_CTRL1 */ +#define AN7583_PCM1_ZSI_ISI_RST 25 +#define AN7583_FE_PDMA_RST 26 +#define AN7583_FE_QDMA_RST 27 +#define AN7583_PCM_SPIWP_RST 28 +#define AN7583_CRYPTO_RST 29 +#define AN7583_TIMER_RST 30 +#define AN7583_PCM1_RST 31 +#define AN7583_UART_RST 32 +#define AN7583_GPIO_RST 33 +#define AN7583_GDMA_RST 34 +#define AN7583_I2C_MASTER_RST 35 +#define AN7583_PCM2_ZSI_ISI_RST 36 +#define AN7583_SFC_RST 37 +#define AN7583_UART2_RST 38 +#define AN7583_GDMP_RST 39 +#define AN7583_FE_RST 40 +#define AN7583_USB_HOST_P0_RST 41 +#define AN7583_GSW_RST 42 +#define AN7583_SFC2_PCM_RST 43 +#define AN7583_PCIE0_RST 44 +#define AN7583_PCIE1_RST 45 +#define AN7583_CPU_TIMER_RST 46 +#define AN7583_PCIE_HB_RST 47 +#define AN7583_XPON_MAC_RST 48 + +#endif /* __DT_BINDINGS_RESET_CONTROLLER_AIROHA_AN7583_H_ */ --=20 2.51.0 From nobody Fri Dec 19 17:36:01 2025 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 08DF4355817 for ; Thu, 6 Nov 2025 19:59:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762459192; cv=none; b=F+lieHC+uezqB3bRNCsbg/tDfevTFuzNg0u5av+OpvWZy4+HHi0OlFldFMw4kCBR/SL9KdE8xXrh7YXK9YsNeC7Rmni/rfMe1eox+XnmmMWJBzoZdyqaDs3nIL2fQscF5JMtNGIN5Lfl7WfsnV1iFxll8MWALg1/xmDtmy18WNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762459192; c=relaxed/simple; bh=g0JXB7q4gTIJ17gwnKfJfDEyt3Xd865By6ogtiEPOlk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oY+vselxHiwFf1pNU+68K9FLkPyvyuMeQ6uKyQSgUYrSKr1C3BdXF7YPGeZRv2AaEj/8DMUAJ2JbJm4dnEXxj24+Gge1biwfBi+8wOvfgL1dGrA7/9RoxKVcOyUoIDro4BJYnIEkRMB5qz1t7+pqL3Af9ROoVwCfiRBSzCgiLmk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GocM14XW; arc=none smtp.client-ip=209.85.221.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GocM14XW" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-429b7eecf7cso15140f8f.0 for ; Thu, 06 Nov 2025 11:59:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762459188; x=1763063988; 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=a5RpjiqALO7vNsOYRobhTqjGCDJztKZWKwy2jPxZsng=; b=GocM14XWw5vGOcEF6sRUdzvuzN30yqE00lqdftSHZk0w1a9Y3U9rzeG6GV/prsgt/+ +KbfcXKXenk5TcUww8+Xz+EOd6baBQJBp2kjDrxl7mGfYEQa2ipaCnoUbyajUUQozDhG 6ZfrdZ8dR1l0g5avRsRHKb6iCN3tSA1oXsGQXK9bNK4Lur2qqOStAdG+cpBpjGmHGLxy 8u/SX8Zvbz/0L1LMLq1cc4/XGYpEeLtUDOQaA6h7uXsm5W5z/vlX3hyGKghlEdoV9TrZ QtFVieYuJMI8V0yjeYnX8JhI0NrpMoz8yfcS0mJFVoBFSnn2mFG/e0uUYQ4gWuY65LlT 0Fyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762459188; x=1763063988; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=a5RpjiqALO7vNsOYRobhTqjGCDJztKZWKwy2jPxZsng=; b=ZB73jSMytWjipOOg3oSyicGZ4tACjSqAQLCrL0kQBStR99YhSKwTl2lo/O40uCUZb/ gLwHa5X4R2IxVH85SPGiH64sCW0DnAQj6W9L/jpRAvQDuzX8eixu7+9S5fWmJF+vZpsw 95L14U6qO60Rk9h5VNHOl9QNss2mi0U83ReclEk5u5T5R3za0MhwJxkEnyQ5OHn18Coz 8LqZA54CvsZpVcBv6S4YXQ4h48guikJvxqcwZiSEtfzShZ/6dLDEkQcqXjBmhB7nmZ36 ym533kmybl5vNv9zXny/k5Ubky7/IkSifhrOb83WNNV+9o+vILeQz8r0UPzBth06jxq5 aJDQ== X-Forwarded-Encrypted: i=1; AJvYcCWp6xNUOpUt/THMkD7xz744qprPgf6BCTqkmdqsST04QvvrMZuadb+1/Yy/09HhF0s/cfOrsDCsoUxof5U=@vger.kernel.org X-Gm-Message-State: AOJu0Yyjp47WOXkLr2LRwzY8Hl3YGiZKRJZcZJLTblpoMKZdhKigtMOk hUt6K5GP5XWRFCX2NNuT/Xf4gsyroMkNg8KtJpoXHVm7RxnEM4JqdiQp X-Gm-Gg: ASbGnctXcFVD3Yd+hPxfl4741I5jBLwEIXug3mqqOqQEnaF52Yj5AFGINsPrqUKSqRw /1DyXtY3e2qmozLY4ugjpg+nCPlCwhJgPnbjTGPEsaRSdkSrdp2iFCo+hmTolo5WXNGKJyIZ7Be KyEMR8DszlAaj73TbQ49WjhvcjawqVLwbsh/FAMDTyYdzuPTM2BmwDRZsJ6s4Gn0x7cASepnCCJ yQZFjhRbznr3wA3GKBxcapy5ZiEpXECvgCAm4gtm7b6CaGaHAfXH56sdwlyncrdsec4UL7FcFZC OeixoQ/jMA0M4u7O2vHPaoq96showJMxu7MZhjxQVYExft9Ge3pJaRb2FJ/zGTn/9FWa8kaKTHx xKb4+d7dutzWw6FP0bxTh9LX56A/k5Wf5dWXeP2VYV4CFZTaX9gLkq0bAcSJZwnYy7tNTyhk/IW CXThhHW82BjhZ4tHUmjdhELjsXPEGFyg== X-Google-Smtp-Source: AGHT+IEVYTwMgxh3CExN+rL/lDnPLamt7lwyv3Y1lcvlWhmc1Zbwa1Uu5B8jzC1SgHqgC1HhJ8+u+g== X-Received: by 2002:a05:6000:228a:b0:429:b52e:3513 with SMTP id ffacd0b85a97d-429eb1cc83amr4509658f8f.29.1762459188164; Thu, 06 Nov 2025 11:59:48 -0800 (PST) Received: from Ansuel-XPS24 (93-34-90-37.ip49.fastwebnet.it. [93.34.90.37]) by smtp.googlemail.com with ESMTPSA id ffacd0b85a97d-42abe62bfa0sm990037f8f.5.2025.11.06.11.59.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Nov 2025 11:59:47 -0800 (PST) From: Christian Marangi To: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Felix Fietkau , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Christian Marangi Subject: [PATCH v3 5/5] clk: en7523: add support for Airoha AN7583 clock Date: Thu, 6 Nov 2025 20:59:32 +0100 Message-ID: <20251106195935.1767696-6-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251106195935.1767696-1-ansuelsmth@gmail.com> References: <20251106195935.1767696-1-ansuelsmth@gmail.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 support for Airoha AN7583 clock and reset. Airoha AN7583 SoC have the same register address of EN7581 but implement different bits and additional base clocks. Also reset are different with the introduction of 2 dedicated MDIO line and drop of some reset lines. Signed-off-by: Christian Marangi --- drivers/clk/clk-en7523.c | 264 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 264 insertions(+) diff --git a/drivers/clk/clk-en7523.c b/drivers/clk/clk-en7523.c index d98990a157d3..7560e9dfdf3f 100644 --- a/drivers/clk/clk-en7523.c +++ b/drivers/clk/clk-en7523.c @@ -11,6 +11,7 @@ #include #include #include +#include =20 #define RST_NR_PER_BANK 32 =20 @@ -96,6 +97,14 @@ static const u32 bus7581_base[] =3D { 600000000, 5400000= 00 }; static const u32 npu7581_base[] =3D { 800000000, 750000000, 720000000, 600= 000000 }; static const u32 crypto_base[] =3D { 540000000, 480000000 }; static const u32 emmc7581_base[] =3D { 200000000, 150000000 }; +/* AN7583 */ +static const u32 gsw7583_base[] =3D { 540672000, 270336000, 400000000, 200= 000000 }; +static const u32 emi7583_base[] =3D { 540672000, 480000000, 400000000, 300= 000000 }; +static const u32 bus7583_base[] =3D { 600000000, 540672000, 480000000, 400= 000000 }; +static const u32 spi7583_base[] =3D { 100000000, 12500000 }; +static const u32 npu7583_base[] =3D { 666000000, 800000000, 720000000, 600= 000000 }; +static const u32 crypto7583_base[] =3D { 540672000, 400000000 }; +static const u32 emmc7583_base[] =3D { 150000000, 200000000 }; =20 static const struct en_clk_desc en7523_base_clks[] =3D { { @@ -298,6 +307,138 @@ static const struct en_clk_desc en7581_base_clks[] = =3D { } }; =20 +static const struct en_clk_desc an7583_base_clks[] =3D { + { + .id =3D EN7523_CLK_GSW, + .name =3D "gsw", + + .base_reg =3D REG_GSW_CLK_DIV_SEL, + .base_bits =3D 2, + .base_shift =3D 8, + .base_values =3D gsw7583_base, + .n_base_values =3D ARRAY_SIZE(gsw7583_base), + + .div_bits =3D 3, + .div_shift =3D 0, + .div_step =3D 1, + .div_offset =3D 1, + }, { + .id =3D EN7523_CLK_EMI, + .name =3D "emi", + + .base_reg =3D REG_EMI_CLK_DIV_SEL, + .base_bits =3D 2, + .base_shift =3D 8, + .base_values =3D emi7583_base, + .n_base_values =3D ARRAY_SIZE(emi7583_base), + + .div_bits =3D 3, + .div_shift =3D 0, + .div_step =3D 1, + .div_offset =3D 1, + }, { + .id =3D EN7523_CLK_BUS, + .name =3D "bus", + + .base_reg =3D REG_BUS_CLK_DIV_SEL, + .base_bits =3D 2, + .base_shift =3D 8, + .base_values =3D bus7583_base, + .n_base_values =3D ARRAY_SIZE(bus7583_base), + + .div_bits =3D 3, + .div_shift =3D 0, + .div_step =3D 1, + .div_offset =3D 1, + }, { + .id =3D EN7523_CLK_SLIC, + .name =3D "slic", + + .base_reg =3D REG_SPI_CLK_FREQ_SEL, + .base_bits =3D 1, + .base_shift =3D 0, + .base_values =3D slic_base, + .n_base_values =3D ARRAY_SIZE(slic_base), + + .div_reg =3D REG_SPI_CLK_DIV_SEL, + .div_bits =3D 5, + .div_shift =3D 24, + .div_val0 =3D 20, + .div_step =3D 2, + }, { + .id =3D EN7523_CLK_SPI, + .name =3D "spi", + + .base_reg =3D REG_SPI_CLK_FREQ_SEL, + .base_bits =3D 1, + .base_shift =3D 1, + .base_values =3D spi7583_base, + .n_base_values =3D ARRAY_SIZE(spi7583_base), + + .div_reg =3D REG_SPI_CLK_DIV_SEL, + .div_bits =3D 5, + .div_shift =3D 8, + .div_val0 =3D 40, + .div_step =3D 2, + }, { + .id =3D EN7523_CLK_NPU, + .name =3D "npu", + + .base_reg =3D REG_NPU_CLK_DIV_SEL, + .base_bits =3D 2, + .base_shift =3D 9, + .base_values =3D npu7583_base, + .n_base_values =3D ARRAY_SIZE(npu7583_base), + + .div_bits =3D 3, + .div_shift =3D 0, + .div_step =3D 1, + .div_offset =3D 1, + }, { + .id =3D EN7523_CLK_CRYPTO, + .name =3D "crypto", + + .base_reg =3D REG_CRYPTO_CLKSRC2, + .base_bits =3D 1, + .base_shift =3D 0, + .base_values =3D crypto7583_base, + .n_base_values =3D ARRAY_SIZE(crypto7583_base), + }, { + .id =3D EN7581_CLK_EMMC, + .name =3D "emmc", + + .base_reg =3D REG_CRYPTO_CLKSRC2, + .base_bits =3D 1, + .base_shift =3D 13, + .base_values =3D emmc7583_base, + .n_base_values =3D ARRAY_SIZE(emmc7583_base), + }, { + .id =3D AN7583_CLK_MDIO0, + .name =3D "mdio0", + + .base_reg =3D REG_CRYPTO_CLKSRC2, + + .base_value =3D 25000000, + + .div_bits =3D 4, + .div_shift =3D 15, + .div_step =3D 1, + .div_offset =3D 1, + }, { + .id =3D AN7583_CLK_MDIO1, + .name =3D "mdio1", + + .base_reg =3D REG_CRYPTO_CLKSRC2, + + .base_value =3D 25000000, + + .div_bits =3D 4, + .div_shift =3D 19, + .div_step =3D 1, + .div_offset =3D 1, + } +}; + static const u16 en7581_rst_ofs[] =3D { REG_RST_CTRL2, REG_RST_CTRL1, @@ -361,6 +502,60 @@ static const u16 en7581_rst_map[] =3D { [EN7581_XPON_MAC_RST] =3D RST_NR_PER_BANK + 31, }; =20 +static const u16 an7583_rst_map[] =3D { + /* RST_CTRL2 */ + [AN7583_XPON_PHY_RST] =3D 0, + [AN7583_GPON_OLT_RST] =3D 1, + [AN7583_CPU_TIMER2_RST] =3D 2, + [AN7583_HSUART_RST] =3D 3, + [AN7583_UART4_RST] =3D 4, + [AN7583_UART5_RST] =3D 5, + [AN7583_I2C2_RST] =3D 6, + [AN7583_XSI_MAC_RST] =3D 7, + [AN7583_XSI_PHY_RST] =3D 8, + [AN7583_NPU_RST] =3D 9, + [AN7583_TRNG_MSTART_RST] =3D 12, + [AN7583_DUAL_HSI0_RST] =3D 13, + [AN7583_DUAL_HSI1_RST] =3D 14, + [AN7583_DUAL_HSI0_MAC_RST] =3D 16, + [AN7583_DUAL_HSI1_MAC_RST] =3D 17, + [AN7583_XPON_XFI_RST] =3D 18, + [AN7583_WDMA_RST] =3D 19, + [AN7583_WOE0_RST] =3D 20, + [AN7583_HSDMA_RST] =3D 22, + [AN7583_TDMA_RST] =3D 24, + [AN7583_EMMC_RST] =3D 25, + [AN7583_SOE_RST] =3D 26, + [AN7583_XFP_MAC_RST] =3D 28, + [AN7583_MDIO0] =3D 30, + [AN7583_MDIO1] =3D 31, + /* RST_CTRL1 */ + [AN7583_PCM1_ZSI_ISI_RST] =3D RST_NR_PER_BANK + 0, + [AN7583_FE_PDMA_RST] =3D RST_NR_PER_BANK + 1, + [AN7583_FE_QDMA_RST] =3D RST_NR_PER_BANK + 2, + [AN7583_PCM_SPIWP_RST] =3D RST_NR_PER_BANK + 4, + [AN7583_CRYPTO_RST] =3D RST_NR_PER_BANK + 6, + [AN7583_TIMER_RST] =3D RST_NR_PER_BANK + 8, + [AN7583_PCM1_RST] =3D RST_NR_PER_BANK + 11, + [AN7583_UART_RST] =3D RST_NR_PER_BANK + 12, + [AN7583_GPIO_RST] =3D RST_NR_PER_BANK + 13, + [AN7583_GDMA_RST] =3D RST_NR_PER_BANK + 14, + [AN7583_I2C_MASTER_RST] =3D RST_NR_PER_BANK + 16, + [AN7583_PCM2_ZSI_ISI_RST] =3D RST_NR_PER_BANK + 17, + [AN7583_SFC_RST] =3D RST_NR_PER_BANK + 18, + [AN7583_UART2_RST] =3D RST_NR_PER_BANK + 19, + [AN7583_GDMP_RST] =3D RST_NR_PER_BANK + 20, + [AN7583_FE_RST] =3D RST_NR_PER_BANK + 21, + [AN7583_USB_HOST_P0_RST] =3D RST_NR_PER_BANK + 22, + [AN7583_GSW_RST] =3D RST_NR_PER_BANK + 23, + [AN7583_SFC2_PCM_RST] =3D RST_NR_PER_BANK + 25, + [AN7583_PCIE0_RST] =3D RST_NR_PER_BANK + 26, + [AN7583_PCIE1_RST] =3D RST_NR_PER_BANK + 27, + [AN7583_CPU_TIMER_RST] =3D RST_NR_PER_BANK + 28, + [AN7583_PCIE_HB_RST] =3D RST_NR_PER_BANK + 29, + [AN7583_XPON_MAC_RST] =3D RST_NR_PER_BANK + 31, +}; + static u32 en7523_get_base_rate(const struct en_clk_desc *desc, u32 val) { if (!desc->base_bits) @@ -698,6 +893,62 @@ static int en7581_clk_hw_init(struct platform_device *= pdev, return en7581_reset_register(&pdev->dev, clk_map); } =20 +static int an7583_reset_register(struct device *dev, struct regmap *map) +{ + struct en_rst_data *rst_data; + + rst_data =3D devm_kzalloc(dev, sizeof(*rst_data), GFP_KERNEL); + if (!rst_data) + return -ENOMEM; + + rst_data->bank_ofs =3D en7581_rst_ofs; + rst_data->idx_map =3D an7583_rst_map; + rst_data->map =3D map; + + rst_data->rcdev.nr_resets =3D ARRAY_SIZE(an7583_rst_map); + rst_data->rcdev.of_xlate =3D en7523_reset_xlate; + rst_data->rcdev.ops =3D &en7581_reset_ops; + rst_data->rcdev.of_node =3D dev->of_node; + rst_data->rcdev.of_reset_n_cells =3D 1; + rst_data->rcdev.owner =3D THIS_MODULE; + rst_data->rcdev.dev =3D dev; + + return devm_reset_controller_register(dev, &rst_data->rcdev); +} + +static int an7583_clk_hw_init(struct platform_device *pdev, + const struct en_clk_soc_data *soc_data, + struct clk_hw_onecell_data *clk_data) +{ + struct device *dev =3D &pdev->dev; + struct regmap *map, *clk_map; + void __iomem *base; + int err; + + map =3D syscon_regmap_lookup_by_phandle(dev->of_node, "airoha,chip-scu"); + if (IS_ERR(map)) + return PTR_ERR(map); + + base =3D devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) + return PTR_ERR(base); + + clk_map =3D devm_regmap_init_mmio(&pdev->dev, base, &en7523_clk_regmap_co= nfig); + if (IS_ERR(clk_map)) + return PTR_ERR(clk_map); + + err =3D en75xx_register_clocks(dev, soc_data, clk_data, map, clk_map); + if (err) + return err; + + regmap_clear_bits(clk_map, REG_NP_SCU_SSTR, + REG_PCIE_XSI0_SEL_MASK | REG_PCIE_XSI1_SEL_MASK); + regmap_update_bits(clk_map, REG_NP_SCU_PCIC, REG_PCIE_CTRL, + FIELD_PREP(REG_PCIE_CTRL, 3)); + + return an7583_reset_register(dev, clk_map); +} + static int en7523_clk_probe(struct platform_device *pdev) { const struct en_clk_soc_data *soc_data; @@ -746,9 +997,22 @@ static const struct en_clk_soc_data en7581_data =3D { .hw_init =3D en7581_clk_hw_init, }; =20 +static const struct en_clk_soc_data an7583_data =3D { + .base_clks =3D an7583_base_clks, + /* We increment num_clocks by 1 to account for additional PCIe clock */ + .num_clocks =3D ARRAY_SIZE(an7583_base_clks) + 1, + .pcie_ops =3D { + .is_enabled =3D en7581_pci_is_enabled, + .enable =3D en7581_pci_enable, + .disable =3D en7581_pci_disable, + }, + .hw_init =3D an7583_clk_hw_init, +}; + static const struct of_device_id of_match_clk_en7523[] =3D { { .compatible =3D "airoha,en7523-scu", .data =3D &en7523_data }, { .compatible =3D "airoha,en7581-scu", .data =3D &en7581_data }, + { .compatible =3D "airoha,an7583-scu", .data =3D &an7583_data }, { /* sentinel */ } }; =20 --=20 2.51.0