From patchwork Tue May 7 04:55:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 13656245 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 E208D6BB2F for ; Tue, 7 May 2024 04:57:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057853; cv=none; b=De8eyeUTyslKiCSsH/HJ7RyQ/LQRwkXeOgoJB5ug7Rmu1c3Bex2sHDtOuwY6jigHt217W3kPovmnS48Q8agUgL94OFkSLY4rj98yoLoyCfb10Yx8f5HmjR0G23hFZ7rUPCyryxRO3nT6kBiMJdpldJ6fLJr2iaaEvWtmpzaAttw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057853; c=relaxed/simple; bh=Yba66V7fg6k67xvwARdOY8T2HOGTwD7Vg2Zq+zVyGpk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=X4UmMXQ5XesJmdaNFVc0BYko2VLKPsWeCHMdqv3xd+49iqbbpWWbSxLGNk7RSMXaEH/lXkjhvY1uZ15hONPDiwuhG+jsYG0HRb3yVgS9DUluaaSSL1XXHnVMU9ZRa5OI8nlPSLDuSXMDN4c1NurjCWvqX6qxI2YXxXQSeGq3V3A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com; spf=pass smtp.mailfrom=tenstorrent.com; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b=fVijD/Xg; arc=none smtp.client-ip=209.85.210.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b="fVijD/Xg" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-6f460e05101so1626344b3a.1 for ; Mon, 06 May 2024 21:57:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tenstorrent.com; s=google; t=1715057851; x=1715662651; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=DvImobpR9QD2Br3BfnFIc4ZTdsXi4UyVtbpSlCU10uI=; b=fVijD/XgKQhdnXvcb25bJuB6s4WNJTIXIjxPaVgVwk6CjsNXVBJyZJrmcC+y++n2te SrUAzYQM8SSvV9sTK9yj2Yyg892FGVBjv2mQIkuka3ZB8rnqZVtUBQc4VhxW5iNQS93W 9H3//mwoEm4UybphlGM4+DTjQz0631Bz5Y5XB3Cr6TusnvayC/xKm1D6HpbNsGew5gVO Hd+sbDBWqA+5RgBMgt+U1WHZk1gGbkVzpnYk/EBI12TMfl19LYCuRkScklL/5FSP+oOr Gj0SW0h6U1ioMKvCX2QkRdEtj3kz9zCcEmdHbUha6bX3RI+H6U95YoWSaBojFF9rsxJM KZ9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715057851; x=1715662651; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DvImobpR9QD2Br3BfnFIc4ZTdsXi4UyVtbpSlCU10uI=; b=KfgeSPIuZynt2UBsPeyy+WfUCGe67EZQ2Utr+GwPCM+XXNpud0U/+fedV9wxuZzVF2 pL1MEsonGPAkspMeOT0AXUA7z/ArDaG9VXMkdJfG0Gea8MNU58EM2auEmpbUGYAyPlhQ snlep5UFOOE6I5CwXpsZW0db/J+0yJoawv3JYQxo8Vlv8BZm/8MNilwQ+p94j52uhP2w I/CehCaXgVHWKppUr/xiTDScJEWaku8OosG3mmhwq+0ykjEBZLvK9gwJtfPVF6YhNvMw g1VOBrKfShlo4CSxR4uWK2r2hjt3InGY2+BnNsOt/oaUkFZ8CNkZrFIYLOAblFz1KUk3 PzMA== X-Forwarded-Encrypted: i=1; AJvYcCXD8ZbtVw9zlKjc5osptfQWfMoBNNjdT8kStkTEff2kNzcxKQCVGg3epuNPwGAzbXNgHUgGy1cyU3sxUDCGlwMFG5VTMpZilm64 X-Gm-Message-State: AOJu0YznQBm2o15i4NpX1PfQlSM+xzx3SJQUe1U1xXuV6W6O1a4vMdzi s2MNXmyC+bV8OIZjNaCq4vplk9y9p/dBjhjRLhjZMZM08CRSxhI9gS1wwlkE7lM= X-Google-Smtp-Source: AGHT+IEsztZhA15eZ+a3JYYUcAVtuUaDjpScLG/VWRPRMBDOCAO3wkLLYVuT6QgjYV9F5R9xkVQbng== X-Received: by 2002:aa7:8742:0:b0:6ed:41f4:1886 with SMTP id g2-20020aa78742000000b006ed41f41886mr2203053pfo.8.1715057851282; Mon, 06 May 2024 21:57:31 -0700 (PDT) Received: from [127.0.1.1] ([2601:1c2:1802:170:6870:7119:e255:c3a0]) by smtp.gmail.com with ESMTPSA id o14-20020a637e4e000000b005f80aced5f3sm8987249pgn.0.2024.05.06.21.57.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 21:57:31 -0700 (PDT) From: Drew Fustini Date: Mon, 06 May 2024 21:55:14 -0700 Subject: [PATCH RFC v3 1/7] riscv: dts: thead: Fix node ordering in TH1520 device tree Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240506-th1520-clk-v3-1-085a18a23a7f@tenstorrent.com> References: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> In-Reply-To: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> To: Jisheng Zhang , Guo Ren , Fu Wei , Yangtao Li , Thomas Bonnefille , Emil Renner Berthing , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-riscv@lists.infradead.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Drew Fustini , Conor Dooley X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1715057849; l=2484; i=dfustini@tenstorrent.com; s=20230430; h=from:subject:message-id; bh=0Ot4hVSus7f5v4Ml6Hb9TXPwAtMpDZsRAGOrrpUZWI8=; b=HLvXY5FVkY8PqB/hsbRI2GENm5Nc6Jmo+rVl3j00x+TMr9OtGpxR5SNDbrBI7Vz1CFWK3Zua9 D/x6qhAhIwhBnZTDAHOfJBMN261PJt7KOch5ZDKmpAs5nZxVwLc2E9W X-Developer-Key: i=dfustini@tenstorrent.com; a=ed25519; pk=p3GKE9XFmjhwAayAHG4U108yag7V8xQVd4zJLdW0g7g= From: Thomas Bonnefille According to the device tree coding style, nodes shall be ordered by unit address in ascending order. Signed-off-by: Thomas Bonnefille Signed-off-by: Conor Dooley --- arch/riscv/boot/dts/thead/th1520.dtsi | 54 +++++++++++++++++------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/arch/riscv/boot/dts/thead/th1520.dtsi b/arch/riscv/boot/dts/thead/th1520.dtsi index 8b915e206f3a..d2fa25839012 100644 --- a/arch/riscv/boot/dts/thead/th1520.dtsi +++ b/arch/riscv/boot/dts/thead/th1520.dtsi @@ -193,6 +193,33 @@ uart0: serial@ffe7014000 { status = "disabled"; }; + emmc: mmc@ffe7080000 { + compatible = "thead,th1520-dwcmshc"; + reg = <0xff 0xe7080000 0x0 0x10000>; + interrupts = <62 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&sdhci_clk>; + clock-names = "core"; + status = "disabled"; + }; + + sdio0: mmc@ffe7090000 { + compatible = "thead,th1520-dwcmshc"; + reg = <0xff 0xe7090000 0x0 0x10000>; + interrupts = <64 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&sdhci_clk>; + clock-names = "core"; + status = "disabled"; + }; + + sdio1: mmc@ffe70a0000 { + compatible = "thead,th1520-dwcmshc"; + reg = <0xff 0xe70a0000 0x0 0x10000>; + interrupts = <71 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&sdhci_clk>; + clock-names = "core"; + status = "disabled"; + }; + uart1: serial@ffe7f00000 { compatible = "snps,dw-apb-uart"; reg = <0xff 0xe7f00000 0x0 0x100>; @@ -311,33 +338,6 @@ dmac0: dma-controller@ffefc00000 { status = "disabled"; }; - emmc: mmc@ffe7080000 { - compatible = "thead,th1520-dwcmshc"; - reg = <0xff 0xe7080000 0x0 0x10000>; - interrupts = <62 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&sdhci_clk>; - clock-names = "core"; - status = "disabled"; - }; - - sdio0: mmc@ffe7090000 { - compatible = "thead,th1520-dwcmshc"; - reg = <0xff 0xe7090000 0x0 0x10000>; - interrupts = <64 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&sdhci_clk>; - clock-names = "core"; - status = "disabled"; - }; - - sdio1: mmc@ffe70a0000 { - compatible = "thead,th1520-dwcmshc"; - reg = <0xff 0xe70a0000 0x0 0x10000>; - interrupts = <71 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&sdhci_clk>; - clock-names = "core"; - status = "disabled"; - }; - timer0: timer@ffefc32000 { compatible = "snps,dw-apb-timer"; reg = <0xff 0xefc32000 0x0 0x14>; From patchwork Tue May 7 04:55:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 13656247 Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) (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 35C9B6BB50 for ; Tue, 7 May 2024 04:57:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057855; cv=none; b=S2yr1W+k5jU59YWwzk4WbJ8PfVn4UdL0JVzrnkoo/Jy/QAYJInmXBDhyee+bPLs4LMo1D4vuLgFRJItZhbCjteaElTjosIATNagydrstbwfxdTB8bkavZjtWt2nq1aARv4Kdrs2I9P593o3ZUU8gGD8ne50Ro6PiRiFsDLkutfo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057855; c=relaxed/simple; bh=kl9L43yr08kOkqrR3WA1I5DaIGyMSq6kKegAe4KxtIQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=AX1vitHjkbduQCbPcQ1SK2rfOEtLdfyEZmjw1fQnRzl8CQtQTD35fRppbI+v+Ld8FICcXHOQjQvwLUlCH+rZiQ8E9rgABbY3bMDdK44N5WQOeip19IX8l+GLY8GTV5Gw2GqJ4kVtC9mHlthSbv+dw8HA/mX6+y9eM7YcltvJ4cQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com; spf=pass smtp.mailfrom=tenstorrent.com; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b=flA8Kn5+; arc=none smtp.client-ip=209.85.167.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b="flA8Kn5+" Received: by mail-oi1-f181.google.com with SMTP id 5614622812f47-3c9708dca94so534476b6e.3 for ; Mon, 06 May 2024 21:57:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tenstorrent.com; s=google; t=1715057852; x=1715662652; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=P+wugaHanEGkc+bwlkiugtOaCjbfBNOZDr8erEgY2Ao=; b=flA8Kn5+6H/bZjLxYPRXSINIgVU1jTREr0KFl6Bspa08RhDp8oGvpUbrdgOcLxubr6 eJvyD4Q9BYhDj4atfdLdFFAUljTPAhD2i44t3Yjq2mQdqthGGX+7fjJ54mXVFnf32raE efj5tu0mWtCdbhOiKQI/YhAf68/ratOamcM6EW76rv1C3cXerjSNFmzvcktGjjuA5Jit Q2hBi2+NcDZgVGoDdS9XxBGOUertuf5nDF3rtc4MKpbqtYM/KlEiWQA4Ivh9S187qGvV O+CvH1UB9S118rGfvjdlduafm5ESBiLZNA9yxNlYEOehu6x73oESI1SeMjlroAG0hg7e UkxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715057852; x=1715662652; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=P+wugaHanEGkc+bwlkiugtOaCjbfBNOZDr8erEgY2Ao=; b=B7QeHdTU20KTjCemwg8PtfEqfCSp8e9lnDMSDTdtjDculUxExEIrbZUKzZeSvqRacn 38tJ1W4p3agQZLojXjTxsJovrL/3t89ufhukEAO8HhojQZWzYv7IXorEVZ1Bka4lKBl5 9vDirvd9mtAP89Og+e+kKOoIQHyQ4z+xU5VGdU5r+OjhMDxuKOH/zU1OkpXVLZOUGG8t sgIbv8Y7y6JPvbvszZzxgNr72A4DILVKJiiXPluKyNwL3f4RPLZY9E7u+jMUA7WKHK/Y Z9LdmXKiIa1mA8kJN8fSDCPBa33AIBaosfVB2FLdo98K8tDXXuuags9J9NEtWwqskxC9 fSNQ== X-Forwarded-Encrypted: i=1; AJvYcCWjXH0wg1C/BF9fOX9IIvM00VP+CvouBiQxehcxUccEEtYklLJnHXvvIL1RokZYsMCJFF+w4L4qZ/V/MNEf4VEs19HO4Kb3VP5S X-Gm-Message-State: AOJu0YxJ0fLj1HY4dwRCC0I5wAzlziINAGxsW3zgzICSecyKODeA5JE/ C3NQEGDbaQut6JvxqGx+GZ44oswAOTQSxiH7H27Z+SzUYKryLlu/ylTf6xzyMzs= X-Google-Smtp-Source: AGHT+IHIlrKs2ekmKEyBbToJ0bPSfqdwse1g5jUcWgGzB4UqnMnPPlPjkxqrKLk7yC/SGkCWlV+X/g== X-Received: by 2002:a05:6808:10ca:b0:3c9:6e70:cf84 with SMTP id s10-20020a05680810ca00b003c96e70cf84mr5510789ois.28.1715057852188; Mon, 06 May 2024 21:57:32 -0700 (PDT) Received: from [127.0.1.1] ([2601:1c2:1802:170:6870:7119:e255:c3a0]) by smtp.gmail.com with ESMTPSA id o14-20020a637e4e000000b005f80aced5f3sm8987249pgn.0.2024.05.06.21.57.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 21:57:31 -0700 (PDT) From: Drew Fustini Date: Mon, 06 May 2024 21:55:15 -0700 Subject: [PATCH RFC v3 2/7] dt-bindings: clock: Document T-Head TH1520 AP_SUBSYS controller Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240506-th1520-clk-v3-2-085a18a23a7f@tenstorrent.com> References: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> In-Reply-To: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> To: Jisheng Zhang , Guo Ren , Fu Wei , Yangtao Li , Thomas Bonnefille , Emil Renner Berthing , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-riscv@lists.infradead.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Drew Fustini X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1715057849; l=5687; i=dfustini@tenstorrent.com; s=20230430; h=from:subject:message-id; bh=kl9L43yr08kOkqrR3WA1I5DaIGyMSq6kKegAe4KxtIQ=; b=ZwyHSQdIrl8IJFyLF+oLhRR1A3uZLQPDiw7rlBbOvni+A5lnCwun8M8Oxl9gt+oHHWMIEFY3Z nS+FT7hnN3wBYV944608yeE9BZ8IBDcTaZ2KEUiOhlRDdmJptXbecxu X-Developer-Key: i=dfustini@tenstorrent.com; a=ed25519; pk=p3GKE9XFmjhwAayAHG4U108yag7V8xQVd4zJLdW0g7g= Document bindings for the T-Head TH1520 AP sub-system clock controller. Link: https://openbeagle.org/beaglev-ahead/beaglev-ahead/-/blob/main/docs/TH1520%20System%20User%20Manual.pdf Co-developed-by: Yangtao Li Signed-off-by: Yangtao Li Signed-off-by: Drew Fustini Reviewed-by: Rob Herring (Arm) --- .../bindings/clock/thead,th1520-clk-ap.yaml | 64 +++++++++++++++ MAINTAINERS | 2 + include/dt-bindings/clock/thead,th1520-clk-ap.h | 96 ++++++++++++++++++++++ 3 files changed, 162 insertions(+) diff --git a/Documentation/devicetree/bindings/clock/thead,th1520-clk-ap.yaml b/Documentation/devicetree/bindings/clock/thead,th1520-clk-ap.yaml new file mode 100644 index 000000000000..d7e665c1534a --- /dev/null +++ b/Documentation/devicetree/bindings/clock/thead,th1520-clk-ap.yaml @@ -0,0 +1,64 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/clock/thead,th1520-clk-ap.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: T-HEAD TH1520 AP sub-system clock controller + +description: | + The T-HEAD TH1520 AP sub-system clock controller configures the + CPU, DPU, GMAC and TEE PLLs. + + SoC reference manual + https://openbeagle.org/beaglev-ahead/beaglev-ahead/-/blob/main/docs/TH1520%20System%20User%20Manual.pdf + +maintainers: + - Jisheng Zhang + - Wei Fu + - Drew Fustini + +properties: + compatible: + const: thead,th1520-clk-ap + + reg: + maxItems: 1 + + clocks: + items: + - description: main oscillator (24MHz) + + clock-names: + items: + - const: osc + + "#clock-cells": + const: 1 + description: + See for valid indices. + +required: + - compatible + - reg + - clocks + - clock-names + - "#clock-cells" + +additionalProperties: false + +examples: + - | + #include + soc { + #address-cells = <2>; + #size-cells = <2>; + + clock-controller@ffef010000 { + compatible = "thead,th1520-clk-ap"; + reg = <0xff 0xef010000 0x0 0x1000>; + clocks = <&osc>; + clock-names = "osc"; + #clock-cells = <1>; + }; + }; diff --git a/MAINTAINERS b/MAINTAINERS index ec0284125e8f..2b4fa9a81a01 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19014,7 +19014,9 @@ M: Guo Ren M: Fu Wei L: linux-riscv@lists.infradead.org S: Maintained +F: Documentation/devicetree/bindings/clock/thead,th1520-clk-ap.yaml F: arch/riscv/boot/dts/thead/ +F: include/dt-bindings/clock/thead,th1520-clk-ap.h RNBD BLOCK DRIVERS M: Md. Haris Iqbal diff --git a/include/dt-bindings/clock/thead,th1520-clk-ap.h b/include/dt-bindings/clock/thead,th1520-clk-ap.h new file mode 100644 index 000000000000..d0d1ab1e672a --- /dev/null +++ b/include/dt-bindings/clock/thead,th1520-clk-ap.h @@ -0,0 +1,96 @@ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +/* + * Copyright (C) 2023 Vivo Communication Technology Co. Ltd. + * Authors: Yangtao Li + */ + +#ifndef _DT_BINDINGS_CLK_TH1520_H_ +#define _DT_BINDINGS_CLK_TH1520_H_ + +#define CLK_CPU_PLL0 0 +#define CLK_CPU_PLL1 1 +#define CLK_GMAC_PLL 2 +#define CLK_VIDEO_PLL 3 +#define CLK_DPU0_PLL 4 +#define CLK_DPU1_PLL 5 +#define CLK_TEE_PLL 6 +#define CLK_C910_I0 7 +#define CLK_C910 8 +#define CLK_BROM 9 +#define CLK_BMU 10 +#define CLK_AHB2_CPUSYS_HCLK 11 +#define CLK_APB3_CPUSYS_PCLK 12 +#define CLK_AXI4_CPUSYS2_ACLK 13 +#define CLK_AON2CPU_A2X 14 +#define CLK_X2X_CPUSYS 15 +#define CLK_AXI_ACLK 16 +#define CLK_CPU2AON_X2H 17 +#define CLK_PERI_AHB_HCLK 18 +#define CLK_CPU2PERI_X2H 19 +#define CLK_PERI_APB_PCLK 20 +#define CLK_PERI2APB_PCLK 21 +#define CLK_PERI_APB1_HCLK 22 +#define CLK_PERI_APB2_HCLK 23 +#define CLK_PERI_APB3_HCLK 24 +#define CLK_PERI_APB4_HCLK 25 +#define CLK_OSC12M 26 +#define CLK_OUT1 27 +#define CLK_OUT2 28 +#define CLK_OUT3 29 +#define CLK_OUT4 30 +#define CLK_APB_PCLK 31 +#define CLK_NPU 32 +#define CLK_NPU_AXI 33 +#define CLK_VI 34 +#define CLK_VI_AHB 35 +#define CLK_VO_AXI 36 +#define CLK_VP_APB 37 +#define CLK_VP_AXI 38 +#define CLK_CPU2VP 39 +#define CLK_VENC 40 +#define CLK_DPU0 41 +#define CLK_DPU1 42 +#define CLK_EMMC_SDIO 43 +#define CLK_GMAC1 44 +#define CLK_PADCTRL1 45 +#define CLK_DSMART 46 +#define CLK_PADCTRL0 47 +#define CLK_GMAC_AXI 48 +#define CLK_GPIO3 49 +#define CLK_GMAC0 50 +#define CLK_PWM 51 +#define CLK_QSPI0 52 +#define CLK_QSPI1 53 +#define CLK_SPI 54 +#define CLK_UART0_PCLK 55 +#define CLK_UART1_PCLK 56 +#define CLK_UART2_PCLK 57 +#define CLK_UART3_PCLK 58 +#define CLK_UART4_PCLK 59 +#define CLK_UART5_PCLK 60 +#define CLK_GPIO0 61 +#define CLK_GPIO1 62 +#define CLK_GPIO2 63 +#define CLK_I2C0 64 +#define CLK_I2C1 65 +#define CLK_I2C2 66 +#define CLK_I2C3 67 +#define CLK_I2C4 68 +#define CLK_I2C5 69 +#define CLK_SPINLOCK 70 +#define CLK_DMA 71 +#define CLK_MBOX0 72 +#define CLK_MBOX1 73 +#define CLK_MBOX2 74 +#define CLK_MBOX3 75 +#define CLK_WDT0 76 +#define CLK_WDT1 77 +#define CLK_TIMER0 78 +#define CLK_TIMER1 79 +#define CLK_SRAM0 80 +#define CLK_SRAM1 81 +#define CLK_SRAM2 82 +#define CLK_SRAM3 83 +#define CLK_PLL_GMAC_100M 84 +#define CLK_UART_SCLK 85 +#endif From patchwork Tue May 7 04:55:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 13656249 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 1F8686BFA7 for ; Tue, 7 May 2024 04:57:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057857; cv=none; b=qwjn7eyCneFWmgU5gVje0m+KAz7OZLS8lvy24LkelbiocRkk0lH0up7R6df04cqmYXN5PpFFvlRLxK+5GQiaOKywDvjc9D2obCmpR6icCiPCtyU+8UpwpgpVf4gtJMCflg08378Fi4o5plCqeR7rGfhgriCuQl7vL/yno5f1AGo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057857; c=relaxed/simple; bh=oF6AgN7BW3AB3YyktiB6Cgiq6DiEL5jdZKTUcQsUcw0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=u0bNIIHhGZOWx3ENyB/8pmXs1mmbiQNO94d6zgIgDygg0y40gtk0Z+FZnns+aKG8r/hQGLh8oazk7vg6z5A3nWVg5UkCfwqUXtnJOeG0QlcwPzWyYB9sYyfYI/1vOG1k3JT3kMhcU+tnpZAejSEquyT1wvrGkXv1KXL/JC/hDG8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com; spf=pass smtp.mailfrom=tenstorrent.com; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b=XKVSciig; arc=none smtp.client-ip=209.85.210.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b="XKVSciig" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-6ed3cafd766so1986947b3a.0 for ; Mon, 06 May 2024 21:57:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tenstorrent.com; s=google; t=1715057853; x=1715662653; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=WsC4fPBQOsEh4PqK4gFhjtjc9qg2CHjXErn+6xjc2cI=; b=XKVSciig5HtbLFzQ3hGWgwHv95ShJHEYBAKnNIpOC2ekWfRA2lZrRt0if5CmAXnMMe XcqlyqTerDJXsLuM51QI6HalR9YRhRnhe50n/vxbAMUxjjqCwikslzocXnXvvF1eCfvy IbNcHEMsZpZX9/dQLLXqP75ODWSRuUgwzOpVmD/+PbiRhpufDXurEcnWU8zRMA3oRcpp 02IPI0URdg99E41NsmV0pJ+Pr++VNS7zb6MA303FeOXW2lEcGiPM6ssosqJWV09//+cC u6aGkg9M81Xdw41KM+tAuBeDtGkpf0D9EA6WSbII3OKD7vokdhOzRfhjOHd4MdU3oXQs zdWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715057853; x=1715662653; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WsC4fPBQOsEh4PqK4gFhjtjc9qg2CHjXErn+6xjc2cI=; b=CIvB9UWnvTQIlFZOcuBn74zN+O9MDaaD5f0f0rd3qy/qffra1TncDcTeGRfIdETWZf NMEXCR93he8JEmlLnRB0GBiYCBNQOMqfnjuBHwCFJvlptxLfQOS6KtDGmSq/+W70Z8rb 2OMpOEnc8g+avGaF/Uu8GcU9GuQVGKDkuHpJTPxyUM+49Mvuh/h6LqIVSvsv4Ci8tVVP 9tiNyoWhutcoORE0QA4rSTQy/suZ/IPjbBhX/Z0i3GkGnNDDuYZpyul73ZBKp4hkr3YN mrJpTkS7Iwh04G/kNRQOWySpTHcehfNR4RmlR2taIR64bWlieORMroI0E5iD1/kp38oL zqAQ== X-Forwarded-Encrypted: i=1; AJvYcCVgmYWqSnkolFGCRXePfPGlY8oJpuC38iIMsYbyjDhdtd162KEh1w3oRMalBEev5rHfxx5VXiOA+eM2z9ucJpUSjeZvzLVT2F6u X-Gm-Message-State: AOJu0Yyua0G82kikVEE8DR7ie+yhn3LHJfq1H+pHArr5mnzyJ658y67q qiE5EO27hBjc5HEBF9beP5uHdIrW7XFEGq3yAgbvmThpacft7jn56/lS9VJ+aqQ= X-Google-Smtp-Source: AGHT+IE8cX4QifMUKFnglZARa3ObZqV5uQGciWrKW+5hGrCf10dyeY6J7DwPCIonOv7jhtf0xcbrLw== X-Received: by 2002:a05:6a00:1907:b0:6f4:436d:fd1c with SMTP id y7-20020a056a00190700b006f4436dfd1cmr14055245pfi.16.1715057853323; Mon, 06 May 2024 21:57:33 -0700 (PDT) Received: from [127.0.1.1] ([2601:1c2:1802:170:6870:7119:e255:c3a0]) by smtp.gmail.com with ESMTPSA id o14-20020a637e4e000000b005f80aced5f3sm8987249pgn.0.2024.05.06.21.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 21:57:33 -0700 (PDT) From: Drew Fustini Date: Mon, 06 May 2024 21:55:16 -0700 Subject: [PATCH RFC v3 3/7] clk: thead: Add support for T-Head TH1520 AP_SUBSYS clocks Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240506-th1520-clk-v3-3-085a18a23a7f@tenstorrent.com> References: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> In-Reply-To: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> To: Jisheng Zhang , Guo Ren , Fu Wei , Yangtao Li , Thomas Bonnefille , Emil Renner Berthing , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-riscv@lists.infradead.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Drew Fustini X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1715057849; l=34261; i=dfustini@tenstorrent.com; s=20230430; h=from:subject:message-id; bh=oF6AgN7BW3AB3YyktiB6Cgiq6DiEL5jdZKTUcQsUcw0=; b=RRtWirsjmM4LLYeOc8W6jg8g2btDt883fCxFDWcnyDU4nKJ6elrR+cOne/wf41nTTB9a7GaMA BvXFVq8JskTDQN8YowFAKj5IZAzc046VFHabjnqaxpAQqOBkvHVCc21 X-Developer-Key: i=dfustini@tenstorrent.com; a=ed25519; pk=p3GKE9XFmjhwAayAHG4U108yag7V8xQVd4zJLdW0g7g= Add support for the AP sub-system clock controller in the T-Head TH1520. This include CPU, DPU, GMAC and TEE PLLs. Link: https://openbeagle.org/beaglev-ahead/beaglev-ahead/-/blob/main/docs/TH1520%20System%20User%20Manual.pdf Co-developed-by: Yangtao Li Signed-off-by: Yangtao Li Co-developed-by: Jisheng Zhang Signed-off-by: Jisheng Zhang Signed-off-by: Drew Fustini --- MAINTAINERS | 1 + drivers/clk/Kconfig | 1 + drivers/clk/Makefile | 1 + drivers/clk/thead/Kconfig | 12 + drivers/clk/thead/Makefile | 2 + drivers/clk/thead/clk-th1520-ap.c | 1074 +++++++++++++++++++++++++++++++++++++ 6 files changed, 1091 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 2b4fa9a81a01..d17e64eee42a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -19016,6 +19016,7 @@ L: linux-riscv@lists.infradead.org S: Maintained F: Documentation/devicetree/bindings/clock/thead,th1520-clk-ap.yaml F: arch/riscv/boot/dts/thead/ +F: drivers/clk/thead/clk-th1520-ap.c F: include/dt-bindings/clock/thead,th1520-clk-ap.h RNBD BLOCK DRIVERS diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 50af5fc7f570..c9057e41df34 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -494,6 +494,7 @@ source "drivers/clk/starfive/Kconfig" source "drivers/clk/sunxi/Kconfig" source "drivers/clk/sunxi-ng/Kconfig" source "drivers/clk/tegra/Kconfig" +source "drivers/clk/thead/Kconfig" source "drivers/clk/stm32/Kconfig" source "drivers/clk/ti/Kconfig" source "drivers/clk/uniphier/Kconfig" diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 14fa8d4ecc1f..2eafc268f498 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -126,6 +126,7 @@ obj-y += starfive/ obj-$(CONFIG_ARCH_SUNXI) += sunxi/ obj-y += sunxi-ng/ obj-$(CONFIG_ARCH_TEGRA) += tegra/ +obj-$(CONFIG_ARCH_THEAD) += thead/ obj-y += ti/ obj-$(CONFIG_CLK_UNIPHIER) += uniphier/ obj-$(CONFIG_ARCH_U8500) += ux500/ diff --git a/drivers/clk/thead/Kconfig b/drivers/clk/thead/Kconfig new file mode 100644 index 000000000000..1710d50bf9d4 --- /dev/null +++ b/drivers/clk/thead/Kconfig @@ -0,0 +1,12 @@ +#SPDX-License-Identifier: GPL-2.0 + +config CLK_THEAD_TH1520_AP + bool "T-HEAD TH1520 AP clock support" + depends on ARCH_THEAD || COMPILE_TEST + default ARCH_THEAD + select REGMAP_MMIO + help + Say yes here to support the AP sub system clock controller + on the T-HEAD TH1520 SoC. This includes configuration of + both CPU PLLs, both DPU PLLs as well as the GMAC, VIDEO, + and TEE PLLs. diff --git a/drivers/clk/thead/Makefile b/drivers/clk/thead/Makefile new file mode 100644 index 000000000000..7ee0bec1f251 --- /dev/null +++ b/drivers/clk/thead/Makefile @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0 +obj-$(CONFIG_CLK_THEAD_TH1520_AP) += clk-th1520-ap.o diff --git a/drivers/clk/thead/clk-th1520-ap.c b/drivers/clk/thead/clk-th1520-ap.c new file mode 100644 index 000000000000..2a4949013354 --- /dev/null +++ b/drivers/clk/thead/clk-th1520-ap.c @@ -0,0 +1,1074 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2023 Jisheng Zhang + * Copyright (C) 2023 Vivo Communication Technology Co. Ltd. + * Authors: Yangtao Li + */ + +#include +#include +#include +#include +#include +#include + +struct ccu_internal { + u8 shift; + u8 width; +}; + +struct ccu_div_internal { + u8 shift; + u8 width; + u32 flags; +}; + +struct ccu_common { + struct regmap *map; + u16 reg; + struct clk_hw hw; +}; + +struct ccu_mux { + struct ccu_internal mux; + struct ccu_common common; +}; + +struct ccu_gate { + u32 enable; + struct ccu_common common; +}; + +struct ccu_div { + u32 enable; + struct ccu_div_internal div; + struct ccu_internal mux; + struct ccu_common common; +}; + +/* + * struct ccu_mdiv - Definition of an M-D-I-V clock + * + * Clocks based on the formula (parent * M) / (D * I * V) + */ +struct ccu_mdiv { + struct ccu_internal m; + struct ccu_internal d; + struct ccu_internal i; + struct ccu_internal v; + struct ccu_common common; +}; + +#define TH_CCU_ARG(_shift, _width) \ + { \ + .shift = _shift, \ + .width = _width, \ + } + +#define TH_CCU_DIV_FLAGS(_shift, _width, _flags) \ + { \ + .shift = _shift, \ + .width = _width, \ + .flags = _flags, \ + } + +#define CCU_GATE(_struct, _name, _parent, _reg, _gate, _flags) \ + struct ccu_gate _struct = { \ + .enable = _gate, \ + .common = { \ + .reg = _reg, \ + .hw.init = CLK_HW_INIT_PARENTS_DATA(_name,\ + _parent, \ + &ccu_gate_ops, \ + _flags), \ + } \ + } + +static inline struct ccu_common *hw_to_ccu_common(struct clk_hw *hw) +{ + return container_of(hw, struct ccu_common, hw); +} + +static inline struct ccu_mux *hw_to_ccu_mux(struct clk_hw *hw) +{ + struct ccu_common *common = hw_to_ccu_common(hw); + + return container_of(common, struct ccu_mux, common); +} + +static inline struct ccu_mdiv *hw_to_ccu_mdiv(struct clk_hw *hw) +{ + struct ccu_common *common = hw_to_ccu_common(hw); + + return container_of(common, struct ccu_mdiv, common); +} + +static inline struct ccu_div *hw_to_ccu_div(struct clk_hw *hw) +{ + struct ccu_common *common = hw_to_ccu_common(hw); + + return container_of(common, struct ccu_div, common); +} + +static inline struct ccu_gate *hw_to_ccu_gate(struct clk_hw *hw) +{ + struct ccu_common *common = hw_to_ccu_common(hw); + + return container_of(common, struct ccu_gate, common); +} + +static u8 ccu_get_parent_helper(struct ccu_common *common, + struct ccu_internal *mux) +{ + unsigned int val; + u8 parent; + + regmap_read(common->map, common->reg, &val); + parent = val >> mux->shift; + parent &= GENMASK(mux->width - 1, 0); + + return parent; +} + +static int ccu_set_parent_helper(struct ccu_common *common, + struct ccu_internal *mux, + u8 index) +{ + return regmap_update_bits(common->map, common->reg, + GENMASK(mux->width - 1, 0) << mux->shift, + index << mux->shift); +} + +static u8 ccu_mux_get_parent(struct clk_hw *hw) +{ + struct ccu_mux *cm = hw_to_ccu_mux(hw); + + return ccu_get_parent_helper(&cm->common, &cm->mux); +} + +static int ccu_mux_set_parent(struct clk_hw *hw, u8 index) +{ + struct ccu_mux *cm = hw_to_ccu_mux(hw); + + return ccu_set_parent_helper(&cm->common, &cm->mux, index); +} + +static const struct clk_ops ccu_mux_ops = { + .get_parent = ccu_mux_get_parent, + .set_parent = ccu_mux_set_parent, + .determine_rate = __clk_mux_determine_rate, +}; + +static void ccu_disable_helper(struct ccu_common *common, u32 gate) +{ + if (!gate) + return; + + regmap_update_bits(common->map, common->reg, + gate, ~gate); +} + +static int ccu_enable_helper(struct ccu_common *common, u32 gate) +{ + if (!gate) + return 0; + + return regmap_update_bits(common->map, common->reg, + gate, gate); +} + +static int ccu_is_enabled_helper(struct ccu_common *common, u32 gate) +{ + unsigned int val; + + if (!gate) + return true; + + regmap_read(common->map, common->reg, &val); + return val & gate; +} + +static int ccu_gate_is_enabled(struct clk_hw *hw) +{ + struct ccu_gate *cg = hw_to_ccu_gate(hw); + + return ccu_is_enabled_helper(&cg->common, cg->enable); +} + +static void ccu_gate_disable(struct clk_hw *hw) +{ + struct ccu_gate *cg = hw_to_ccu_gate(hw); + + ccu_disable_helper(&cg->common, cg->enable); +} + +static int ccu_gate_enable(struct clk_hw *hw) +{ + struct ccu_gate *cg = hw_to_ccu_gate(hw); + + return ccu_enable_helper(&cg->common, cg->enable); +} + +static const struct clk_ops ccu_gate_ops = { + .disable = ccu_gate_disable, + .enable = ccu_gate_enable, + .is_enabled = ccu_gate_is_enabled, +}; + +static unsigned long ccu_div_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct ccu_div *cd = hw_to_ccu_div(hw); + unsigned int val; + + regmap_read(cd->common.map, cd->common.reg, &val); + val = val >> cd->div.shift; + val &= GENMASK(cd->div.width - 1, 0); + + val = divider_recalc_rate(hw, parent_rate, val, NULL, + cd->div.flags, cd->div.width); + + return val; +} + +static u8 ccu_div_get_parent(struct clk_hw *hw) +{ + struct ccu_div *cd = hw_to_ccu_div(hw); + + return ccu_get_parent_helper(&cd->common, &cd->mux); +} + +static int ccu_div_set_parent(struct clk_hw *hw, u8 index) +{ + struct ccu_div *cd = hw_to_ccu_div(hw); + + return ccu_set_parent_helper(&cd->common, &cd->mux, index); +} + +static void ccu_div_disable(struct clk_hw *hw) +{ + struct ccu_div *cd = hw_to_ccu_div(hw); + + ccu_disable_helper(&cd->common, cd->enable); +} + +static int ccu_div_enable(struct clk_hw *hw) +{ + struct ccu_div *cd = hw_to_ccu_div(hw); + + return ccu_enable_helper(&cd->common, cd->enable); +} + +static int ccu_div_is_enabled(struct clk_hw *hw) +{ + struct ccu_div *cd = hw_to_ccu_div(hw); + + return ccu_is_enabled_helper(&cd->common, cd->enable); +} + +static const struct clk_ops ccu_div_ops = { + .disable = ccu_div_disable, + .enable = ccu_div_enable, + .is_enabled = ccu_div_is_enabled, + .get_parent = ccu_div_get_parent, + .set_parent = ccu_div_set_parent, + .recalc_rate = ccu_div_recalc_rate, + .determine_rate = clk_hw_determine_rate_no_reparent, +}; + +static unsigned long ccu_mdiv_recalc_rate(struct clk_hw *hw, + unsigned long parent_rate) +{ + struct ccu_mdiv *mdiv = hw_to_ccu_mdiv(hw); + unsigned long div, rate = parent_rate; + unsigned int m, d, i, v, val; + + regmap_read(mdiv->common.map, mdiv->common.reg, &val); + + m = val >> mdiv->m.shift; + m &= GENMASK(mdiv->m.width - 1, 0); + + d = val >> mdiv->d.shift; + d &= GENMASK(mdiv->d.width - 1, 0); + + i = val >> mdiv->i.shift; + i &= GENMASK(mdiv->i.width - 1, 0); + + v = val >> mdiv->v.shift; + v &= GENMASK(mdiv->v.width - 1, 0); + + rate = parent_rate * m; + div = d * i * v; + do_div(rate, div); + + return rate; +} + +static const struct clk_ops clk_mdiv_ops = { + .recalc_rate = ccu_mdiv_recalc_rate, +}; + +static struct ccu_mdiv cpu_pll0_clk = { + .m = TH_CCU_ARG(8, 12), + .d = TH_CCU_ARG(24, 3), + .i = TH_CCU_ARG(20, 3), + .v = TH_CCU_ARG(0, 6), + .common = { + .reg = 0x000, + .hw.init = CLK_HW_INIT("cpu-pll0", "osc_24m", + &clk_mdiv_ops, + 0), + }, +}; + +static struct ccu_mdiv cpu_pll1_clk = { + .m = TH_CCU_ARG(8, 12), + .d = TH_CCU_ARG(24, 3), + .i = TH_CCU_ARG(20, 3), + .v = TH_CCU_ARG(0, 6), + .common = { + .reg = 0x010, + .hw.init = CLK_HW_INIT("cpu-pll1", "osc_24m", + &clk_mdiv_ops, + 0), + }, +}; + +static struct ccu_mdiv gmac_pll_clk = { + .m = TH_CCU_ARG(8, 12), + .d = TH_CCU_ARG(24, 3), + .i = TH_CCU_ARG(20, 3), + .v = TH_CCU_ARG(0, 6), + .common = { + .reg = 0x020, + .hw.init = CLK_HW_INIT("gmac-pll", "osc_24m", + &clk_mdiv_ops, + 0), + }, +}; + +static const struct clk_parent_data gmac_pll_clk_parent_data[] = { + { .hw = &gmac_pll_clk.common.hw } +}; + +static struct ccu_mdiv video_pll_clk = { + .m = TH_CCU_ARG(8, 12), + .d = TH_CCU_ARG(24, 3), + .i = TH_CCU_ARG(20, 3), + .v = TH_CCU_ARG(0, 6), + .common = { + .reg = 0x030, + .hw.init = CLK_HW_INIT("video-pll", "osc_24m", + &clk_mdiv_ops, + 0), + }, +}; + +static const struct clk_parent_data video_pll_clk_parent_data[] = { + { .hw = &video_pll_clk.common.hw } +}; + +static struct ccu_mdiv dpu0_pll_clk = { + .m = TH_CCU_ARG(8, 12), + .d = TH_CCU_ARG(24, 3), + .i = TH_CCU_ARG(20, 3), + .v = TH_CCU_ARG(0, 6), + .common = { + .reg = 0x040, + .hw.init = CLK_HW_INIT("dpu0-pll", "osc_24m", + &clk_mdiv_ops, + 0), + }, +}; + +static const struct clk_parent_data dpu0_pll_clk_parent_data[] = { + { .hw = &dpu0_pll_clk.common.hw } +}; + +static struct ccu_mdiv dpu1_pll_clk = { + .m = TH_CCU_ARG(8, 12), + .d = TH_CCU_ARG(24, 3), + .i = TH_CCU_ARG(20, 3), + .v = TH_CCU_ARG(0, 6), + .common = { + .reg = 0x050, + .hw.init = CLK_HW_INIT("dpu1-pll", "osc_24m", + &clk_mdiv_ops, + 0), + }, +}; + +static const struct clk_parent_data dpu1_pll_clk_parent_data[] = { + { .hw = &dpu1_pll_clk.common.hw } +}; + +static struct ccu_mdiv tee_pll_clk = { + .m = TH_CCU_ARG(8, 12), + .d = TH_CCU_ARG(24, 3), + .i = TH_CCU_ARG(20, 3), + .v = TH_CCU_ARG(0, 6), + .common = { + .reg = 0x060, + .hw.init = CLK_HW_INIT("tee-pll", "osc_24m", + &clk_mdiv_ops, + 0), + }, +}; + +static const char * const c910_i0_parents[] = { "cpu-pll0", "osc_24m" }; + +struct ccu_mux c910_i0_clk = { + .mux = TH_CCU_ARG(1, 1), + .common = { + .reg = 0x100, + .hw.init = CLK_HW_INIT_PARENTS("c910-i0", + c910_i0_parents, + &ccu_mux_ops, + 0), + } +}; + +static const struct clk_parent_data c910_parents[] = { + { .hw = &c910_i0_clk.common.hw }, + { .hw = &cpu_pll1_clk.common.hw } +}; + +struct ccu_mux c910_clk = { + .mux = TH_CCU_ARG(0, 1), + .common = { + .reg = 0x100, + .hw.init = CLK_HW_INIT_PARENTS_DATA("c910", + c910_parents, + &ccu_mux_ops, + 0), + } +}; + +static const char * const ahb2_cpusys_parents[] = { "gmac-pll", "osc_24m" }; +static struct ccu_div ahb2_cpusys_hclk = { + .div = TH_CCU_DIV_FLAGS(0, 3, CLK_DIVIDER_ONE_BASED), + .mux = TH_CCU_ARG(5, 1), + .common = { + .reg = 0x120, + .hw.init = CLK_HW_INIT_PARENTS("ahb2-cpusys-hclk", + ahb2_cpusys_parents, + &ccu_div_ops, + 0), + }, +}; + +static const struct clk_parent_data ahb2_cpusys_hclk_parent_data[] = { + { .hw = &ahb2_cpusys_hclk.common.hw } +}; + +static struct ccu_div apb3_cpusys_pclk = { + .div = TH_CCU_ARG(0, 3), + .common = { + .reg = 0x130, + .hw.init = CLK_HW_INIT_PARENTS_DATA("apb3-cpusys-pclk", + ahb2_cpusys_hclk_parent_data, + &ccu_div_ops, + 0), + }, +}; + +static const struct clk_parent_data apb3_cpusys_pclk_parent_data[] = { + { .hw = &apb3_cpusys_pclk.common.hw } +}; + +static struct ccu_div axi4_cpusys2_aclk = { + .div = TH_CCU_DIV_FLAGS(0, 3, CLK_DIVIDER_ONE_BASED), + .common = { + .reg = 0x134, + .hw.init = CLK_HW_INIT_PARENTS_DATA("axi4-cpusys2-aclk", + gmac_pll_clk_parent_data, + &ccu_div_ops, + 0), + }, +}; + +static const struct clk_parent_data axi4_cpusys2_aclk_parent_data[] = { + { .hw = &axi4_cpusys2_aclk.common.hw } +}; + +static CCU_GATE(aon2cpu_a2x_clk, "aon2cpu-a2x", axi4_cpusys2_aclk_parent_data, + 0x134, BIT(8), 0); + +static CCU_GATE(x2x_cpusys_clk, "x2x-cpusys", axi4_cpusys2_aclk_parent_data, + 0x134, BIT(7), 0); + +static CCU_GATE(brom_clk, "brom", ahb2_cpusys_hclk_parent_data, + 0x100, BIT(4), 0); + +static CCU_GATE(bmu_clk, "bmu", axi4_cpusys2_aclk_parent_data, + 0x100, BIT(5), 0); + +static const char * const axi_parents[] = { "video-pll", "osc_24m" }; +static struct ccu_div axi_aclk = { + .div = TH_CCU_DIV_FLAGS(0, 4, CLK_DIVIDER_ONE_BASED), + .mux = TH_CCU_ARG(5, 1), + .common = { + .reg = 0x138, + .hw.init = CLK_HW_INIT_PARENTS("axi-aclk", + axi_parents, + &ccu_div_ops, + 0), + }, +}; + +static const struct clk_parent_data axi_aclk_parent_data[] = { + { .hw = &axi_aclk.common.hw } +}; + +static CCU_GATE(cpu2aon_x2h_clk, "cpu2aon-x2h", axi_aclk_parent_data, + 0x138, BIT(8), 0); + +static const char * const perisys_ahb_hclk_parents[] = { "gmac-pll", "osc_24m" }; +static struct ccu_div perisys_ahb_hclk = { + .enable = BIT(6), + .div = TH_CCU_DIV_FLAGS(0, 4, CLK_DIVIDER_ONE_BASED), + .mux = TH_CCU_ARG(5, 1), + .common = { + .reg = 0x140, + .hw.init = CLK_HW_INIT_PARENTS("perisys-ahb-hclk", + perisys_ahb_hclk_parents, + &ccu_div_ops, + 0), + }, +}; + +static const struct clk_parent_data perisys_ahb_hclk_parent_data[] = { + { .hw = &perisys_ahb_hclk.common.hw } +}; + +static CCU_GATE(cpu2peri_x2h_clk, "cpu2peri-x2h", axi4_cpusys2_aclk_parent_data, + 0x140, BIT(9), 0); + +static struct ccu_div perisys_apb_pclk = { + .div = TH_CCU_ARG(0, 3), + .common = { + .reg = 0x150, + .hw.init = CLK_HW_INIT_PARENTS_DATA("perisys-apb-pclk", + perisys_ahb_hclk_parent_data, + &ccu_div_ops, + 0), + }, +}; + +static const struct clk_parent_data perisys_apb_pclk_parent_data[] = { + { .hw = &perisys_apb_pclk.common.hw } +}; + +static struct ccu_div peri2sys_apb_pclk = { + .div = TH_CCU_DIV_FLAGS(4, 3, CLK_DIVIDER_ONE_BASED), + .common = { + .reg = 0x150, + .hw.init = CLK_HW_INIT_PARENTS_DATA("peri2sys-apb-pclk", + gmac_pll_clk_parent_data, + &ccu_div_ops, + 0), + }, +}; + +static const struct clk_parent_data peri2sys_apb_pclk_parent_data[] = { + { .hw = &peri2sys_apb_pclk.common.hw } +}; + +static CCU_GATE(perisys_apb1_hclk, "perisys-apb1-hclk", perisys_ahb_hclk_parent_data, + 0x150, BIT(9), 0); + +static CCU_GATE(perisys_apb2_hclk, "perisys-apb2-hclk", perisys_ahb_hclk_parent_data, + 0x150, BIT(10), 0); + +static CCU_GATE(perisys_apb3_hclk, "perisys-apb3-hclk", perisys_ahb_hclk_parent_data, + 0x150, BIT(11), 0); + +static CCU_GATE(perisys_apb4_hclk, "perisys-apb4-hclk", perisys_ahb_hclk_parent_data, + 0x150, BIT(12), 0); + +static CLK_FIXED_FACTOR_FW_NAME(osc12m_clk, "osc_12m", "osc_24m", 2, 1, 0); + +static const char * const out_parents[] = { "osc_24m", "osc_12m" }; + +static struct ccu_div out1_clk = { + .enable = BIT(5), + .div = TH_CCU_DIV_FLAGS(0, 3, CLK_DIVIDER_ONE_BASED), + .mux = TH_CCU_ARG(4, 1), + .common = { + .reg = 0x1b4, + .hw.init = CLK_HW_INIT_PARENTS("out1", + out_parents, + &ccu_div_ops, + 0), + }, +}; + +static struct ccu_div out2_clk = { + .enable = BIT(5), + .div = TH_CCU_DIV_FLAGS(0, 3, CLK_DIVIDER_ONE_BASED), + .mux = TH_CCU_ARG(4, 1), + .common = { + .reg = 0x1b8, + .hw.init = CLK_HW_INIT_PARENTS("out2", + out_parents, + &ccu_div_ops, + 0), + }, +}; + +static struct ccu_div out3_clk = { + .enable = BIT(5), + .div = TH_CCU_DIV_FLAGS(0, 3, CLK_DIVIDER_ONE_BASED), + .mux = TH_CCU_ARG(4, 1), + .common = { + .reg = 0x1bc, + .hw.init = CLK_HW_INIT_PARENTS("out3", + out_parents, + &ccu_div_ops, + 0), + }, +}; + +static struct ccu_div out4_clk = { + .enable = BIT(5), + .div = TH_CCU_DIV_FLAGS(0, 3, CLK_DIVIDER_ONE_BASED), + .mux = TH_CCU_ARG(4, 1), + .common = { + .reg = 0x1c0, + .hw.init = CLK_HW_INIT_PARENTS("out4", + out_parents, + &ccu_div_ops, + 0), + }, +}; + +static const char * const apb_parents[] = { "gmac-pll", "osc_24m" }; +static struct ccu_div apb_pclk = { + .enable = BIT(5), + .div = TH_CCU_DIV_FLAGS(0, 4, CLK_DIVIDER_ONE_BASED), + .mux = TH_CCU_ARG(7, 1), + .common = { + .reg = 0x1c4, + .hw.init = CLK_HW_INIT_PARENTS("apb-pclk", + apb_parents, + &ccu_div_ops, + 0), + }, +}; + +static const struct clk_parent_data npu_parents[] = { + { .hw = &gmac_pll_clk.common.hw }, + { .hw = &video_pll_clk.common.hw } +}; + +static struct ccu_div npu_clk = { + .enable = BIT(4), + .div = TH_CCU_DIV_FLAGS(0, 3, CLK_DIVIDER_ONE_BASED), + .mux = TH_CCU_ARG(6, 1), + .common = { + .reg = 0x1c8, + .hw.init = CLK_HW_INIT_PARENTS_DATA("npu", + npu_parents, + &ccu_div_ops, + 0), + }, +}; + +static CCU_GATE(npu_axi_clk, "npu-axi", axi_aclk_parent_data, + 0x1c8, BIT(5), 0); + +static struct ccu_div vi_clk = { + .div = TH_CCU_DIV_FLAGS(16, 4, CLK_DIVIDER_ONE_BASED), + .common = { + .reg = 0x1d0, + .hw.init = CLK_HW_INIT_PARENTS_DATA("vi", + video_pll_clk_parent_data, + &ccu_div_ops, + 0), + }, +}; + +static struct ccu_div vi_ahb_clk = { + .div = TH_CCU_DIV_FLAGS(0, 4, CLK_DIVIDER_ONE_BASED), + .common = { + .reg = 0x1d0, + .hw.init = CLK_HW_INIT_PARENTS_DATA("vi-ahb", + video_pll_clk_parent_data, + &ccu_div_ops, + 0), + }, +}; + +static struct ccu_div vo_axi_clk = { + .enable = BIT(5), + .div = TH_CCU_DIV_FLAGS(0, 4, CLK_DIVIDER_ONE_BASED), + .common = { + .reg = 0x1dc, + .hw.init = CLK_HW_INIT_PARENTS_DATA("vo-axi", + video_pll_clk_parent_data, + &ccu_div_ops, + 0), + }, +}; + +static struct ccu_div vp_apb_clk = { + .div = TH_CCU_DIV_FLAGS(0, 3, CLK_DIVIDER_ONE_BASED), + .common = { + .reg = 0x1e0, + .hw.init = CLK_HW_INIT_PARENTS_DATA("vp-apb", + gmac_pll_clk_parent_data, + &ccu_div_ops, + 0), + }, +}; + +static struct ccu_div vp_axi_clk = { + .enable = BIT(15), + .div = TH_CCU_DIV_FLAGS(8, 4, CLK_DIVIDER_ONE_BASED), + .common = { + .reg = 0x1e0, + .hw.init = CLK_HW_INIT_PARENTS_DATA("vp-axi", + video_pll_clk_parent_data, + &ccu_div_ops, + 0), + }, +}; + +static CCU_GATE(cpu2vp_clk, "cpu2vp", axi_aclk_parent_data, + 0x1e0, BIT(13), 0); + +static struct ccu_div venc_clk = { + .enable = BIT(5), + .div = TH_CCU_DIV_FLAGS(0, 3, CLK_DIVIDER_ONE_BASED), + .common = { + .reg = 0x1e4, + .hw.init = CLK_HW_INIT_PARENTS_DATA("venc", + gmac_pll_clk_parent_data, + &ccu_div_ops, + 0), + }, +}; + +static struct ccu_div dpu0_clk = { + .div = TH_CCU_DIV_FLAGS(0, 8, CLK_DIVIDER_ONE_BASED), + .common = { + .reg = 0x1e8, + .hw.init = CLK_HW_INIT_PARENTS_DATA("dpu0", + dpu0_pll_clk_parent_data, + &ccu_div_ops, + 0), + }, +}; + +static struct ccu_div dpu1_clk = { + .div = TH_CCU_DIV_FLAGS(0, 8, CLK_DIVIDER_ONE_BASED), + .common = { + .reg = 0x1ec, + .hw.init = CLK_HW_INIT_PARENTS_DATA("dpu1", + dpu1_pll_clk_parent_data, + &ccu_div_ops, + 0), + }, +}; + +static CCU_GATE(emmc_sdio_clk, "emmc-sdio", video_pll_clk_parent_data, 0x204, BIT(30), 0); +static CCU_GATE(gmac1_clk, "gmac1", gmac_pll_clk_parent_data, 0x204, BIT(26), 0); +static CCU_GATE(padctrl1_clk, "padctrl1", perisys_apb_pclk_parent_data, 0x204, BIT(24), 0); +static CCU_GATE(dsmart_clk, "dsmart", perisys_apb_pclk_parent_data, 0x204, BIT(23), 0); +static CCU_GATE(padctrl0_clk, "padctrl0", perisys_apb_pclk_parent_data, 0x204, BIT(22), 0); +static CCU_GATE(gmac_axi_clk, "gmac-axi", axi4_cpusys2_aclk_parent_data, 0x204, BIT(21), 0); +static CCU_GATE(gpio3_clk, "gpio3-clk", peri2sys_apb_pclk_parent_data, 0x204, BIT(20), 0); +static CCU_GATE(gmac0_clk, "gmac0", gmac_pll_clk_parent_data, 0x204, BIT(19), 0); +static CCU_GATE(pwm_clk, "pwm", perisys_apb_pclk_parent_data, 0x204, BIT(18), 0); +static CCU_GATE(qspi0_clk, "qspi0", video_pll_clk_parent_data, 0x204, BIT(17), 0); +static CCU_GATE(qspi1_clk, "qspi1", video_pll_clk_parent_data, 0x204, BIT(16), 0); +static CCU_GATE(spi_clk, "spi", video_pll_clk_parent_data, 0x204, BIT(15), 0); +static CCU_GATE(uart0_pclk, "uart0-pclk", perisys_apb_pclk_parent_data, 0x204, BIT(14), 0); +static CCU_GATE(uart1_pclk, "uart1-pclk", perisys_apb_pclk_parent_data, 0x204, BIT(13), 0); +static CCU_GATE(uart2_pclk, "uart2-pclk", perisys_apb_pclk_parent_data, 0x204, BIT(12), 0); +static CCU_GATE(uart3_pclk, "uart3-pclk", perisys_apb_pclk_parent_data, 0x204, BIT(11), 0); +static CCU_GATE(uart4_pclk, "uart4-pclk", perisys_apb_pclk_parent_data, 0x204, BIT(10), 0); +static CCU_GATE(uart5_pclk, "uart5-pclk", perisys_apb_pclk_parent_data, 0x204, BIT(9), 0); +static CCU_GATE(gpio0_clk, "gpio0-clk", perisys_apb_pclk_parent_data, 0x204, BIT(8), 0); +static CCU_GATE(gpio1_clk, "gpio1-clk", perisys_apb_pclk_parent_data, 0x204, BIT(7), 0); +static CCU_GATE(gpio2_clk, "gpio2-clk", peri2sys_apb_pclk_parent_data, 0x204, BIT(6), 0); +static CCU_GATE(i2c0_clk, "i2c0", perisys_apb_pclk_parent_data, 0x204, BIT(5), 0); +static CCU_GATE(i2c1_clk, "i2c1", perisys_apb_pclk_parent_data, 0x204, BIT(4), 0); +static CCU_GATE(i2c2_clk, "i2c2", perisys_apb_pclk_parent_data, 0x204, BIT(3), 0); +static CCU_GATE(i2c3_clk, "i2c3", perisys_apb_pclk_parent_data, 0x204, BIT(2), 0); +static CCU_GATE(i2c4_clk, "i2c4", perisys_apb_pclk_parent_data, 0x204, BIT(1), 0); +static CCU_GATE(i2c5_clk, "i2c5", perisys_apb_pclk_parent_data, 0x204, BIT(0), 0); + +static CCU_GATE(spinlock_clk, "spinlock", ahb2_cpusys_hclk_parent_data, 0x208, BIT(10), 0); +static CCU_GATE(dma_clk, "dma", axi4_cpusys2_aclk_parent_data, 0x208, BIT(8), 0); +static CCU_GATE(mbox0_clk, "mbox0", apb3_cpusys_pclk_parent_data, 0x208, BIT(7), 0); +static CCU_GATE(mbox1_clk, "mbox1", apb3_cpusys_pclk_parent_data, 0x208, BIT(6), 0); +static CCU_GATE(mbox2_clk, "mbox2", apb3_cpusys_pclk_parent_data, 0x208, BIT(5), 0); +static CCU_GATE(mbox3_clk, "mbox3", apb3_cpusys_pclk_parent_data, 0x208, BIT(4), 0); +static CCU_GATE(wdt0_clk, "wdt0", apb3_cpusys_pclk_parent_data, 0x208, BIT(3), 0); +static CCU_GATE(wdt1_clk, "wdt1", apb3_cpusys_pclk_parent_data, 0x208, BIT(2), 0); +static CCU_GATE(timer0_clk, "timer0", apb3_cpusys_pclk_parent_data, 0x208, BIT(1), 0); +static CCU_GATE(timer1_clk, "timer1", apb3_cpusys_pclk_parent_data, 0x208, BIT(0), 0); + +static CCU_GATE(sram0_clk, "sram0", axi_aclk_parent_data, 0x20c, BIT(4), 0); +static CCU_GATE(sram1_clk, "sram1", axi_aclk_parent_data, 0x20c, BIT(3), 0); +static CCU_GATE(sram2_clk, "sram2", axi_aclk_parent_data, 0x20c, BIT(2), 0); +static CCU_GATE(sram3_clk, "sram3", axi_aclk_parent_data, 0x20c, BIT(1), 0); + +static CLK_FIXED_FACTOR_HW(gmac_pll_clk_100m, "gmac-pll-clk-100m", + &gmac_pll_clk.common.hw, + 10, 1, 0); + +static const char * const uart_sclk_parents[] = { "gmac-pll-clk-100m", "osc_24m" }; +struct ccu_mux uart_sclk = { + .mux = TH_CCU_ARG(0, 1), + .common = { + .reg = 0x210, + .hw.init = CLK_HW_INIT_PARENTS("uart-sclk", + uart_sclk_parents, + &ccu_mux_ops, + 0), + } +}; + +static struct ccu_common *th1520_clks[] = { + &cpu_pll0_clk.common, + &cpu_pll1_clk.common, + &gmac_pll_clk.common, + &video_pll_clk.common, + &dpu0_pll_clk.common, + &dpu1_pll_clk.common, + &tee_pll_clk.common, + &c910_i0_clk.common, + &c910_clk.common, + &brom_clk.common, + &bmu_clk.common, + &ahb2_cpusys_hclk.common, + &apb3_cpusys_pclk.common, + &axi4_cpusys2_aclk.common, + &aon2cpu_a2x_clk.common, + &x2x_cpusys_clk.common, + &axi_aclk.common, + &cpu2aon_x2h_clk.common, + &perisys_ahb_hclk.common, + &cpu2peri_x2h_clk.common, + &perisys_apb_pclk.common, + &peri2sys_apb_pclk.common, + &perisys_apb1_hclk.common, + &perisys_apb2_hclk.common, + &perisys_apb3_hclk.common, + &perisys_apb4_hclk.common, + &out1_clk.common, + &out2_clk.common, + &out3_clk.common, + &out4_clk.common, + &apb_pclk.common, + &npu_clk.common, + &npu_axi_clk.common, + &vi_clk.common, + &vi_ahb_clk.common, + &vo_axi_clk.common, + &vp_apb_clk.common, + &vp_axi_clk.common, + &cpu2vp_clk.common, + &venc_clk.common, + &dpu0_clk.common, + &dpu1_clk.common, + &emmc_sdio_clk.common, + &gmac1_clk.common, + &padctrl1_clk.common, + &dsmart_clk.common, + &padctrl0_clk.common, + &gmac_axi_clk.common, + &gpio3_clk.common, + &gmac0_clk.common, + &pwm_clk.common, + &qspi0_clk.common, + &qspi1_clk.common, + &spi_clk.common, + &uart0_pclk.common, + &uart1_pclk.common, + &uart2_pclk.common, + &uart3_pclk.common, + &uart4_pclk.common, + &uart5_pclk.common, + &gpio0_clk.common, + &gpio1_clk.common, + &gpio2_clk.common, + &i2c0_clk.common, + &i2c1_clk.common, + &i2c2_clk.common, + &i2c3_clk.common, + &i2c4_clk.common, + &i2c5_clk.common, + &spinlock_clk.common, + &dma_clk.common, + &mbox0_clk.common, + &mbox1_clk.common, + &mbox2_clk.common, + &mbox3_clk.common, + &wdt0_clk.common, + &wdt1_clk.common, + &timer0_clk.common, + &timer1_clk.common, + &sram0_clk.common, + &sram1_clk.common, + &sram2_clk.common, + &sram3_clk.common, + &uart_sclk.common, +}; + +#define NR_CLKS (CLK_UART_SCLK + 1) + +static struct clk_hw_onecell_data th1520_hw_clks = { + .hws = { + [CLK_OSC12M] = &osc12m_clk.hw, + [CLK_CPU_PLL0] = &cpu_pll0_clk.common.hw, + [CLK_CPU_PLL1] = &cpu_pll1_clk.common.hw, + [CLK_GMAC_PLL] = &gmac_pll_clk.common.hw, + [CLK_VIDEO_PLL] = &video_pll_clk.common.hw, + [CLK_DPU0_PLL] = &dpu0_pll_clk.common.hw, + [CLK_DPU1_PLL] = &dpu1_pll_clk.common.hw, + [CLK_TEE_PLL] = &tee_pll_clk.common.hw, + [CLK_C910_I0] = &c910_i0_clk.common.hw, + [CLK_C910] = &c910_clk.common.hw, + [CLK_BROM] = &brom_clk.common.hw, + [CLK_BMU] = &bmu_clk.common.hw, + [CLK_AHB2_CPUSYS_HCLK] = &ahb2_cpusys_hclk.common.hw, + [CLK_APB3_CPUSYS_PCLK] = &apb3_cpusys_pclk.common.hw, + [CLK_AXI4_CPUSYS2_ACLK] = &axi4_cpusys2_aclk.common.hw, + [CLK_AON2CPU_A2X] = &aon2cpu_a2x_clk.common.hw, + [CLK_X2X_CPUSYS] = &x2x_cpusys_clk.common.hw, + [CLK_AXI_ACLK] = &axi_aclk.common.hw, + [CLK_CPU2AON_X2H] = &cpu2aon_x2h_clk.common.hw, + [CLK_PERI_AHB_HCLK] = &perisys_ahb_hclk.common.hw, + [CLK_CPU2PERI_X2H] = &cpu2peri_x2h_clk.common.hw, + [CLK_PERI_APB_PCLK] = &perisys_apb_pclk.common.hw, + [CLK_PERI2APB_PCLK] = &peri2sys_apb_pclk.common.hw, + [CLK_PERI_APB1_HCLK] = &perisys_apb1_hclk.common.hw, + [CLK_PERI_APB2_HCLK] = &perisys_apb2_hclk.common.hw, + [CLK_PERI_APB3_HCLK] = &perisys_apb3_hclk.common.hw, + [CLK_PERI_APB4_HCLK] = &perisys_apb4_hclk.common.hw, + [CLK_OUT1] = &out1_clk.common.hw, + [CLK_OUT2] = &out2_clk.common.hw, + [CLK_OUT3] = &out3_clk.common.hw, + [CLK_OUT4] = &out4_clk.common.hw, + [CLK_APB_PCLK] = &apb_pclk.common.hw, + [CLK_NPU] = &npu_clk.common.hw, + [CLK_NPU_AXI] = &npu_axi_clk.common.hw, + [CLK_VI] = &vi_clk.common.hw, + [CLK_VI_AHB] = &vi_ahb_clk.common.hw, + [CLK_VO_AXI] = &vo_axi_clk.common.hw, + [CLK_VP_APB] = &vp_apb_clk.common.hw, + [CLK_VP_AXI] = &vp_axi_clk.common.hw, + [CLK_CPU2VP] = &cpu2vp_clk.common.hw, + [CLK_VENC] = &venc_clk.common.hw, + [CLK_DPU0] = &dpu0_clk.common.hw, + [CLK_DPU1] = &dpu1_clk.common.hw, + [CLK_EMMC_SDIO] = &emmc_sdio_clk.common.hw, + [CLK_GMAC1] = &gmac1_clk.common.hw, + [CLK_PADCTRL1] = &padctrl1_clk.common.hw, + [CLK_DSMART] = &dsmart_clk.common.hw, + [CLK_PADCTRL0] = &padctrl0_clk.common.hw, + [CLK_GMAC_AXI] = &gmac_axi_clk.common.hw, + [CLK_GPIO3] = &gpio3_clk.common.hw, + [CLK_GMAC0] = &gmac0_clk.common.hw, + [CLK_PWM] = &pwm_clk.common.hw, + [CLK_QSPI0] = &qspi0_clk.common.hw, + [CLK_QSPI1] = &qspi1_clk.common.hw, + [CLK_SPI] = &spi_clk.common.hw, + [CLK_UART0_PCLK] = &uart0_pclk.common.hw, + [CLK_UART1_PCLK] = &uart1_pclk.common.hw, + [CLK_UART2_PCLK] = &uart2_pclk.common.hw, + [CLK_UART3_PCLK] = &uart3_pclk.common.hw, + [CLK_UART4_PCLK] = &uart4_pclk.common.hw, + [CLK_UART5_PCLK] = &uart5_pclk.common.hw, + [CLK_GPIO0] = &gpio0_clk.common.hw, + [CLK_GPIO1] = &gpio1_clk.common.hw, + [CLK_GPIO2] = &gpio2_clk.common.hw, + [CLK_I2C0] = &i2c0_clk.common.hw, + [CLK_I2C1] = &i2c1_clk.common.hw, + [CLK_I2C2] = &i2c2_clk.common.hw, + [CLK_I2C3] = &i2c3_clk.common.hw, + [CLK_I2C4] = &i2c4_clk.common.hw, + [CLK_I2C5] = &i2c5_clk.common.hw, + [CLK_SPINLOCK] = &spinlock_clk.common.hw, + [CLK_DMA] = &dma_clk.common.hw, + [CLK_MBOX0] = &mbox0_clk.common.hw, + [CLK_MBOX1] = &mbox1_clk.common.hw, + [CLK_MBOX2] = &mbox2_clk.common.hw, + [CLK_MBOX3] = &mbox3_clk.common.hw, + [CLK_WDT0] = &wdt0_clk.common.hw, + [CLK_WDT1] = &wdt1_clk.common.hw, + [CLK_TIMER0] = &timer0_clk.common.hw, + [CLK_TIMER1] = &timer1_clk.common.hw, + [CLK_SRAM0] = &sram0_clk.common.hw, + [CLK_SRAM1] = &sram1_clk.common.hw, + [CLK_SRAM2] = &sram2_clk.common.hw, + [CLK_SRAM3] = &sram3_clk.common.hw, + [CLK_PLL_GMAC_100M] = &gmac_pll_clk_100m.hw, + [CLK_UART_SCLK] = &uart_sclk.common.hw, + }, + .num = NR_CLKS, +}; + +static const struct regmap_config th1520_clk_regmap_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, + .fast_io = true, +}; + +static int th1520_clk_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct regmap *map; + void __iomem *regs; + int ret, i; + + regs = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(regs)) + return PTR_ERR(regs); + + map = devm_regmap_init_mmio(dev, regs, &th1520_clk_regmap_config); + if (IS_ERR(map)) + return PTR_ERR(map); + + for (i = 0; i < ARRAY_SIZE(th1520_clks); i++) + th1520_clks[i]->map = map; + + for (i = 0; i < th1520_hw_clks.num; i++) { + ret = devm_clk_hw_register(dev, th1520_hw_clks.hws[i]); + if (ret) + return ret; + } + + ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get, + &th1520_hw_clks); + if (ret) + return ret; + + return 0; +} + +static const struct of_device_id th1520_clk_match[] = { + { + .compatible = "thead,th1520-clk-ap", + }, + { /* sentinel */ }, +}; +MODULE_DEVICE_TABLE(of, th1520_clk_match); + +static struct platform_driver th1520_clk_driver = { + .probe = th1520_clk_probe, + .driver = { + .name = "th1520-clk", + .of_match_table = th1520_clk_match, + }, +}; +module_platform_driver(th1520_clk_driver); + +MODULE_DESCRIPTION("T-HEAD TH1520 AP Clock driver"); +MODULE_AUTHOR("Yangtao Li "); +MODULE_AUTHOR("Jisheng Zhang "); +MODULE_LICENSE("GPL"); From patchwork Tue May 7 04:55:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 13656248 Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com [209.85.161.53]) (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 79B7B6CDA8 for ; Tue, 7 May 2024 04:57:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057857; cv=none; b=XCJeuN5cwauxqspbF1EBky2/Mt6gZ4toM7qBdK6iIazSG+NwccqXszZmwaEC0pXl3fhyfNuSzl78Kr09FopzAb/KrXW0idMZBATDqoFazadESMh+PeUQBIGsv/i88ZyOP5Y6NmxDRj/OYxrW9/hLFjHZvpCUfO769AfMMQKba5g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057857; c=relaxed/simple; bh=6PV2bpf3dXOpJag32DfU7y2Gi0ru2guu8y2sRZs5RmA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uyB/qPH83uyrwMmMKkEz/lNklBPU+kBQRik9F0QWIonteVwT429OHYikKg6JgOwa4NL4yOstMfPQShJJUmviWwx+fOXIPKtCpEZw8C03lfLk8u7a/kTHgPpUN0kw7NwKmetwIXLHrAWtVB3EIqDyZxJcDsiyRaymj3uAquykRgE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com; spf=pass smtp.mailfrom=tenstorrent.com; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b=Wq3Zd5i5; arc=none smtp.client-ip=209.85.161.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b="Wq3Zd5i5" Received: by mail-oo1-f53.google.com with SMTP id 006d021491bc7-5aa1bf6cb40so1920137eaf.1 for ; Mon, 06 May 2024 21:57:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tenstorrent.com; s=google; t=1715057854; x=1715662654; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=NlABhhrgRN0kCKTe4nIKDePb7LoVOzv5TW57AJaUw7o=; b=Wq3Zd5i5cI2WBMdetZ5dqNdvq0uA/lj2i5XhSOgwGvs2cwM0QcDXgy8KJRyud/PJog gJdjsS2NzEu7j4o4hLnLyodazwC11vbzuzGrWQQMxQhv4lbJk9ALHVOqTwoxW7krdluB 7DTXxClhREH2+NgfWrNUwfd2xfpUrpFwj4DW/fT/AVX/6ta5GxUCFd9Xn8rfBsTgEN0u anBGMKn3U/sAKZ55dN7ojTLcw6EO3gMdVuPim+CHOHSgbVzkObMwUQUiNu/FRVTpDiT+ soy8Fymq5LHWy1KjJIoX42wmPowvW2EqATdji8nNF2BcfJSfbkn83uReHrLcVhNMyazA cN0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715057854; x=1715662654; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NlABhhrgRN0kCKTe4nIKDePb7LoVOzv5TW57AJaUw7o=; b=jMjX332mgi8V2D78NuY9yPhNPGV1YW3CuL0vR5bZfHpj4Uesx98rgty1XkGSyI8SoF IjQw2P68HbcmR0aoVk4WtOoAmN+1SkoGsF09NZ5VdWn8Aw632mYjGi8IIRX4q+h62IX7 Q0kYbioZ8fDHsSdpt2yOK3vTAMLJULAmJcXT7f9WDNhr7IQVCr55z39xI5r1hE2AByNA 0cQcZ+gDbwV7m9KqNso4TEd4J1gQ/mCtwt+GfPtQUEA5Gejb6HBLPIzijXN+fIpUReP+ rLvUfQ5BcY9E7VCXtK9l5NmGjqw4WdcyV1kSSCERzpy99c9Yz1E3nQryCmEeOydzcaki fD3w== X-Forwarded-Encrypted: i=1; AJvYcCX/T+jrfZTMjzhl+9Kaz9By439c8RimJbaR9FYm6QrOU2M4qQyEnszN8hPXK5K7rP4+SBgRHD30eoxrk8d6WzRega+KChisQoKQ X-Gm-Message-State: AOJu0Yy2RUemirboeSMDBI1u0x13A5iQBCvnvQ5FyBpax9rmGXxygMmn mXQimKgUQUOR4Xnpn9lTC+Ccyzing6xy5O7zj48ogTvV9lHgA0hanfPC6ECU8sE= X-Google-Smtp-Source: AGHT+IF9aeioa8mJUvS+E77WSKbfTcZO5wmap3E6KVCzEyaI/OIUtILJNYssFJf6gtqk3GzjJKwThA== X-Received: by 2002:a05:6359:a399:b0:17f:87fb:5326 with SMTP id ky25-20020a056359a39900b0017f87fb5326mr13927155rwc.24.1715057854502; Mon, 06 May 2024 21:57:34 -0700 (PDT) Received: from [127.0.1.1] ([2601:1c2:1802:170:6870:7119:e255:c3a0]) by smtp.gmail.com with ESMTPSA id o14-20020a637e4e000000b005f80aced5f3sm8987249pgn.0.2024.05.06.21.57.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 21:57:34 -0700 (PDT) From: Drew Fustini Date: Mon, 06 May 2024 21:55:17 -0700 Subject: [PATCH RFC v3 4/7] riscv: dts: thead: Add TH1520 AP_SUBSYS clock controller Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240506-th1520-clk-v3-4-085a18a23a7f@tenstorrent.com> References: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> In-Reply-To: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> To: Jisheng Zhang , Guo Ren , Fu Wei , Yangtao Li , Thomas Bonnefille , Emil Renner Berthing , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-riscv@lists.infradead.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Drew Fustini X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1715057849; l=1160; i=dfustini@tenstorrent.com; s=20230430; h=from:subject:message-id; bh=6PV2bpf3dXOpJag32DfU7y2Gi0ru2guu8y2sRZs5RmA=; b=4exMVJ4xzbDXC65KXMLDO8sJeX/DSsbUp2hf1w0Dv6pU91zrS6Osgwql3mmUi6my0DL13QSh7 VXf/l+EKB0oDAgK0QRc6WSqWYrnUbsMoyXBAkkUFB+hNy9WFwuZt+Y5 X-Developer-Key: i=dfustini@tenstorrent.com; a=ed25519; pk=p3GKE9XFmjhwAayAHG4U108yag7V8xQVd4zJLdW0g7g= Add node for the AP_SUBSYS clock controller on the T-Head TH1520 SoC. Link: https://openbeagle.org/beaglev-ahead/beaglev-ahead/-/blob/main/docs/TH1520%20System%20User%20Manual.pdf Signed-off-by: Drew Fustini --- arch/riscv/boot/dts/thead/th1520.dtsi | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/riscv/boot/dts/thead/th1520.dtsi b/arch/riscv/boot/dts/thead/th1520.dtsi index d2fa25839012..e193f8d9ab8a 100644 --- a/arch/riscv/boot/dts/thead/th1520.dtsi +++ b/arch/riscv/boot/dts/thead/th1520.dtsi @@ -5,6 +5,7 @@ */ #include +#include / { compatible = "thead,th1520"; @@ -161,6 +162,14 @@ soc { dma-noncoherent; ranges; + clk: clock-controller@ffef010000 { + compatible = "thead,th1520-clk-ap"; + reg = <0xff 0xef010000 0x0 0x1000>; + clocks = <&osc>; + clock-names = "osc"; + #clock-cells = <1>; + }; + plic: interrupt-controller@ffd8000000 { compatible = "thead,th1520-plic", "thead,c900-plic"; reg = <0xff 0xd8000000 0x0 0x01000000>; From patchwork Tue May 7 04:55:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 13656250 Received: from mail-yw1-f178.google.com (mail-yw1-f178.google.com [209.85.128.178]) (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 05DE76E614 for ; Tue, 7 May 2024 04:57:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057859; cv=none; b=cIdFijj6diN5ufyRUU6Lu4qZssKR2AJnMxWRtaxFmZRZwt2keUIsqn7Gr+sKdfO8/W+wusKgOnObNOfR0Hc36bbCQLrQnmNda8w9INz1Yug8T4HEHDTa+1fO5x3aWsLi925ltOa9QvW0gyw3lu5CFzuP5y4VFdL+N6LcWwfC1z8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057859; c=relaxed/simple; bh=52sEPjDrM2eROoC2nwe3EiBnyP8Dcq8Rt5meeISouww=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TWDthu0ZqIYgSNBFdDOM+ZOlNDZXWbrd6rmNPsPijH1K1ZRlytZyonzhVGnBxsEDJ0C9v2u5N6L7ZJlMLSS+x2FQ573uTA4heM8qDhb/uF4m9ehQJgaTClxTrvvrQvlQ+NeUHLF9QJAp23k1r65+flj8zuH3C6BOUth5LH0+t7k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com; spf=pass smtp.mailfrom=tenstorrent.com; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b=GCFBDfoU; arc=none smtp.client-ip=209.85.128.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b="GCFBDfoU" Received: by mail-yw1-f178.google.com with SMTP id 00721157ae682-61be4b9869dso28429907b3.1 for ; Mon, 06 May 2024 21:57:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tenstorrent.com; s=google; t=1715057856; x=1715662656; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=lV76EE0lGVh0xzAlFnhOqZDL/IraInUMutR8RQKZJGs=; b=GCFBDfoUU99n51+rVxpgK1dhimTAVosBYe76vQ3eOgGOrU0HRFG/8fRt1tvs1VPtkd cgDHwxyfVhShe49vL1jgfdItjoPGUnbwUx2hukBVwVBmw/hDFZ8Zj+qDQIFm2kZP/Fb+ J1CvdQgqJJHepwyK82jTc1eaV0XCeK3fXzqwxLkdW8yzfDXD4orr9ZiT5DX7sc0mDvfv u8gQoGxp6x/eEw7Q9syzgOkBQf+M+du8Z33YVjvEu9E/rtCbF1/tEviP/ZZfBTBG1hWA KSQxFWd1kvrycS6Fezj88wBiGaRv2e6+QN/QfojaDJaOrUb8xxwa0L8eQbp3WltGQ1tw 5Cng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715057856; x=1715662656; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lV76EE0lGVh0xzAlFnhOqZDL/IraInUMutR8RQKZJGs=; b=FPcN56gsbDlWiXJyNujtBOz47amlHSwidoFZwGQanNf+jw/86WFxwjUkaJ3Szxk7AX R/swKhPPWY8Kp6AR7Id5w27ZftS+pgb37A9cZY7Vo7sZ4Q533Zs2MivYWQ8jy8lf4Jgd kU4u7nXpncMFe7GWuTTB9KAuLvsCbBtGPfRwWuJvFXgHDkVRoyCMRq6Ef8TRaqJiSpe/ YwHjwPASGVYrneblgGzkaU/dfHex1xX3N9n8DhVWC5cJ+iZeemVDHgR2FRg2PJFMoyjt MpfsySD/SAHXmL5XZM+xhd/Tyc9y68yv6rz4UJIzKHN2C/rNEIRgGkW0dOU7hsn5UJJV Yrqw== X-Forwarded-Encrypted: i=1; AJvYcCUtUkhddPEIgzyKjwD/bVMS/H8/WRsxvY4NgGB83Tij8wZ+fYq40BlKq+OWBLnhT5KB2tAsUIfSKxfSes/C34RV6siSJTAMCuJF X-Gm-Message-State: AOJu0YwL7nmHcwtJVE1p4GC7xviposPONAyrC9isVEu3y76KI9Fp1C+7 4MPKOJ7jhm+YmxGdIb5Mk8miG6KaQZ5PzdW43kfqLiuRc7VUk7GU9S98IV+ciXw= X-Google-Smtp-Source: AGHT+IHn3CGUiKT0eCJa4EZLbe1UYY3849cLrpLUve0RTVfZ9uR7rnnwR8WOzgqSjFGllwczviF4tg== X-Received: by 2002:a0d:d883:0:b0:61e:124c:e73b with SMTP id a125-20020a0dd883000000b0061e124ce73bmr11735126ywe.28.1715057855467; Mon, 06 May 2024 21:57:35 -0700 (PDT) Received: from [127.0.1.1] ([2601:1c2:1802:170:6870:7119:e255:c3a0]) by smtp.gmail.com with ESMTPSA id o14-20020a637e4e000000b005f80aced5f3sm8987249pgn.0.2024.05.06.21.57.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 21:57:35 -0700 (PDT) From: Drew Fustini Date: Mon, 06 May 2024 21:55:18 -0700 Subject: [PATCH RFC v3 5/7] riscv: dts: thead: change TH1520 uart nodes to use clock controller Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240506-th1520-clk-v3-5-085a18a23a7f@tenstorrent.com> References: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> In-Reply-To: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> To: Jisheng Zhang , Guo Ren , Fu Wei , Yangtao Li , Thomas Bonnefille , Emil Renner Berthing , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-riscv@lists.infradead.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Drew Fustini X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1715057849; l=4110; i=dfustini@tenstorrent.com; s=20230430; h=from:subject:message-id; bh=52sEPjDrM2eROoC2nwe3EiBnyP8Dcq8Rt5meeISouww=; b=HmEeRhWb790IkFfO3C5BC2jB3AYXLPWOY7mhRD44oal2XW7/ZwuGHe1i92UCCZqb4bhapFIyY XN1gFmAudK9C5BUsbr5GFCWbE0xZbA90aO1ILnVV4OMXti18mT5HORG X-Developer-Key: i=dfustini@tenstorrent.com; a=ed25519; pk=p3GKE9XFmjhwAayAHG4U108yag7V8xQVd4zJLdW0g7g= Change the clock property in TH1520 uart nodes to a clock provided by AP_SUBSYS clock controller. Signed-off-by: Drew Fustini --- arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts | 4 ---- .../boot/dts/thead/th1520-lichee-module-4a.dtsi | 4 ---- arch/riscv/boot/dts/thead/th1520.dtsi | 24 +++++++++++----------- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts b/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts index d9b4de9e4757..164afd18b56c 100644 --- a/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts +++ b/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts @@ -52,10 +52,6 @@ &sdhci_clk { clock-frequency = <198000000>; }; -&uart_sclk { - clock-frequency = <100000000>; -}; - &dmac0 { status = "okay"; }; diff --git a/arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi b/arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi index 1365d3a512a3..1b7ede570994 100644 --- a/arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi +++ b/arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi @@ -33,10 +33,6 @@ &sdhci_clk { clock-frequency = <198000000>; }; -&uart_sclk { - clock-frequency = <100000000>; -}; - &dmac0 { status = "okay"; }; diff --git a/arch/riscv/boot/dts/thead/th1520.dtsi b/arch/riscv/boot/dts/thead/th1520.dtsi index e193f8d9ab8a..963c786f3c53 100644 --- a/arch/riscv/boot/dts/thead/th1520.dtsi +++ b/arch/riscv/boot/dts/thead/th1520.dtsi @@ -141,12 +141,6 @@ apb_clk: apb-clk-clock { #clock-cells = <0>; }; - uart_sclk: uart-sclk-clock { - compatible = "fixed-clock"; - clock-output-names = "uart_sclk"; - #clock-cells = <0>; - }; - sdhci_clk: sdhci-clock { compatible = "fixed-clock"; clock-frequency = <198000000>; @@ -196,7 +190,8 @@ uart0: serial@ffe7014000 { compatible = "snps,dw-apb-uart"; reg = <0xff 0xe7014000 0x0 0x100>; interrupts = <36 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&uart_sclk>; + clocks = <&clk CLK_UART_SCLK>, <&clk CLK_UART0_PCLK>; + clock-names = "baudclk", "apb_pclk"; reg-shift = <2>; reg-io-width = <4>; status = "disabled"; @@ -233,7 +228,8 @@ uart1: serial@ffe7f00000 { compatible = "snps,dw-apb-uart"; reg = <0xff 0xe7f00000 0x0 0x100>; interrupts = <37 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&uart_sclk>; + clocks = <&clk CLK_UART_SCLK>, <&clk CLK_UART1_PCLK>; + clock-names = "baudclk", "apb_pclk"; reg-shift = <2>; reg-io-width = <4>; status = "disabled"; @@ -243,7 +239,8 @@ uart3: serial@ffe7f04000 { compatible = "snps,dw-apb-uart"; reg = <0xff 0xe7f04000 0x0 0x100>; interrupts = <39 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&uart_sclk>; + clocks = <&clk CLK_UART_SCLK>, <&clk CLK_UART3_PCLK>; + clock-names = "baudclk", "apb_pclk"; reg-shift = <2>; reg-io-width = <4>; status = "disabled"; @@ -325,7 +322,8 @@ uart2: serial@ffec010000 { compatible = "snps,dw-apb-uart"; reg = <0xff 0xec010000 0x0 0x4000>; interrupts = <38 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&uart_sclk>; + clocks = <&clk CLK_UART_SCLK>, <&clk CLK_UART2_PCLK>; + clock-names = "baudclk", "apb_pclk"; reg-shift = <2>; reg-io-width = <4>; status = "disabled"; @@ -387,7 +385,8 @@ uart4: serial@fff7f08000 { compatible = "snps,dw-apb-uart"; reg = <0xff 0xf7f08000 0x0 0x4000>; interrupts = <40 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&uart_sclk>; + clocks = <&clk CLK_UART_SCLK>, <&clk CLK_UART4_PCLK>; + clock-names = "baudclk", "apb_pclk"; reg-shift = <2>; reg-io-width = <4>; status = "disabled"; @@ -397,7 +396,8 @@ uart5: serial@fff7f0c000 { compatible = "snps,dw-apb-uart"; reg = <0xff 0xf7f0c000 0x0 0x4000>; interrupts = <41 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&uart_sclk>; + clocks = <&clk CLK_UART_SCLK>, <&clk CLK_UART5_PCLK>; + clock-names = "baudclk", "apb_pclk"; reg-shift = <2>; reg-io-width = <4>; status = "disabled"; From patchwork Tue May 7 04:55:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 13656251 Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com [209.85.161.53]) (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 614E26EB75 for ; Tue, 7 May 2024 04:57:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057859; cv=none; b=FlxdTFEbUpW2O8qlTiRRvumIUHqB775g+FPSLJjHe+4lc56OcHMkBSjs1vBNfrzkJ97tgNuaIgHheFDI3m5G2aJkUlrOHM1Pv9UjuqYZBFDB5VnZ9ItW2+0rOeFl4KHVpOquX/m1+TS/tH68tRk50ufZrmCjDriE/GiojqGf8dA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057859; c=relaxed/simple; bh=OUFR3qpXcXj7TePvrKOEf7IaTgZBtQzS5Gcb0JSxYYc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JhDpQwMIvNKFB4d+4FQb+bPtmdXATJZ8U7m5YRxma4H3cOxz8Dv3vMkO91Rrg9m51uz6wDUPIwz4Mj1rVMux+sRXwPEahq9QH4hq7f7WTW/kUzGY/2UPHjPu49MvMgB4ZlensA0tHmkG6I9rFtiNTAKioWEUn/3UEGFGY7kqoUs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com; spf=pass smtp.mailfrom=tenstorrent.com; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b=baibC2nB; arc=none smtp.client-ip=209.85.161.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b="baibC2nB" Received: by mail-oo1-f53.google.com with SMTP id 006d021491bc7-5aa20adda1dso1911812eaf.1 for ; Mon, 06 May 2024 21:57:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tenstorrent.com; s=google; t=1715057856; x=1715662656; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ja0fFObIKrPPvbAU5aagsD2alb53+cRkDTlbcB+NuL8=; b=baibC2nBlF1ga6nvLwEJTJHjMXkSog88arQJkUsK4p82Ew/2XeRIWBBjP8QE4i5aMm Je3HTsGaegI2c75nrbiRlvECeFUywaQ3RmtUbpBMs0UZ5gJIFQBN5CzbY+meMLvIWq8W mmc5fhSMRFImTd09RwD4FzdcYkKarrUfwUtMC0+ztlQSClehgPMI8EAFTUFqHVe+lfN4 EM7CXY4K56fKPzBZl7bcZOjnfnTIoM0JZkVst0+KE+v87TXV2V3YoFqIhrhCC+BFrfsy qxFJ/fClbiwxY1iWWrhPZeKYZKM6H86ml79gadFzhP/A6eeDQ7VyXgv5Rf/ij4/BDOrr o6Mg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715057856; x=1715662656; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ja0fFObIKrPPvbAU5aagsD2alb53+cRkDTlbcB+NuL8=; b=Wz414+DPR7JW9gkcMRsEG51B+I0xUsu9eFYMAQpLOySk2vwD5kbpq9OJfgOSpoiya5 j7sZ5zQsV++nk8XbWnHBD9HREqCuc9iQ+GmnhKe/cWyxOvqfXAgLUHV0ZRfFCZN2OOGS LvzRu4yFKTdHwe2qrU6YYJIBOtyUKCH9mPK1DbfhuZdzsl6kxBeWVkpq6FP2+Xd25xoN fgYsSC8NIpCqpQGu7g7yldnvm1qtHIwQmokVLrmiJS72akx1Qawrk/kdNMApTnwV0Azi 8Boa0GpIFcYxsNJ1k5RlcPZxaEojWm5oikwHXaW30zZr6kOGtSfyQrIvjQPVm3PQOi6T G0Xw== X-Forwarded-Encrypted: i=1; AJvYcCWZNpXunJ9+ZotUFEspgj/ThDp5QF5MzuOZAeN63opOMqbIFvIdwVycC1L1DN/FUZ+XbWjeTD8MMvKrKInMdLBtaHtQjP2Iq6s6 X-Gm-Message-State: AOJu0YxAo67biDP+ZdfG37p8xbUNfuxzOMdTxBQiLa8xptEGmsZFy2Gk nYEvysgsVtXf9umkEm+9Pedjd7hEVASBkSzjAY35i8jAvmxxEfGGt4xAYhUNfYCZdcU9u5gHiP/ k X-Google-Smtp-Source: AGHT+IGms+tcwn3hJYeU5F0/M05vXw2h9WN1d1+wEKWQtzbHSyyHCzfL5c+o38RpzC+GO+Rn405Gyg== X-Received: by 2002:a05:6359:f8a:b0:18a:8e58:b992 with SMTP id hx10-20020a0563590f8a00b0018a8e58b992mr20617603rwb.28.1715057856455; Mon, 06 May 2024 21:57:36 -0700 (PDT) Received: from [127.0.1.1] ([2601:1c2:1802:170:6870:7119:e255:c3a0]) by smtp.gmail.com with ESMTPSA id o14-20020a637e4e000000b005f80aced5f3sm8987249pgn.0.2024.05.06.21.57.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 21:57:36 -0700 (PDT) From: Drew Fustini Date: Mon, 06 May 2024 21:55:19 -0700 Subject: [PATCH RFC v3 6/7] riscv: dts: thead: change TH1520 mmc nodes to use clock controller Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240506-th1520-clk-v3-6-085a18a23a7f@tenstorrent.com> References: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> In-Reply-To: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> To: Jisheng Zhang , Guo Ren , Fu Wei , Yangtao Li , Thomas Bonnefille , Emil Renner Berthing , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-riscv@lists.infradead.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Drew Fustini X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1715057849; l=2852; i=dfustini@tenstorrent.com; s=20230430; h=from:subject:message-id; bh=OUFR3qpXcXj7TePvrKOEf7IaTgZBtQzS5Gcb0JSxYYc=; b=iNarSOopWZV22F1WTSuygcpwGBUXFmpXfraZzMxIY0BKPrRyPthQNT34GelMdfKFz4c4M4PLj e+PrCy1ghpfDUt8tgw2ezv2sWsYMcU8xsnYX8yVasA66jKVcOZZeh0f X-Developer-Key: i=dfustini@tenstorrent.com; a=ed25519; pk=p3GKE9XFmjhwAayAHG4U108yag7V8xQVd4zJLdW0g7g= Change the clock property in the TH1520 mmc controller nodes to a clock provided by AP_SYS clock controller. Remove sdhci fixed clock reference from BeagleV Ahead and LPI4a dts. Signed-off-by: Drew Fustini --- arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts | 4 ---- arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi | 4 ---- arch/riscv/boot/dts/thead/th1520.dtsi | 13 +++---------- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts b/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts index 164afd18b56c..55f1ed0cb433 100644 --- a/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts +++ b/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts @@ -48,10 +48,6 @@ &apb_clk { clock-frequency = <62500000>; }; -&sdhci_clk { - clock-frequency = <198000000>; -}; - &dmac0 { status = "okay"; }; diff --git a/arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi b/arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi index 1b7ede570994..762eceb415f8 100644 --- a/arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi +++ b/arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi @@ -29,10 +29,6 @@ &apb_clk { clock-frequency = <62500000>; }; -&sdhci_clk { - clock-frequency = <198000000>; -}; - &dmac0 { status = "okay"; }; diff --git a/arch/riscv/boot/dts/thead/th1520.dtsi b/arch/riscv/boot/dts/thead/th1520.dtsi index 963c786f3c53..cf2141c3976f 100644 --- a/arch/riscv/boot/dts/thead/th1520.dtsi +++ b/arch/riscv/boot/dts/thead/th1520.dtsi @@ -141,13 +141,6 @@ apb_clk: apb-clk-clock { #clock-cells = <0>; }; - sdhci_clk: sdhci-clock { - compatible = "fixed-clock"; - clock-frequency = <198000000>; - clock-output-names = "sdhci_clk"; - #clock-cells = <0>; - }; - soc { compatible = "simple-bus"; interrupt-parent = <&plic>; @@ -201,7 +194,7 @@ emmc: mmc@ffe7080000 { compatible = "thead,th1520-dwcmshc"; reg = <0xff 0xe7080000 0x0 0x10000>; interrupts = <62 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&sdhci_clk>; + clocks = <&clk CLK_EMMC_SDIO>; clock-names = "core"; status = "disabled"; }; @@ -210,7 +203,7 @@ sdio0: mmc@ffe7090000 { compatible = "thead,th1520-dwcmshc"; reg = <0xff 0xe7090000 0x0 0x10000>; interrupts = <64 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&sdhci_clk>; + clocks = <&clk CLK_EMMC_SDIO>; clock-names = "core"; status = "disabled"; }; @@ -219,7 +212,7 @@ sdio1: mmc@ffe70a0000 { compatible = "thead,th1520-dwcmshc"; reg = <0xff 0xe70a0000 0x0 0x10000>; interrupts = <71 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&sdhci_clk>; + clocks = <&clk CLK_EMMC_SDIO>; clock-names = "core"; status = "disabled"; }; From patchwork Tue May 7 04:55:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Drew Fustini X-Patchwork-Id: 13656252 Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.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 4E6C06BFAA for ; Tue, 7 May 2024 04:57:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057860; cv=none; b=mrLdSHMpwPyGju02qxPOE/hOPAGBDQpXbN8HbJFOFXIhbPT/eltuRL8FxB8YlH/C06cv0phVY2ZtzvU/EBcwUqsfdYrlewbjoUZs/6lX/W7/F2NUwKsgTJRwEQaJZd3ATZpsJ+AI9YYw9AHGX4+2vKC8lfXsqVVnUeoDydL6C04= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715057860; c=relaxed/simple; bh=uoSZcE5Xsilp2h5kGfeS4a/3IqaGYxAdmgKgnxrBUNU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uIuXlawQFfr9sw7TxSqgnVldDklosMOANyps4CweWgUSf8LUTCcN+2uV9oJZgi7sARaDDESFjp3+/tHmxCPA1CkTaxgobuZzyjfRT8Y7LWx4alG9F+GbyuqnRsMuHGa94NrPnWWZx4H9reaRq+9EpxrNOOZzlXG3cqRl4MaEJng= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com; spf=pass smtp.mailfrom=tenstorrent.com; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b=f+T8K9QX; arc=none smtp.client-ip=209.85.210.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=tenstorrent.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=tenstorrent.com header.i=@tenstorrent.com header.b="f+T8K9QX" Received: by mail-ot1-f51.google.com with SMTP id 46e09a7af769-6f0442816e7so1159383a34.2 for ; Mon, 06 May 2024 21:57:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tenstorrent.com; s=google; t=1715057857; x=1715662657; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=H2lHWLueNqka2AOPVIme5EVkkFZiGfvJi+3KgwWaTVY=; b=f+T8K9QXa+YaVglHch31/iPrzzedmDT1m01HWO2oUMALlURQz2kvCuFhg4FzizbsxS ryZlWVaBm+DoCajCWJ4Lrdfplg3JgN8swDJS/mCRV6EIvcn4SW8bg30aRl2K3LSL719M 0Im6kMAhvzuSiJYq2hDc7g6zgmTN03T7jsnKGiMl7vp94u5WfcX9ciettnTCzyy0g+o1 Sqs9TjZNPEZCpDmT9xRR6a/OpiQfUAeI6wdwEejGUeA2AzxVW+LM57tO1Y8g2j6HhEVg zVBjQY8tBB29C+vWHXBJKLx9p3LmTFjTWZDR1pdw7M2YY+kE226lP+UslHwMD32TnBTh Rk0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715057857; x=1715662657; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H2lHWLueNqka2AOPVIme5EVkkFZiGfvJi+3KgwWaTVY=; b=LNGBvpWTAywsRPkjUX8w3S3hEl1UF7boPx2bkMV+u9PDnmoSWVgrk8fsSxVB5hql6P 2YZ5uSpYzfV0SX0EjB5aUr9DN5FpZSPJk//e+QJLouGjxgg9Ysu4N6/qzdlrrMshD57k IYvbJhJJk4rgSvX1sVUqKa0TQlfiBpKBKkzoqyuhZytQmRLb0Rqurgi2cAWhZMzftT7M CR4LdGKu8g8169jcY8lD1nk049xXW7qX6bmWOynKkHlW/fTe4U9vXoswLDgw/xfz5klA KnIgtTjOqdkNEv/cUdgOvTnp0sVoIWmMMK82Lg3MVMfy6du00unPKH4SlfJ+dCAYcxWK J/jA== X-Forwarded-Encrypted: i=1; AJvYcCXHRsw2UWm4dYknaRQMbtFsM3134ejKp63XVX+UT4O5Er+dZQVdp4kC06Y0hQHvjCN5L/y2DtJk76U+Ad3xochNBv7O8ITxLMIY X-Gm-Message-State: AOJu0Yy+UlRzJqFA6I2oLJl1x1mGsZ7SslHVPfR/4BlwI5wBJyPJPK7+ X14YOOaf7+9LHUVuXHuXH7qLcprotc5VdDRdlibZSvv7OM9tOmRSDZA3Xpq29ZA= X-Google-Smtp-Source: AGHT+IHeM+LZlAASDgAgZoJYi6IfqhYsJvdtMF0w6gMHjoszi7FeDpQTCR5RBlOwPb4z0zSfsEZQvQ== X-Received: by 2002:a9d:66c3:0:b0:6ef:9159:8915 with SMTP id t3-20020a9d66c3000000b006ef91598915mr13321544otm.37.1715057857495; Mon, 06 May 2024 21:57:37 -0700 (PDT) Received: from [127.0.1.1] ([2601:1c2:1802:170:6870:7119:e255:c3a0]) by smtp.gmail.com with ESMTPSA id o14-20020a637e4e000000b005f80aced5f3sm8987249pgn.0.2024.05.06.21.57.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 21:57:37 -0700 (PDT) From: Drew Fustini Date: Mon, 06 May 2024 21:55:20 -0700 Subject: [PATCH RFC v3 7/7] riscv: dts: thead: update TH1520 dma and timer nodes to use clock controller Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240506-th1520-clk-v3-7-085a18a23a7f@tenstorrent.com> References: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> In-Reply-To: <20240506-th1520-clk-v3-0-085a18a23a7f@tenstorrent.com> To: Jisheng Zhang , Guo Ren , Fu Wei , Yangtao Li , Thomas Bonnefille , Emil Renner Berthing , Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Paul Walmsley , Palmer Dabbelt , Albert Ou Cc: linux-riscv@lists.infradead.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Drew Fustini X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1715057849; l=4851; i=dfustini@tenstorrent.com; s=20230430; h=from:subject:message-id; bh=uoSZcE5Xsilp2h5kGfeS4a/3IqaGYxAdmgKgnxrBUNU=; b=BifQO2sCcHe9fBTRk7kaehpgYjaAujHk0VCVti7HuFvmS4vxrzgImnYMt0/hjY1s2xpIUoVAI 3VNZYMYtEGwCH+FsfP6I8l3tUiDWT1Vg/QZawgOwqZNahnDphwqvTET X-Developer-Key: i=dfustini@tenstorrent.com; a=ed25519; pk=p3GKE9XFmjhwAayAHG4U108yag7V8xQVd4zJLdW0g7g= Change the dma-controller and timer nodes to use the APB clock provided by the AP_SUBSYS clock controller. Remove apb_clk reference from BeagleV Ahead and LPI4a dts. Signed-off-by: Drew Fustini --- arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts | 4 ---- .../boot/dts/thead/th1520-lichee-module-4a.dtsi | 4 ---- arch/riscv/boot/dts/thead/th1520.dtsi | 24 ++++++++-------------- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts b/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts index 55f1ed0cb433..1180e41c7b07 100644 --- a/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts +++ b/arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts @@ -44,10 +44,6 @@ &osc_32k { clock-frequency = <32768>; }; -&apb_clk { - clock-frequency = <62500000>; -}; - &dmac0 { status = "okay"; }; diff --git a/arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi b/arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi index 762eceb415f8..78977bdbbe3d 100644 --- a/arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi +++ b/arch/riscv/boot/dts/thead/th1520-lichee-module-4a.dtsi @@ -25,10 +25,6 @@ &osc_32k { clock-frequency = <32768>; }; -&apb_clk { - clock-frequency = <62500000>; -}; - &dmac0 { status = "okay"; }; diff --git a/arch/riscv/boot/dts/thead/th1520.dtsi b/arch/riscv/boot/dts/thead/th1520.dtsi index cf2141c3976f..34bd58b45baa 100644 --- a/arch/riscv/boot/dts/thead/th1520.dtsi +++ b/arch/riscv/boot/dts/thead/th1520.dtsi @@ -135,12 +135,6 @@ osc_32k: 32k-oscillator { #clock-cells = <0>; }; - apb_clk: apb-clk-clock { - compatible = "fixed-clock"; - clock-output-names = "apb_clk"; - #clock-cells = <0>; - }; - soc { compatible = "simple-bus"; interrupt-parent = <&plic>; @@ -326,7 +320,7 @@ dmac0: dma-controller@ffefc00000 { compatible = "snps,axi-dma-1.01a"; reg = <0xff 0xefc00000 0x0 0x1000>; interrupts = <27 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&apb_clk>, <&apb_clk>; + clocks = <&clk CLK_PERI_APB_PCLK>, <&clk CLK_PERI_APB_PCLK>; clock-names = "core-clk", "cfgr-clk"; #dma-cells = <1>; dma-channels = <4>; @@ -341,7 +335,7 @@ dmac0: dma-controller@ffefc00000 { timer0: timer@ffefc32000 { compatible = "snps,dw-apb-timer"; reg = <0xff 0xefc32000 0x0 0x14>; - clocks = <&apb_clk>; + clocks = <&clk CLK_PERI_APB_PCLK>; clock-names = "timer"; interrupts = <16 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; @@ -350,7 +344,7 @@ timer0: timer@ffefc32000 { timer1: timer@ffefc32014 { compatible = "snps,dw-apb-timer"; reg = <0xff 0xefc32014 0x0 0x14>; - clocks = <&apb_clk>; + clocks = <&clk CLK_PERI_APB_PCLK>; clock-names = "timer"; interrupts = <17 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; @@ -359,7 +353,7 @@ timer1: timer@ffefc32014 { timer2: timer@ffefc32028 { compatible = "snps,dw-apb-timer"; reg = <0xff 0xefc32028 0x0 0x14>; - clocks = <&apb_clk>; + clocks = <&clk CLK_PERI_APB_PCLK>; clock-names = "timer"; interrupts = <18 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; @@ -368,7 +362,7 @@ timer2: timer@ffefc32028 { timer3: timer@ffefc3203c { compatible = "snps,dw-apb-timer"; reg = <0xff 0xefc3203c 0x0 0x14>; - clocks = <&apb_clk>; + clocks = <&clk CLK_PERI_APB_PCLK>; clock-names = "timer"; interrupts = <19 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; @@ -399,7 +393,7 @@ uart5: serial@fff7f0c000 { timer4: timer@ffffc33000 { compatible = "snps,dw-apb-timer"; reg = <0xff 0xffc33000 0x0 0x14>; - clocks = <&apb_clk>; + clocks = <&clk CLK_PERI_APB_PCLK>; clock-names = "timer"; interrupts = <20 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; @@ -408,7 +402,7 @@ timer4: timer@ffffc33000 { timer5: timer@ffffc33014 { compatible = "snps,dw-apb-timer"; reg = <0xff 0xffc33014 0x0 0x14>; - clocks = <&apb_clk>; + clocks = <&clk CLK_PERI_APB_PCLK>; clock-names = "timer"; interrupts = <21 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; @@ -417,7 +411,7 @@ timer5: timer@ffffc33014 { timer6: timer@ffffc33028 { compatible = "snps,dw-apb-timer"; reg = <0xff 0xffc33028 0x0 0x14>; - clocks = <&apb_clk>; + clocks = <&clk CLK_PERI_APB_PCLK>; clock-names = "timer"; interrupts = <22 IRQ_TYPE_LEVEL_HIGH>; status = "disabled"; @@ -426,7 +420,7 @@ timer6: timer@ffffc33028 { timer7: timer@ffffc3303c { compatible = "snps,dw-apb-timer"; reg = <0xff 0xffc3303c 0x0 0x14>; - clocks = <&apb_clk>; + clocks = <&clk CLK_PERI_APB_PCLK>; clock-names = "timer"; interrupts = <23 IRQ_TYPE_LEVEL_HIGH>; status = "disabled";