From patchwork Wed Apr 3 16:20:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 13616459 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 08B98CD1296 for ; Wed, 3 Apr 2024 16:21:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZQY7y2vtqo+9v/I4HEkGUBcp0HnisVvgJ05I8wRDdKE=; b=bNk5RfVFbJcaNq ns62tIXbJNru0NC/ZpCKZ3/TzPDQiHJcIBRtrkYpih7xs3pKtqLLr0oKu1gIN3++l2qWakIyeeuYd sSvJRuRR7gg3cBGzPcvYlnj2uohKy9ik5IElmfZEr6yhKk5lnZWydJujMeTk/B0G1hvhvC6zacszq ZkA70PtdHIp5qz8WKP90CL6cdwFEAzEez8w1by9N8/4e8ZfcNt3JhneKL3fYhSDwrjF0RkRC+7u/j 1u1zWxxcvsbKLcvRPeY4iPl32f0uDAIdIu4ixXZOJbHRR9ivER9gF5RAIcqgO0DGqZf6Tc24EIKh/ khCZardiRz3aEzcaYx/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rs3MY-0000000GwCK-2Gzq; Wed, 03 Apr 2024 16:21:22 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rs3MT-0000000GwAi-3gzH for linux-arm-kernel@lists.infradead.org; Wed, 03 Apr 2024 16:21:19 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 4086A6149F; Wed, 3 Apr 2024 16:21:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88E48C433F1; Wed, 3 Apr 2024 16:21:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712161276; bh=ApYku/UQWHP6QcJ1ZCGRDlt+UdyUoz7YXy/dLNfRNUE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AKzAGxh1Ouatt2vFZ0eNRCrEtRJ7z44vZ1M0+SKF4HMZMQKl9QbRlQ0Pu9oOpinKU cN8/Tkup1puf8bhqPnxPGDUv/w/S6muTy4bPKGhCe10i3FDPxOVEUj+6GRibFzcqLX bqCzft92Nbprx0DP4A9YHXzb1aulN0mRy9djhOYQdX+XVEy2t4XJslr4maE4mUlOGh Vbvq2t9fM52JmOuDAlyYhcptbjYMiWZVlK6x17x/TAr7cxZhNItbunNMNaBDvURR3J 2YXEmRzvgbIYRNI5fU0no7ULmoFx+p0ILBbYJXtAoGqatbpMm1MRDxWYPvlpYjWO54 Xi8BoUKVA2c+A== From: Lorenzo Bianconi To: linux-clk@vger.kernel.org Cc: mturquette@baylibre.com, sboyd@kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, nbd@nbd.name, john@phrozen.org, devicetree@vger.kernel.org, dd@embedd.com, catalin.marinas@arm.com, will@kernel.org, upstream@airoha.com, lorenzo.bianconi83@gmail.com, angelogioacchino.delregno@collabora.com Subject: [PATCH 1/4] dt-bindings: clock: airoha: add EN7581 binding Date: Wed, 3 Apr 2024 18:20:42 +0200 Message-ID: <1988a4460ed327bea7841f6a0f3a756dd7cec4bb.1712160869.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240403_092117_988211_DBF9B383 X-CRM114-Status: UNSURE ( 7.82 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Introduce Airoha EN7581 entry in Airoha EN7523 clock binding Signed-off-by: Lorenzo Bianconi --- .../bindings/clock/airoha,en7523-scu.yaml | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml b/Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml index 79b0752faa91..cf893d4c74cd 100644 --- a/Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml +++ b/Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml @@ -29,10 +29,13 @@ description: | properties: compatible: items: - - const: airoha,en7523-scu + - enum: + - airoha,en7523-scu + - airoha,en7581-scu reg: - maxItems: 2 + minItems: 2 + maxItems: 3 "#clock-cells": description: @@ -45,6 +48,25 @@ required: - reg - '#clock-cells' +allOf: + - if: + properties: + compatible: + const: airoha,en7523-scu + then: + properties: + reg: + maxItems: 2 + + - if: + properties: + compatible: + const: airoha,en7581-scu + then: + properties: + reg: + maxItems: 3 + additionalProperties: false examples: From patchwork Wed Apr 3 16:20:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 13616460 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3F2B2CD128A for ; Wed, 3 Apr 2024 16:21:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=St7PdXyEGX+bZ2urqSP/0cG8SYIkCZ16kJ3cEq/KOd0=; b=SFZMU2QNvXWcZG q5F8zAViTpACIdvA+Ac77GH0PvAczZD1BwVhA3IQDT4S3H+em5qtECemowFSQe8mbesnWsJhbUn+f /vp0owl0gh67dPotxRLeHe9X8VT5z61xngiAxrOSXoOgDvC0C+dgMVArPxNR1nflGIDmlSJMxQaIh dSj4/q3dNHEFdSvkpaPIKUkTVdWJgwfdWoPY0abIHzeuSNWMdh0GspjrG4PfLoXa2drVJDLxmtP63 qjHsi/1jjbfjLlFhcp+wERUU1/ZoXzDfgZxlgZ+v9LLOySqReKDCXicO+B1Rq8G48TxmU9qF0wJr5 qmn7mhkwH61Mi1eR7LiQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rs3Mc-0000000GwDx-1QEO; Wed, 03 Apr 2024 16:21:26 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rs3MX-0000000GwBl-2Wr5 for linux-arm-kernel@lists.infradead.org; Wed, 03 Apr 2024 16:21:22 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id E1FD06149F; Wed, 3 Apr 2024 16:21:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 39C5EC433C7; Wed, 3 Apr 2024 16:21:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712161280; bh=fFQ5N7sQmAGLoUlKNPhtk3TelSVQODwMWd8NRadJgl8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ovHzYE6N4nDorlE7ReQUDB6UC5n0MUaEUEbRqyF7r+MGxOcZGzp/5pshnsga/kM4E prDqz54QaoWGodpFIPmDo/5d81+jSQpPCnapOhuqxU1wbsHD0+QVRUCx+G2zmrAayT KUK00tpUS+tMUe7RoJRCC3dVXkdX8unDD/SJVPzAKiPtrOVjLVBPQaU3GqxDN/rG84 rdS++01cTOdw1PN8A3eTDk141Twlt9Dpp335XbyP72AXRP7lhbcrziXmQbaJPwFkcD j1oFQp5LUAgaSNNVgo5nKSLjnZ/DC7SXqCsB7AXCah3Lu8nkUfP463H9ItZq/HdrFP zAcY/JsFNNQ7Q== From: Lorenzo Bianconi To: linux-clk@vger.kernel.org Cc: mturquette@baylibre.com, sboyd@kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, nbd@nbd.name, john@phrozen.org, devicetree@vger.kernel.org, dd@embedd.com, catalin.marinas@arm.com, will@kernel.org, upstream@airoha.com, lorenzo.bianconi83@gmail.com, angelogioacchino.delregno@collabora.com Subject: [PATCH 2/4] arm64: dts: airoha: Add EN7581 clock node Date: Wed, 3 Apr 2024 18:20:43 +0200 Message-ID: <8465b7562bcf53a0adfdd4ae01b3ed94d6d5bc54.1712160869.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240403_092121_834104_9272F4DF X-CRM114-Status: UNSURE ( 8.99 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Introduce the Airoha EN7581 clock node in Airoha EN7581 dtsi Tested-by: Zhengping Zhang Signed-off-by: Lorenzo Bianconi --- arch/arm64/boot/dts/airoha/en7581.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm64/boot/dts/airoha/en7581.dtsi b/arch/arm64/boot/dts/airoha/en7581.dtsi index 55eb1762fb11..a1daaaef0de0 100644 --- a/arch/arm64/boot/dts/airoha/en7581.dtsi +++ b/arch/arm64/boot/dts/airoha/en7581.dtsi @@ -2,6 +2,7 @@ #include #include +#include / { interrupt-parent = <&gic>; @@ -150,5 +151,13 @@ uart1: serial@1fbf0000 { interrupts = ; clock-frequency = <1843200>; }; + + scu: system-controller@1fa20000 { + compatible = "airoha,en7581-scu"; + reg = <0x0 0x1fa20000 0x0 0x400>, + <0x0 0x1fb00000 0x0 0x1000>, + <0x0 0x1fbe3400 0x0 0xfc>; + #clock-cells = <1>; + }; }; }; From patchwork Wed Apr 3 16:20:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 13616461 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D23D9CD128A for ; Wed, 3 Apr 2024 16:21:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yQcXW1IvCscZtmuF53Fh6R7j6X2YCaI8fyFFi0VwJg0=; b=DfbOlFkq0KPCSN CofSC+PKk5PEmlGkGn+6vhql8biGpLke4GxaRKsuZoLcodKzNl7L0j8NJ4SyENcXfS0bdyPShSJ3E U3h8m+XEs8KZ6RU5byo9oEtVR7YrtU0BNXc906peJYxEnQqD3FeGyQ/QzIs8MSPLO7ol6Eykw0pja ojm5jbQwAKfk2pZPnTrRxS4ebbno+kcgHtuUmOTYHwuvBUkf6+DEdPsZ3kVp6gGCpsEwQKs9eleqJ o06f0GywQj3APBm8KzxdZc5o47dr+9Av9x7bkRn1WZaSXNTvGlo2fYbuoiEHsGPd7wXtWl/5CcdD1 U3uXabua8MwbXaGsjbzw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rs3Mi-0000000GwHa-32zV; Wed, 03 Apr 2024 16:21:32 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rs3Mb-0000000GwDU-0mVr for linux-arm-kernel@lists.infradead.org; Wed, 03 Apr 2024 16:21:26 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 6FCA5614A4; Wed, 3 Apr 2024 16:21:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BAB34C433F1; Wed, 3 Apr 2024 16:21:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712161284; bh=AaHst2Jf0vHwQ7OHGptaWr3uKz5EntjSR1A8lyMilrc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HFRvBOQLzJE5JBNz/dcEnxnE21YmiebFYWVzeDpjKFDGPo+NMwkmt5spmCOTSFW75 9n9e6y08Qs9coeMI/WXLTjZjshgtiDI6kC/15xygfcRMRDgYOSj8G21h4Cxia/XABD lIU97lMtEmH0OEEVBNz9MpTxl5BpbV/TlyzwdE2hutMD2TWOspoAw56+ELUiKKbwSb Bgue2wKmNJO7QscMmnmR+RWd0q748+6CQAl+50yjR5vxaxpJoouB67AnnCJI1jlu3J ZpNa8mvVYX6B/iLWxkcClettO93azyxHrxaO9DQy44S9Ibychtw7QluThHG0oK/H3L 9lcRBfzExui3g== From: Lorenzo Bianconi To: linux-clk@vger.kernel.org Cc: mturquette@baylibre.com, sboyd@kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, nbd@nbd.name, john@phrozen.org, devicetree@vger.kernel.org, dd@embedd.com, catalin.marinas@arm.com, will@kernel.org, upstream@airoha.com, lorenzo.bianconi83@gmail.com, angelogioacchino.delregno@collabora.com Subject: [PATCH 3/4] clk: en7523: make pcie clk_ops accessible through of_device_id struct Date: Wed, 3 Apr 2024 18:20:44 +0200 Message-ID: <3eba4d9bd16c7598c42400c0ce1bf6c2f80cdbad.1712160869.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240403_092125_356208_9424CA75 X-CRM114-Status: GOOD ( 14.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Make pcie clk_ops structure accessible through of_device_id data pointer in order to define multiple clk_ops for each supported SoC. This is a preliminary patch to introduce EN7581 clock support. Signed-off-by: Lorenzo Bianconi --- drivers/clk/clk-en7523.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/clk/clk-en7523.c b/drivers/clk/clk-en7523.c index 7cde328495e2..c7def87b74c6 100644 --- a/drivers/clk/clk-en7523.c +++ b/drivers/clk/clk-en7523.c @@ -145,11 +145,6 @@ static const struct en_clk_desc en7523_base_clks[] = { } }; -static const struct of_device_id of_match_clk_en7523[] = { - { .compatible = "airoha,en7523-scu", }, - { /* sentinel */ } -}; - static unsigned int en7523_get_base_rate(void __iomem *base, unsigned int i) { const struct en_clk_desc *desc = &en7523_base_clks[i]; @@ -247,14 +242,9 @@ static void en7523_pci_unprepare(struct clk_hw *hw) static struct clk_hw *en7523_register_pcie_clk(struct device *dev, void __iomem *np_base) { - static const struct clk_ops pcie_gate_ops = { - .is_enabled = en7523_pci_is_enabled, - .prepare = en7523_pci_prepare, - .unprepare = en7523_pci_unprepare, - }; struct clk_init_data init = { .name = "pcie", - .ops = &pcie_gate_ops, + .ops = of_device_get_match_data(dev), }; struct en_clk_gate *cg; @@ -264,7 +254,7 @@ static struct clk_hw *en7523_register_pcie_clk(struct device *dev, cg->base = np_base; cg->hw.init = &init; - en7523_pci_unprepare(&cg->hw); + init.ops->unprepare(&cg->hw); if (clk_hw_register(dev, &cg->hw)) return NULL; @@ -333,6 +323,17 @@ static int en7523_clk_probe(struct platform_device *pdev) return r; } +static const struct clk_ops en7523_pcie_ops = { + .is_enabled = en7523_pci_is_enabled, + .prepare = en7523_pci_prepare, + .unprepare = en7523_pci_unprepare, +}; + +static const struct of_device_id of_match_clk_en7523[] = { + { .compatible = "airoha,en7523-scu", .data = &en7523_pcie_ops }, + { /* sentinel */ } +}; + static struct platform_driver clk_en7523_drv = { .probe = en7523_clk_probe, .driver = { From patchwork Wed Apr 3 16:20:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 13616462 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 30A1ACD1288 for ; Wed, 3 Apr 2024 16:21:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mCgJS0hnxV7/nbBJQn0ll/jQLq+qphmAYTbrEFUw1YQ=; b=rPOch5iG+6bnmF jQrPjAi3UW6ugWnfDPjtBsZEWJ6M3o/HgulQv7g5puO+8U3wdWjLJbMVD6o0r4Luh/T7+p37q+7oF yG23OqdCkJKXkpMcNqhckkfx4OyzmXdS6p8F8q3YshozkCkQynVXXXKtI5ytZX0v3Wtbbn+s7Zprk Gxj/6XYmb6/meD5PL7zxfQwUpcIwhEwTptnkkDNvXe/gq+RiaSkAJlHTADRMM4xAT8tf+XE7ga0DP FggWtMHTuyEfcrKkTXYQWHM45hxmrBB875CnIEbvM7fJ+3gecs2ZB8HLQkrnl4QbLwDghW9/zC1T1 ZiAFWQs7EOYHn4nUnRXQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rs3Mp-0000000GwLQ-0IFP; Wed, 03 Apr 2024 16:21:39 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rs3Mg-0000000GwFg-1fSU for linux-arm-kernel@lists.infradead.org; Wed, 03 Apr 2024 16:21:33 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 900C0CE1A0B; Wed, 3 Apr 2024 16:21:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 51851C433C7; Wed, 3 Apr 2024 16:21:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1712161287; bh=mS7lPB+f/6hy5j1P7T6iVW2jsky8/RPVdA6c6ORlOBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kNrJgm3w3JzTQzmP3u4dIqyF25sLIcKkCurxl2xcItrLj1YoSdnLBGswkLJDpuZtx 1PKE1G3i3TZTqnpjOppiuVwaaRl9gR32fvYzTXI2heTe4YZnY/Y9UKH+Bqp/XxQxcr IcFhy3noWbSydIK/vNjsiXb3+P0+aXLi+1sOBIpWiV9m/H4cPf6/vmQQQ9wkYQnUEw 7rLWF5Uw4Bn9N39/4Hjfk0t7VrQYWRODnl3Cw8oUwLqfs3G1S4zVVuOjblh/BKs5aZ OcVgWHiuhIbCxJj4kpNfZos+QEGfNeBwjOxcevdeIHyR2sfrGPl860LFNC4+upCtgi xkfZZQEz9nUzQ== From: Lorenzo Bianconi To: linux-clk@vger.kernel.org Cc: mturquette@baylibre.com, sboyd@kernel.org, linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org, nbd@nbd.name, john@phrozen.org, devicetree@vger.kernel.org, dd@embedd.com, catalin.marinas@arm.com, will@kernel.org, upstream@airoha.com, lorenzo.bianconi83@gmail.com, angelogioacchino.delregno@collabora.com Subject: [PATCH 4/4] clk: en7523: add EN7581 support Date: Wed, 3 Apr 2024 18:20:45 +0200 Message-ID: <3aaf638b846ecfdbfc1c903206b7d519d56c9130.1712160869.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240403_092131_061175_258785DC X-CRM114-Status: GOOD ( 17.47 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Introduce EN7581 clock support to clk-en7523 driver. Tested-by: Zhengping Zhang Signed-off-by: Lorenzo Bianconi --- drivers/clk/clk-en7523.c | 130 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 125 insertions(+), 5 deletions(-) diff --git a/drivers/clk/clk-en7523.c b/drivers/clk/clk-en7523.c index c7def87b74c6..51a6c0cc7f58 100644 --- a/drivers/clk/clk-en7523.c +++ b/drivers/clk/clk-en7523.c @@ -4,13 +4,16 @@ #include #include #include +#include #include #include #define REG_PCI_CONTROL 0x88 #define REG_PCI_CONTROL_PERSTOUT BIT(29) #define REG_PCI_CONTROL_PERSTOUT1 BIT(26) +#define REG_PCI_CONTROL_REFCLK_EN0 BIT(23) #define REG_PCI_CONTROL_REFCLK_EN1 BIT(22) +#define REG_PCI_CONTROL_PERSTOUT2 BIT(16) #define REG_GSW_CLK_DIV_SEL 0x1b4 #define REG_EMI_CLK_DIV_SEL 0x1b8 #define REG_BUS_CLK_DIV_SEL 0x1bc @@ -18,10 +21,25 @@ #define REG_SPI_CLK_FREQ_SEL 0x1c8 #define REG_NPU_CLK_DIV_SEL 0x1fc #define REG_CRYPTO_CLKSRC 0x200 -#define REG_RESET_CONTROL 0x834 +#define REG_RESET_CONTROL2 0x830 +#define REG_RESET2_CONTROL_PCIE2 BIT(27) +#define REG_RESET_CONTROL1 0x834 #define REG_RESET_CONTROL_PCIEHB BIT(29) #define REG_RESET_CONTROL_PCIE1 BIT(27) #define REG_RESET_CONTROL_PCIE2 BIT(26) +/* EN7581 */ +#define REG_PCIE0_MEM 0x00 +#define REG_PCIE0_MEM_MASK 0x04 +#define REG_PCIE1_MEM 0x08 +#define REG_PCIE1_MEM_MASK 0x0c +#define REG_PCIE2_MEM 0x10 +#define REG_PCIE2_MEM_MASK 0x14 +#define REG_PCIE_RESET_OPEN_DRAIN 0x018c +#define REG_PCIE_RESET_OPEN_DRAIN_MASK GENMASK(2, 0) +#define REG_NP_SCU_PCIC 0x88 +#define REG_NP_SCU_SSTR 0x9c +#define REG_PCIE_XSI0_SEL_MASK GENMASK(14, 13) +#define REG_PCIE_XSI1_SEL_MASK GENMASK(12, 11) struct en_clk_desc { int id; @@ -207,14 +225,14 @@ static int en7523_pci_prepare(struct clk_hw *hw) usleep_range(1000, 2000); /* Reset to default */ - val = readl(np_base + REG_RESET_CONTROL); + val = readl(np_base + REG_RESET_CONTROL1); mask = REG_RESET_CONTROL_PCIE1 | REG_RESET_CONTROL_PCIE2 | REG_RESET_CONTROL_PCIEHB; - writel(val & ~mask, np_base + REG_RESET_CONTROL); + writel(val & ~mask, np_base + REG_RESET_CONTROL1); usleep_range(1000, 2000); - writel(val | mask, np_base + REG_RESET_CONTROL); + writel(val | mask, np_base + REG_RESET_CONTROL1); msleep(100); - writel(val & ~mask, np_base + REG_RESET_CONTROL); + writel(val & ~mask, np_base + REG_RESET_CONTROL1); usleep_range(5000, 10000); /* Release device */ @@ -262,6 +280,64 @@ static struct clk_hw *en7523_register_pcie_clk(struct device *dev, return &cg->hw; } +static int en7581_pci_is_enabled(struct clk_hw *hw) +{ + struct en_clk_gate *cg = container_of(hw, struct en_clk_gate, hw); + u32 val, mask; + + mask = REG_PCI_CONTROL_REFCLK_EN0 | REG_PCI_CONTROL_REFCLK_EN1; + val = readl(cg->base + REG_PCI_CONTROL); + return (val & mask) == mask; +} + +static int en7581_pci_prepare(struct clk_hw *hw) +{ + struct en_clk_gate *cg = container_of(hw, struct en_clk_gate, hw); + void __iomem *np_base = cg->base; + u32 val, mask; + + mask = REG_RESET_CONTROL_PCIE1 | REG_RESET_CONTROL_PCIE2 | + REG_RESET_CONTROL_PCIEHB; + val = readl(np_base + REG_RESET_CONTROL1); + writel(val & ~mask, np_base + REG_RESET_CONTROL1); + val = readl(np_base + REG_RESET_CONTROL2); + writel(val & ~REG_RESET2_CONTROL_PCIE2, np_base + REG_RESET_CONTROL2); + usleep_range(5000, 10000); + + mask = REG_PCI_CONTROL_REFCLK_EN0 | REG_PCI_CONTROL_REFCLK_EN1 | + REG_PCI_CONTROL_PERSTOUT1 | REG_PCI_CONTROL_PERSTOUT2 | + REG_PCI_CONTROL_PERSTOUT; + val = readl(np_base + REG_PCI_CONTROL); + writel(val | mask, np_base + REG_PCI_CONTROL); + msleep(250); + + return 0; +} + +static void en7581_pci_unprepare(struct clk_hw *hw) +{ + struct en_clk_gate *cg = container_of(hw, struct en_clk_gate, hw); + void __iomem *np_base = cg->base; + u32 val, mask; + + mask = REG_PCI_CONTROL_REFCLK_EN0 | REG_PCI_CONTROL_REFCLK_EN1 | + REG_PCI_CONTROL_PERSTOUT1 | REG_PCI_CONTROL_PERSTOUT2 | + REG_PCI_CONTROL_PERSTOUT; + val = readl(np_base + REG_PCI_CONTROL); + writel(val & ~mask, np_base + REG_PCI_CONTROL); + usleep_range(1000, 2000); + + mask = REG_RESET_CONTROL_PCIE1 | REG_RESET_CONTROL_PCIE2 | + REG_RESET_CONTROL_PCIEHB; + val = readl(np_base + REG_RESET_CONTROL1); + writel(val | mask, np_base + REG_RESET_CONTROL1); + mask = REG_RESET_CONTROL_PCIE1 | REG_RESET_CONTROL_PCIE2; + writel(val | mask, np_base + REG_RESET_CONTROL1); + val = readl(np_base + REG_RESET_CONTROL2); + writel(val | REG_RESET_CONTROL_PCIE2, np_base + REG_RESET_CONTROL2); + msleep(100); +} + static void en7523_register_clocks(struct device *dev, struct clk_hw_onecell_data *clk_data, void __iomem *base, void __iomem *np_base) { @@ -291,6 +367,37 @@ static void en7523_register_clocks(struct device *dev, struct clk_hw_onecell_dat clk_data->num = EN7523_NUM_CLOCKS; } +static int en7581_clk_hw_init(struct platform_device *pdev, + void __iomem *base, + void __iomem *np_base) +{ + void __iomem *pb_base; + u32 val; + + pb_base = devm_platform_ioremap_resource(pdev, 2); + if (IS_ERR(pb_base)) + return PTR_ERR(pb_base); + + val = readl(np_base + REG_NP_SCU_SSTR); + val &= ~(REG_PCIE_XSI0_SEL_MASK | REG_PCIE_XSI1_SEL_MASK); + writel(val, np_base + REG_NP_SCU_SSTR); + val = readl(np_base + REG_NP_SCU_PCIC); + writel(val | 3, np_base + REG_NP_SCU_PCIC); + + writel(0x20000000, pb_base + REG_PCIE0_MEM); + writel(0xfc000000, pb_base + REG_PCIE0_MEM_MASK); + writel(0x24000000, pb_base + REG_PCIE1_MEM); + writel(0xfc000000, pb_base + REG_PCIE1_MEM_MASK); + writel(0x28000000, pb_base + REG_PCIE2_MEM); + writel(0xfc000000, pb_base + REG_PCIE2_MEM_MASK); + + val = readl(base + REG_PCIE_RESET_OPEN_DRAIN); + writel(val | REG_PCIE_RESET_OPEN_DRAIN_MASK, + base + REG_PCIE_RESET_OPEN_DRAIN); + + return 0; +} + static int en7523_clk_probe(struct platform_device *pdev) { struct device_node *node = pdev->dev.of_node; @@ -306,6 +413,12 @@ static int en7523_clk_probe(struct platform_device *pdev) if (IS_ERR(np_base)) return PTR_ERR(np_base); + if (of_device_is_compatible(node, "airoha,en7581-scu")) { + r = en7581_clk_hw_init(pdev, base, np_base); + if (r) + return r; + } + clk_data = devm_kzalloc(&pdev->dev, struct_size(clk_data, hws, EN7523_NUM_CLOCKS), GFP_KERNEL); @@ -329,8 +442,15 @@ static const struct clk_ops en7523_pcie_ops = { .unprepare = en7523_pci_unprepare, }; +static const struct clk_ops en7581_pcie_ops = { + .is_enabled = en7581_pci_is_enabled, + .prepare = en7581_pci_prepare, + .unprepare = en7581_pci_unprepare, +}; + static const struct of_device_id of_match_clk_en7523[] = { { .compatible = "airoha,en7523-scu", .data = &en7523_pcie_ops }, + { .compatible = "airoha,en7581-scu", .data = &en7581_pcie_ops }, { /* sentinel */ } };