From nobody Wed Dec 17 10:21:28 2025 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.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 1CDCA36B060 for ; Tue, 11 Nov 2025 15:56:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762876595; cv=none; b=DcwfdcJDVYz7hFqayyuljnQG8Jk57O2iDnzD4DrlGMt98j7li/SioL1E5OlsizgYXpWg36emG+1mXarCCD3QxjvBX/dL4/9T3bSJh5RmXtxxODr06hP6xTXRsNjn3Alamdo4Z3lXrT8Ne5QMfNMz81ixLeRcEofs6D9RCeyiY3M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762876595; c=relaxed/simple; bh=0uIR8Qg8yt3OmnrdjUH1eJLhte55yFIneXSQYFVOiCY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ILObYI+yMAbx7/tEfiDYUqJ+doTimhjZ6iBC5CCI06reg3kxlHWhMRlB2b0A7hVq18oA9J5HZh0DriWnj5vr1YEm5osaBc/fWtXZ36bW8NtN9grWkVAHija9FGJtCAlK/sNVOmhWUjnTSRz1XBg2WY2ntUVPNq8tKmj/jPCHR3g= 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=EKP82GkX; arc=none smtp.client-ip=209.85.221.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="EKP82GkX" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-42b3b0d76fcso1403270f8f.3 for ; Tue, 11 Nov 2025 07:56:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762876591; x=1763481391; 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=EKP82GkXTbZwWCV/rHmG48pevIc5d0G+zmFArx7n+FTUuBciOA8nPVGe+GT4Y3H/RB /t+m7ri11+4B077LABWvMpXifLP0GvfwMuk0fcQAvAoy2v9JT6aiKGTt4v14/nTgEgD4 x40u6m5etb/Yk+fC1b4gWTbkvRlHgWWona+0tuvVff52G/r+ynniPb2+iRpQ7XjCeuYL mjPzXQy0WXGU6Es/XmC0P41NzspevHMGnCFE2GY4qF3J3LgmeYa9gWRhaaZEXoSeEMNE Vnfkj/52WWnCPsBmhG7OWER3mZF4ht9Sa85175pXBEhB47DVv4bX68Z3KIXx7SA40vbE 3QYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762876591; x=1763481391; 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=InSmCNGAU/L8t/1Gj+35ue9r+IStQI7XKmhun64uyn7J22svCMqCLznzM4eCTs3Hz7 PqXNkyeA3cjKArg61czeKa+lvwAXz3X+aTBmEUGOlpv1Ao2k85oZbO7eIL4FD7w0aH8o xZ07Wsx+SY9PaqCM/3kBVbepL5hkeT0EDYb3g7b9PBZgjd2OjiJPME7gmlqANAPaCL7p rFcXMitQBl6YyQ7itL7gqxEQozo6tHy/naUi/D/KFdzUUzVAeVgAhH4rD+YVeHdB2OEG KpNYjr+tw62hOcSdq5svHR/ASsirYoGUH8QZVBzZY/2VSnAAwR6ym9WyNx6oirp5+4ak Cwjw== X-Forwarded-Encrypted: i=1; AJvYcCU2x7toHRJ5WlQ3I7yAMWi4MacOIFdzV04mY3rQU1Asm8+6EVYDPKB1tFYUkbh8YLU3WV6sgqEOpEphnws=@vger.kernel.org X-Gm-Message-State: AOJu0YyB/8M+3Ugm7V1/ancjmX5/geSgqT5jWTNQtTeNeTgzeb1b50+H e8oaii4KJXc83ky9XVd77IijrZZOe0n8ESeY4s7Woa8+2B6ni89IdJ36 X-Gm-Gg: ASbGncukqjoeLRWz5tQUriycxgM+m3tK5rGKaqTij0ssKv06MKPq8ynGRqanQFymJDr YgKIR/k9aMCcWeuyZ9Qrpj1R23zzu2YlIU3rYB0uDLpHboN5b5xYUwjA2PJtOSSA3npeqmSeopA jcpoCR1Od/GVez3lB23yv3RDXUCRXrgs4luXa+sxcQM44yVi99IqDtsscWmGoDWbI96qLHuWUBg DBQnPSczISoxCFqPplCJ86OqBU4bmnhs9bI7xsVmQ+mKbLfXbLyoK1xmVfyjlKXZnr2voFE44wN 14OLAluOuq0SCovW3R6rCzCh8Q2QtJaRn1b0G3NPOBebvQWC7IP6R7nHueKLJ9vr+lEwBTDnz/U uDV0+d0IiDvMM5sNKvNyoEQAKISapi7+naWN2UR2OlmmbYiBNEEOuEITmfaLZDDPUsChoHb80vO 2XT8mU+ReBHhHxyQoOHKsedurkO6F+vH4zRoBAQhXW X-Google-Smtp-Source: AGHT+IHPgPMcB7v6a4L7yptAsuJpFLsTU4O6Av6t6XnKpwFFXbhHQkv8GRIFMxbCrfV9lZZtByQ1mA== X-Received: by 2002:a05:6000:4024:b0:42b:3ab7:b8a8 with SMTP id ffacd0b85a97d-42b3ab7bb63mr7741899f8f.17.1762876591357; Tue, 11 Nov 2025 07:56:31 -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-42abe63e13csm28676766f8f.19.2025.11.11.07.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Nov 2025 07:56:30 -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 v4 1/5] clk: en7523: convert driver to regmap API Date: Tue, 11 Nov 2025 16:56:17 +0100 Message-ID: <20251111155623.9024-2-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251111155623.9024-1-ansuelsmth@gmail.com> References: <20251111155623.9024-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 Wed Dec 17 10:21:28 2025 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.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 46B0336B06A for ; Tue, 11 Nov 2025 15:56:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762876596; cv=none; b=MYWs59AMtLoZubBvDFjCx88Yd/MBZHSVGsYPq2Nk8hjxDnQHr1aoxoSF7me2xbKT4ZifNNn0clIiLnF/WcoGAACisw7hnC5y+M814ZMH0j46VF7yAYwTbfCgNRoIyJF5dlZpyYKDsjX9MTAW03uJvg8qPlkRQ5Hj7qIXcipNxK8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762876596; c=relaxed/simple; bh=XVTIKGDo9ThWVGg8qcTaNRRTvL4SJHb9lTtxpWqTLR8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oDEpxcnUJwqVzUvqKh1VUOpYYXrVwsEp5e4TEwPYuGYhFWuV9mFLWRHdxB8uuhcXjX32gdFa9gkrOa+EBTppnyKe5ZUmFdQ3SonKOkdQR5mU1e9ptcjGgQcg29SwkFUbW/MJebGjyghNY4DeUoC1niXGoq3tUXYoldP0vOWaj5o= 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=SY1oZ1N6; arc=none smtp.client-ip=209.85.128.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="SY1oZ1N6" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-47775fb6cb4so21234745e9.0 for ; Tue, 11 Nov 2025 07:56:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762876593; x=1763481393; 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=SY1oZ1N6fAUVuuKYBYIkAaIgjOut1rWEmwS0XeF2FjfIDTBjMH019fwwgxiPMDCJlY k+Kg5cCezOowMoH4XcqARP6tzSlDp7W78MbLh9t0L2SkWPgAQ5yz4VDD7mP/1vqKIHFW 8VQrFlSmW0sVAAjM6RbyCsVHZYv0XznXAsTB7FJozipH6oFVb0yqqBo7e6OO+nO5cvkb dIq3k5otIGg/fYJnD4Rdrivd6hHDr6LQtu8uPy4idInQLGMxCQfBMaCFLtbVQT0e/5D5 LJHSAiL+dfu/Q2Vhf/YCy3Pbr5GSKJ9W4vaxyQZoe/upBfvV0Yx6iFnOcFeSuwvn+GsY i9Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762876593; x=1763481393; 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=QMIwO9iTo/noslFsLf3z8S280wUu/4h7dGiCfQM2gSLuZIJa7+GTdVOtwZ1Of/WzI7 dqO3bhqAdja5fyc1sut/L4zvAmm9Tg2kJJDoSQ87/Nw3xNVaLiJP+rvZ4BJPZINQ/u2m 57C7mD3Z737P2k6umJCjjGsJEj8dzxLVJoU7oZYyKcHbFhKSFz2gQ9buuX3+lH8AR4nK E1L3NxEj34uHtu7cRLF09oA/Teuuqbe8pyVHhcafeLFfIyOWgi6+IczujeGQtP4SBNY3 jT/LoaQQ3NJ8r2mIFgmLejuL14cjREhy/umVckSYRs9qlNN+BZzOxRj+RAB/c0/hmbn1 zbeg== X-Forwarded-Encrypted: i=1; AJvYcCX1XTyUQIFiRJ5YLsmESDomgpLYQyCI/nQbLBsRd3E9a4GdfxIPG7jSXFj4j3rg1SbEnVXrsfnyrLblXYM=@vger.kernel.org X-Gm-Message-State: AOJu0Ywqo4x43MyO4zs0IT1jG/tXdeLV733pJkQMLaHnlqBduuf06yz4 jOP7hwj1/7ATJCH9AKwGY3Pswp+++FRpcIxfKxDlrXoAdvfoK01HKMxa X-Gm-Gg: ASbGncsIPqjJXlXYr0KY0JwRd5vmb9/bpx9RCcLc4YmaCvVAkFDmgPBIJrnEqoxpT8N d211ViiEoLdi9dRf5meWVxim+c2yFDCjR2INJ7A5StRy4ZEDLYUzAP4Vse5DuktjSkZuLBbpH3N JpqKNH6Mzsm1EP2kj5xai/uZskY/XdURPWy18JCx/fqO1IyJUioHqvOlpZRoyftDE/EcgZ91qCo jLXH3YxBjX4JmpwYxG5EFGfqgBeu8adeiCU7UTVDcYYkmbABZ9QZsOLvODV7ZDUOOCi1/PVPxtC LIcwV+XVV9vYOCAODMvVk0gURC1GY1qo7dx9v8o1YBpf7nse4GGMguM0yiKSEsqD8ESzmgrb3Ja /i6SDHgS51xxXKDdtylRvIrFgH2y6/orIz84zROREBV+8HEQFsqHzcg1EHsB7GtWoXLk4tbbuHh JoBMagVMjpjm7raoRU2EFrpZC3YJ8vBCeUA8nFKJxw X-Google-Smtp-Source: AGHT+IGNg1qYMZqiG3WtGb0ldIMecp9uKwNT0ppjRrCM4YhFq4IcRBoJvBHU+lPwykx7FsAHAwE8Tw== X-Received: by 2002:a05:6000:26ce:b0:42b:4219:269 with SMTP id ffacd0b85a97d-42b42190643mr4381837f8f.41.1762876592349; Tue, 11 Nov 2025 07:56:32 -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-42abe63e13csm28676766f8f.19.2025.11.11.07.56.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Nov 2025 07:56:31 -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 v4 2/5] clk: en7523: generalize register clocks function Date: Tue, 11 Nov 2025 16:56:18 +0100 Message-ID: <20251111155623.9024-3-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251111155623.9024-1-ansuelsmth@gmail.com> References: <20251111155623.9024-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 Wed Dec 17 10:21:28 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 3B0D936B073 for ; Tue, 11 Nov 2025 15:56:35 +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=1762876597; cv=none; b=bEsoc8ZSpbppL0BszlfXjT1nDOYbZnnjN1V0T1bNTeMTNwvmiELX3TsFy2+Q8Jcosu2bpyH3O1fWFyhXy0j15csTADexJ0bJ5HIHw0gIUhQCmiq1cqJ1sdKcppZ8GlQlXy7fAk/wUhh4wUR3ujGycrasFLpiWztpm7PMny2jTtY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762876597; c=relaxed/simple; bh=I8gVSNxw2aOO4ZdP0s2HcOB6Vs9l7ZVMP8y4tYKEw8M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tiipPjkv28FRxNJC7cIgLjbopOAUBtuCfObTb37ACjRqP4Zw1irxMxEAmOpaSNPaD5ARXPpZPOsB2wcEKBc+cvNAFQ8/+dSaohl0rb7gBkTaG15yTbSA1N62FLHqYAXVRydXekfS1UmP2INP9Mi6vyImKkJs/prdPN3WeRtXMHw= 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=ZZp4HGLR; 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="ZZp4HGLR" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-42b38693c4dso1427861f8f.3 for ; Tue, 11 Nov 2025 07:56:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762876593; x=1763481393; 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=ZZp4HGLR8arYZ/gfY2EfteuDWGLseuOpxdr5xLQS+LZODQkb5OhycKOE7yuk6Ooxg9 gVuYiQ1sHdNa+aDZDTJmytTPQAntLpSm573mF0B/jPUblne9Z2uECHQdces8FK0Zy9e9 pUVAQFZ7ENkd6WCcOqDVNpuTrmHIVNoKqtVY0av9x/Z5+xOWxnT1ZF1ZY/ltux+OQuVc lj4uyqxCIJhG/hFOHEy/QyU3RTy7kH6wiSqbiDh4DTzeHo1MG5le69BgfW56FzkpIdtN nOs34CPd9YWydBKDYvaoj0+c8eDibFrowhNibKZ/+mtwaaemNjLhkd+KEj/QyA2diVuJ 7rQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762876593; x=1763481393; 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=AWv8wB2QSUXoXKL6YlNssHVJzmRZu07f9JISUJjnaWIgiLdA0vGi6ikeicn8AlAny5 ICnl2DsvizBj+zLfWP7JVvYV0FskZBeThoOqhgf5IEUKAdyJbh8s8POTgEcPBuNWA4Qu 9sST802nXdXeQvhkk6cbI0pcvf1J4z002daC55pCooE6yl3k2Wf/cXtyYUd871mXgafD T6SyTGJqat1r9pfeqd42b3skgTbuKaogOFSB1tFPEC8CFSSN8tHRWfQn8jlz005t3kdL FPdse7jsVRYeFYKPbyKSqbfSD4AM2QTozZr/Rs4JCshjfxMO4sCuoIm1EkC2MW9YgkTe 2irw== X-Forwarded-Encrypted: i=1; AJvYcCVJGkoWrubsBhkTGTIGWyoSUa0jy1cX82EtqE3/Va2Vm9CQJ9fiMbZ+oyJuFhBIZP6NpYq1Lu97IBUtdes=@vger.kernel.org X-Gm-Message-State: AOJu0YxmQRDp3Jl8GFN4/yVyJ1V1CnpwnlVIhCPE9vPlOMvxXrSrmd3u mn4VltUz2C/mkuEjhuwXGB3QfPxtKP6sGWQv0ICJXcoytHdRW9qFxH48 X-Gm-Gg: ASbGncsiYZR/9mFDX17BchtbWyaDCjm9BplzF/GXb+stZ1LvOVoCj4pggZgVAdLJcR2 2jEbCycz1B8kKVOTr52sImAJbnXC6+xXtxqap+/G+h3YYq9JW7jBU7lm5ySZhro7/eKVf9QBzFv OyDjoixYvMPZWwXJSHvAUBaQbreYSPxkuIsutk/dcQcBO4dJngasgEJGliGYOLD15XZ87kG1R66 3y7Bmi8hpBKIHQaecTOwqnjhNPaZRRvr+zn/Gzm25mK+A683W64u/Lc7D1S6O5u/oNwtBevFdKX exj2G26i7pPWKaW2QZPdwiCtv+h5l/9mdJki82bIGiKRQDImixaW765pVZYfJFQ4nsqgZZL1PMA N2hMrlLmLkgxQ7QCGpT5bd4PB3mt3i5uvJQ7exIGSL/h3MyD9CbUQbR0L4/5AMD/0Oe2c+WJU95 8OlZnpb41JOO5lmDlmuOjM5VFwgsY5og== X-Google-Smtp-Source: AGHT+IGrlsOxD3VvyhNqHTYmqSwZXcEDRU2mam9V5xs1eNPMUgYcK58098Bm6bZZtgLeXYdOtcLo1Q== X-Received: by 2002:a5d:5d0f:0:b0:429:b1e4:1f79 with SMTP id ffacd0b85a97d-42b2dc6b007mr11397434f8f.58.1762876593479; Tue, 11 Nov 2025 07:56:33 -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-42abe63e13csm28676766f8f.19.2025.11.11.07.56.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Nov 2025 07:56:33 -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 v4 3/5] clk: en7523: reword and clean clk_probe variables Date: Tue, 11 Nov 2025 16:56:19 +0100 Message-ID: <20251111155623.9024-4-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251111155623.9024-1-ansuelsmth@gmail.com> References: <20251111155623.9024-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 Wed Dec 17 10:21:28 2025 Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 5420936C588 for ; Tue, 11 Nov 2025 15:56:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762876598; cv=none; b=tH5D8BJnEnjgPyk2i2qZGQmcKJ5tYSkStqmqsEtCTIY/tQTBEjdg2eXKdTBWZcon1cKwtszu3lkk/voEBxY7Ue8/7yC21ndBT79u8JjtIVRW5/lDB2XLuHt4iUbS/gvhkXQoFr61YPz/USoyd4tv2kuzVfrqpkkNehQ8Ok+l6mc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762876598; c=relaxed/simple; bh=zN24KWDJZb1WgQ/Z3lpGNyeeBBk4det6/dpjp/Gy6y0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kM6lgVHAk56NiIVXifmi3ESTQ36MI3Vuc4kgPjnit+5ZMWqvLykV4V7j5X9XDRPTHLTuBdxBhfDlT9iTxe1yj0VFO+fOHDa3IKjySIg58GJK3NvtG/H96qg6FWwWXR9zuDfQo27MhfVGkYw53EI3y1r7zyfaZDN+eH0nwkF8DPU= 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=Dp1MyIGy; arc=none smtp.client-ip=209.85.128.44 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="Dp1MyIGy" Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-4775e891b5eso22302125e9.2 for ; Tue, 11 Nov 2025 07:56:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762876595; x=1763481395; 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=7fIZgZpE0U6JBB52ynsnA5QA9drzTFVpt2SE1VH4l3E=; b=Dp1MyIGyKy4vdvAztHJrXTK8tBNtkvNU242YXH2GKP7AQYbFOXmLPlZ4c2hyADO7ty ACuPJhnmloPnw7K+wmu7/AN2RelrmgjozS2b8S+cvZLGC5zyiCY5+5WBEyterD/ltGsw Yv1UQSCDkSPtl1U8uXtH6SAqVDmHiNHWf5Rg0j/USPtiR2/DZ5/JcmJWfCUQ3t82AWmX e/NAKtQxXcA/SE5Chn0MgGhE1uaBp26436AY8dStcR49ciXnd/FDgpz9X6eTauab/bge NKFYR2+s60/tZDmn69TsVoZAA0+E7wjdW8SW1mpNPYoJelIw/eYKelIs4awNTzXOHYUN FXxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762876595; x=1763481395; 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=7fIZgZpE0U6JBB52ynsnA5QA9drzTFVpt2SE1VH4l3E=; b=PzxOxvRde9MtNvuaQNGyQSd7oCqIby86+OfCEAwUo2hT5aYoPO/ti+Xla0n+mX+m7s CRkfxJlrH/w4tFzxm9vVQUDQRf0GAvdiiWgla3aVndmtvV0DG/DRP/Cftr+DqTZLbTJl fkZsUkqak1ef2MKJJ2IsIy93E6lOlOePUobkVb0dmFr9y0ZockFRtlSRAj+n2bgG0fQt 1X/C5HaobQQpM9gV0nAYnRJFthZEEGnRScftzno5Bis9nlbqP9wEm/PdwH2bOdu1k1gG 5fzYDDqGkdfY8QF1hq7lVx1Sxw/oGcJzPLUGb/EgQW+CGjA3DqmNoJGOcMWaYudkSl+1 G4nw== X-Forwarded-Encrypted: i=1; AJvYcCVtHjlTl8x5oh1Qy/n+2veZ3drzSVXirFsUBBnjDDPIi3GrqzodMC3JZVoayNNIVNHtJh5zWQgU5NRJDyE=@vger.kernel.org X-Gm-Message-State: AOJu0YxhEuHdJtk5MYJ8C7TZG9/H2Qk5jxMYfg7QBk66gJyoUhZ+inMG OcO2RsCNxStGSpMS/mHCrkThFaq1RO2r6nJ/1t7IVDs5mqUX83fWIPsp X-Gm-Gg: ASbGncs0bFesNuWdwZXNG16CBBjHYJqkoHFF7Juj2rV0vy0jnfJjn5T+kMg4abtXBeF Lp/MEBGbWIMRA8AeMdtTth72+Ie9OxSg82v564ImgMQX/1nz0Xims6ErkA2GLDZkDOwkbVdE9r/ RQkSu2OeTfm7mRZJJJYeeiuGmdXAuH6dsMAGoKgq/pcY1GAfzc8UBuEDKylEDv/J06XfZGs9KH6 X7W3ZlLzOuaazlhUJrY+Tq48k4qJUrj9s5lq9bDA7MwsGpOZHi03w0OY7bN/+SwZfKRWYpOi3or Pi3NYj1hOqQPFjbGxxGs41I/a9VzkC3jUnmD4xnRAnywLgWAvgKCctP5A+fuOF0xtv8zHdNl/55 BRBiUUyK0CSZbCABA2uL7jjLwAUeoYyt63vEPA9XNBTziuw3KNkpg/PGCpGmNSC1op0Crc3gLOh jAlwuRPdndM2coHvICIPd0z3ohx07f3A== X-Google-Smtp-Source: AGHT+IHJrBECeJh0b66lv3P+gg5fs729mTYmWDJdAcvMZDVj5CNLrnzuFJRU38R+n0e9SoVI8pc0zA== X-Received: by 2002:a05:600c:46d5:b0:477:3fcf:3651 with SMTP id 5b1f17b1804b1-47773298023mr98870775e9.39.1762876594567; Tue, 11 Nov 2025 07:56:34 -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-42abe63e13csm28676766f8f.19.2025.11.11.07.56.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Nov 2025 07:56:34 -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 , Krzysztof Kozlowski Subject: [PATCH v4 4/5] dt-bindings: clock: airoha: Document support for AN7583 clock Date: Tue, 11 Nov 2025 16:56:20 +0100 Message-ID: <20251111155623.9024-5-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251111155623.9024-1-ansuelsmth@gmail.com> References: <20251111155623.9024-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 Wed Dec 17 10:21:28 2025 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 74E3D36B057 for ; Tue, 11 Nov 2025 15:56:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762876599; cv=none; b=rZ3r2lLEzeFinCrWbJ4Fu3Zu+DJil1wywO46Ptwie3xUbbdWY1fIjIrIdM199cY0Pscwpl3Aq8MfkUz/ljJAIgU6Yk4RgDEQlxvkXN46hD1QUBN9Zwr7k4OuXBc6lOm2TvWRVfHhe8Mr6tzo9Gc/CdInt8WoIloOZwFBs4c2bDo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762876599; c=relaxed/simple; bh=jvnWathBhjeqNe4bD205E5KDqrWC1stIoxfmNcQDuzM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lF98l6BPdQDG9q0j0+A+eScWfn0Td+hYeuYqoUkdR2r4R0W38aW0CsUif2b+2JfjNhLIRo20HiB2YkEmHCHeeVYXdhaY5/u4vNtVqYjeLQqyTgwTToIrYCYjjbIdmLyDemhaMZ4hFdtpyVUal4vqu/wWhRZFty4ZsT9yxhN8LY4= 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=cjIqQRjg; arc=none smtp.client-ip=209.85.221.52 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="cjIqQRjg" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-42b312a086eso1985713f8f.2 for ; Tue, 11 Nov 2025 07:56:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1762876596; x=1763481396; 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=XOks1DTqBajKKzUeH18oDqcK+YuzoZOEEjP55ETxcAo=; b=cjIqQRjgQDO99mNQhJ3/YCaWwIb6TttF94vuoR0x2cKr9CDejccDqp/N1/akhL5HLU w3VQVNZD+Yg7aWehPbL698LcL20fFbTPrW8fKQlsqA9SwzLHRy8hJRXkhv0d23ngUyz0 hsvcv7dyFUIewWTKFa6oOTQqX7r6kP/Xtaoq/h+ek4qbhtn3TZd4bFlGzGKjH7iygCNY bUrfDJEUsjG1SCLf6iZX/nNeUf9XqlhEwNBnQi9L7A8URLO/gvv4j8hlnDMoCvAeHW3H 2P+fo2DEXolu5+mMNeG1svSNvX2aA0PcGBVI7W/N4TSNDPzfyJrqmonGBRrGDVXN8GK2 lqlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762876596; x=1763481396; 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=XOks1DTqBajKKzUeH18oDqcK+YuzoZOEEjP55ETxcAo=; b=pCVO90V2hpFdBeg2dcXTYarJBR0SMYw/t07Y5cDHuITaxz4AuhhGaRxvS+rm2o2BUd bohOZoKif75x/MQzjesLTT/JpMHroQE/E8VDP3sNU2Xr0+HALFatj8M5TUJEvXMxmDga gGQD9wH5gD6eTlAxCK3Nl+7uZCirzNy1Y3n3TW43ZkNd22lsQNTCfYOXHlnN9YFFo6vU +YO4URHMnXKuAHrQ+Wj/kxRxxHEbn0bXYD6aYjrsAeJGMitrQOiRiDhiR1Ipklt5NPX8 HGzradSwBHEHBlyjruq1kRrJmuIc7KYKzmoFG2EPRswdSkgtGaBvVmEnA/udd/TogPcF hFmQ== X-Forwarded-Encrypted: i=1; AJvYcCUTewILwD9UH9JnjXR1q2t7cFsPYnG/+hTMS7rBdKHmPMIV6L42FdDCSOVdssXPNmqC7+eNntKCk58MThI=@vger.kernel.org X-Gm-Message-State: AOJu0Yxgtg+xu/mHkLQu6P/5TPcvJAB9yTLWoFF/6NqczTD0GB8RbjU3 30vbFHMssvoGCASH71H2uqWHSDXojzjFS7vLS0i3WMI7x9ZB70+bJcWf X-Gm-Gg: ASbGncvMYFfaxsS7ZoByToM1rY9ne4zefXC62xsIwcJ4VR3okS4r7W3LncBU1z7l/yI mq5mGDO5b/v9HfVENttc0d2Ln/bKkbr2+J40HDUTdsOazgRdeaZJGabVWsaS3NV8KFCtfMo0AF9 pbcWkTrW8kRm2vcCzB4a/8UoOUWnFqQcxcmQ1QGYhKYoHTUYtRKEZHCRw9YSxi2bSQMTPqozms6 NDp/jPXP7qL3vZ418Un7UNxFlpLdG008PsIKx1cpUwhLlhIf8+SEJ0dBNBRo5b+nV4if5liSyuu 7+I2LJwq2NOeE5BtRGdbbQOddTP/JDm7JyY4AKp7XO540drrIw8HmcPTV3SLs0/suLmSGwxf8LT IkliCzVzZ8Ou70Ot9/tKY/uvE2T5cR2JE3KOtd/ibv0YzEGX5+XXCI+m0iQgdSnJMcOlRZPFRCy GETUuNvZlHBFLPbALRbpV+fuuMyNLH4KX0OeYPAsknQp9tmIHaCxA= X-Google-Smtp-Source: AGHT+IGr/bTVwBY4nFwQ/0y7Q9ja3kr5eSmTXnyRJaQZxUc8pS8vnJA7PQdFqYGPBqmqGqGAvU2erg== X-Received: by 2002:a05:6000:42c5:b0:42b:3083:5588 with SMTP id ffacd0b85a97d-42b30835697mr8621639f8f.39.1762876595641; Tue, 11 Nov 2025 07:56:35 -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-42abe63e13csm28676766f8f.19.2025.11.11.07.56.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Nov 2025 07:56:35 -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 v4 5/5] clk: en7523: add support for Airoha AN7583 clock Date: Tue, 11 Nov 2025 16:56:21 +0100 Message-ID: <20251111155623.9024-6-ansuelsmth@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251111155623.9024-1-ansuelsmth@gmail.com> References: <20251111155623.9024-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 | 259 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 259 insertions(+) diff --git a/drivers/clk/clk-en7523.c b/drivers/clk/clk-en7523.c index d98990a157d3..feee0ad20fa8 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,57 @@ 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_compatible("airoha,en7581-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; + + 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 +992,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