From patchwork Mon Jun 12 17:13:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 106721 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp25039vqr; Mon, 12 Jun 2023 10:30:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6R741UDfRDV22h0Bfnvz4BOI6ccX5cAK2s5cxr1XK8Do00ZKKu6FkA+sO0aUY3EByP7O/C X-Received: by 2002:a05:6a21:6da3:b0:109:38b4:a210 with SMTP id wl35-20020a056a216da300b0010938b4a210mr11500019pzb.29.1686591038557; Mon, 12 Jun 2023 10:30:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686591038; cv=none; d=google.com; s=arc-20160816; b=wesOAlPLFf9y6Z3l0MymQoWOryCSDo/oLXl6UJXazTvOz7VYp+Fh92uZhExKV2/PHS kaX+lMsu9cjwKKE7p+zB9A84L9J18DOFtQK/PQLifGEHNSMZ+gbZCRC3wEmjQxVU9Qri Zyy97z4ibG2aQwgTTmiM7z8sVsBpk61XnHrGTqEzt1XESNSVjJ5LWjqjtDzNAl8lZ8rh PdV7uQ6bnLZ/k/Y5LHqyf2th2jrI6TC0ENxznMcq+9JlYb1YWibypx/haBx735bsKD16 YMFVGOlXHCahmmnbD4IqIg8RE8XqgIjxDFWi265u95DhCAMrSnEi4AygGxgWQbJM0/MH cwAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=U0XZNa/VKcwfDZm7VvyC+RKbeGXWy/5h3Nn+H4l3zCU=; b=FnIhN4KAmhUD7oQDIye8Oy6yUAJnbRiTjLJpkHSceUn4GBYQ4pegpnA/yyWZqwmpN8 Nc2tFSy+uFqKZFIjS9LlkmWmMf6oibNGABPcBL6cZOU6I+IGZCjElYKKbM5RdlgyFQr8 oVkePIp6URD3arEiSEPRcSFqCDzz3rIMFIqaWSiHbYVb2Md/DHIQdhcufgoVt0KRb75e 7FHY+LoI99ISpGa3fvDT93FycWrfPKeU0dTFAqLkdnd3UItYspu9qDPZ9CzHbQTHdaRn QQjuScCciv3deweEQSRX/O5xmcTNigFRK7F1oM4azUmq64rtfkvMzhfO9t1JS3Ufu18w K3EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=MikiQcRG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e22-20020aa79816000000b00658e15b952asi2368976pfl.213.2023.06.12.10.30.21; Mon, 12 Jun 2023 10:30:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=MikiQcRG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232230AbjFLRNt (ORCPT + 99 others); Mon, 12 Jun 2023 13:13:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233174AbjFLRNn (ORCPT ); Mon, 12 Jun 2023 13:13:43 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5C0C10D0; Mon, 12 Jun 2023 10:13:42 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-210-131.ewe-ip-backbone.de [91.248.210.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sre) by madras.collabora.co.uk (Postfix) with ESMTPSA id EC835660217A; Mon, 12 Jun 2023 18:13:40 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1686590021; bh=n54yxi0NbW+9j5w95zW2R5gmOueJZM48CLnOI1FoEB0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MikiQcRGOiFOSxmoBB/jq8DkOGToAcx9ny7kd5HyQLvOJjkUdEY7XMGZTAKrpavSG qGB4EsjoXVQDOiPUjGooYvCiiep7/d5jSuNjnxqj6WADEQLNRChE5HFXJ2edmEzcxG yWQ3+PEHRJ1NvULmUAnXYIyNTXScTFHb+7JAfAETjZP30wE6REdzg33bYru62aQcdT ZDgsGDA8Wbc2bhRyFokFJFRMsmtuSPeUSwIcht+pW8DK3ECzJDjsu9s+0X9w3gsTYj PxVcL1/D6Og+wgRyJVvqknab6ZAp9BIbYsyApKEZ5CYvHy6OGnVRRmfEjzPz7i5m2a EbVUzTjnrP6VA== Received: by jupiter.universe (Postfix, from userid 1000) id A3C8D4805B8; Mon, 12 Jun 2023 19:13:38 +0200 (CEST) From: Sebastian Reichel To: Heiko Stuebner Cc: Rob Herring , Krzysztof Kozlowski , Damien Le Moal , Serge Semin , Vinod Koul , Kishon Vijay Abraham I , linux-ide@vger.kernel.org, linux-phy@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , kernel@collabora.com, Krzysztof Kozlowski Subject: [PATCH v4 1/5] dt-bindings: ata: dwc-ahci: add PHY clocks Date: Mon, 12 Jun 2023 19:13:33 +0200 Message-Id: <20230612171337.74576-2-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230612171337.74576-1-sebastian.reichel@collabora.com> References: <20230612171337.74576-1-sebastian.reichel@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768518884986705544?= X-GMAIL-MSGID: =?utf-8?q?1768518884986705544?= Add PHY transmit and receive clocks as described by the DW SATA AHCI HW manual. Suggested-by: Serge Semin Reviewed-by: Serge Semin Reviewed-by: Krzysztof Kozlowski Signed-off-by: Sebastian Reichel --- .../devicetree/bindings/ata/snps,dwc-ahci-common.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/ata/snps,dwc-ahci-common.yaml b/Documentation/devicetree/bindings/ata/snps,dwc-ahci-common.yaml index c1457910520b..34c5bf65b02d 100644 --- a/Documentation/devicetree/bindings/ata/snps,dwc-ahci-common.yaml +++ b/Documentation/devicetree/bindings/ata/snps,dwc-ahci-common.yaml @@ -31,11 +31,11 @@ properties: PM-alive clock, RxOOB detection clock, embedded PHYs reference (Rx/Tx) clock, etc. minItems: 1 - maxItems: 4 + maxItems: 6 clock-names: minItems: 1 - maxItems: 4 + maxItems: 6 items: oneOf: - description: Application APB/AHB/AXI BIU clock @@ -48,6 +48,10 @@ properties: const: pmalive - description: RxOOB detection clock const: rxoob + - description: PHY Transmit Clock + const: asic + - description: PHY Receive Clock + const: rbc - description: SATA Ports reference clock const: ref From patchwork Mon Jun 12 17:13:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 106717 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp20724vqr; Mon, 12 Jun 2023 10:22:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5YazZeSOh+/QhVd3vx/sBHGoHpw3y2PAKkeQGXPFbijg7nXcv1RekrBFgUU4Fz0NUqpFV1 X-Received: by 2002:a05:6a00:21c9:b0:654:4989:f2b with SMTP id t9-20020a056a0021c900b0065449890f2bmr10592326pfj.1.1686590576400; Mon, 12 Jun 2023 10:22:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686590576; cv=none; d=google.com; s=arc-20160816; b=z+Sh48anbwH/z/DyZisWl8nBJ3b/YewQu8lhN318ymzto39WkYSVNt9C+DNpFFjK2e ymu/OD8eKstSdP4JGtvkjwP4Qy07UMOBIkIQOlsK25Q9Sbe1opfpqrs/CJHVm/eRQSRJ 6LQ3nMtxgfy7E+F7ZgCE2BnV6k3gAWTwszj76I6gwP1QtX5+hMEm2dt8gyRAAt2YyR+o CJU0ew2VQFeh4KP4aNGIVizAZ/SnPllprhtXhRifRl/yZyXwZXL6qq7Uhlc5peNGYbuj xBN38kKkgbI9xz+ViqsCcuQHDkcyZNubH419/y/G/md5iZhu1qijKjUWZOzL4qwOs0++ mwqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=LaYnnqwtLtyVMovcgbipzurM/HP+5Io5O2TxbPA3f3U=; b=WiScRw0ljIhQD+ByPuCcxPUAlm8on8Ph3xvtBAtGqiNROmSb0EkOTXN6VF7OhHFliR jSitTkGsR+VFZ5hWE1zJ8GJyM9AtNFTbFlQ8TB/azU6mdIiWIWOa+5shlvUIWU98R6Bf 965PowC55WFS+tEEXosSo33racDzTZSFhtL/qBF/AotVAOh4pDcK7PWqRcHg9buNvaBh eGwK4E5Jd13yDcz6rOBAZsQtA9FUiYjkiKGzZ6ZdMJX7ELGpREg3LU2iQhhDOiqoEKAo EheGH6s+AysLNdIH5eOTJjJjymrIlS98Rs74s8CUtNGGownF+D5Q/ogfgtouLPwVDxhz hyZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=gVEkaJp2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z10-20020aa7948a000000b0065a4bc8a998si7089955pfk.385.2023.06.12.10.22.42; Mon, 12 Jun 2023 10:22:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=gVEkaJp2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233336AbjFLROH (ORCPT + 99 others); Mon, 12 Jun 2023 13:14:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236948AbjFLRNp (ORCPT ); Mon, 12 Jun 2023 13:13:45 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03D7010E3; Mon, 12 Jun 2023 10:13:42 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-210-131.ewe-ip-backbone.de [91.248.210.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: sre) by madras.collabora.co.uk (Postfix) with ESMTPSA id 04B4B6606EBB; Mon, 12 Jun 2023 18:13:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1686590021; bh=VJpqZyVFrCk2SKOCiAs/vOmL6h0Sc0ZuNVY80eWQnII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gVEkaJp21zFOAxvtACw6eyLVWi+x2W932RzMN8czl7lpS4QRTRk6JLX8OsuelJ7q3 zyjf4NdvAygv0fgoBIqIZ8ZSPb810kjkuKf9xESkI8AB6nnpV+QlO0Ar7inSNZyvPk lPwX8kNAeyInhGxWkP4CPmBG/3wSsrTFVqpNxOJNPfOifVljB2e5ug5QfI5raXa3XU b8tqRIxYtzbr3wm2XeK33ScfkkzLJzKHmbwG6cdpvUVUmDIT19k/EXrWn3IfF0gDvC ojeIuKlsT2qyaOI6bSmiMrZEm/fqLXh1J/9/2FOc4kCes9C4IdOCyBJrClTFtKIyXV YHCnQd3Hd989g== Received: by jupiter.universe (Postfix, from userid 1000) id A57AE4807E1; Mon, 12 Jun 2023 19:13:38 +0200 (CEST) From: Sebastian Reichel To: Heiko Stuebner Cc: Rob Herring , Krzysztof Kozlowski , Damien Le Moal , Serge Semin , Vinod Koul , Kishon Vijay Abraham I , linux-ide@vger.kernel.org, linux-phy@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , kernel@collabora.com Subject: [PATCH v4 2/5] dt-bindings: ata: dwc-ahci: add Rockchip RK3588 Date: Mon, 12 Jun 2023 19:13:34 +0200 Message-Id: <20230612171337.74576-3-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230612171337.74576-1-sebastian.reichel@collabora.com> References: <20230612171337.74576-1-sebastian.reichel@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768518400031555031?= X-GMAIL-MSGID: =?utf-8?q?1768518400031555031?= This adds Rockchip RK3588 AHCI binding. In order to narrow down the allowed clocks without bloating the generic binding, the description of Rockchip's AHCI controllers has been moved to its own file. Signed-off-by: Sebastian Reichel Reviewed-by: Serge Semin Reviewed-by: Krzysztof Kozlowski --- .../bindings/ata/rockchip,dwc-ahci.yaml | 124 ++++++++++++++++++ .../bindings/ata/snps,dwc-ahci.yaml | 13 +- 2 files changed, 133 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml diff --git a/Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml b/Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml new file mode 100644 index 000000000000..b5e5767d8698 --- /dev/null +++ b/Documentation/devicetree/bindings/ata/rockchip,dwc-ahci.yaml @@ -0,0 +1,124 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/ata/rockchip,dwc-ahci.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Synopsys DWC AHCI SATA controller for Rockchip devices + +maintainers: + - Serge Semin + +description: + This document defines device tree bindings for the Synopsys DWC + implementation of the AHCI SATA controller found in Rockchip + devices. + +select: + properties: + compatible: + contains: + enum: + - rockchip,rk3568-dwc-ahci + - rockchip,rk3588-dwc-ahci + required: + - compatible + +properties: + compatible: + items: + - enum: + - rockchip,rk3568-dwc-ahci + - rockchip,rk3588-dwc-ahci + - const: snps,dwc-ahci + + ports-implemented: + const: 1 + + sata-port@0: + $ref: /schemas/ata/snps,dwc-ahci-common.yaml#/$defs/dwc-ahci-port + + properties: + reg: + const: 0 + + unevaluatedProperties: false + +patternProperties: + "^sata-port@[1-9a-e]$": false + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - ports-implemented + +allOf: + - $ref: snps,dwc-ahci-common.yaml# + - if: + properties: + compatible: + contains: + enum: + - rockchip,rk3588-dwc-ahci + then: + properties: + clocks: + maxItems: 5 + clock-names: + items: + - const: sata + - const: pmalive + - const: rxoob + - const: ref + - const: asic + - if: + properties: + compatible: + contains: + enum: + - rockchip,rk3568-dwc-ahci + then: + properties: + clocks: + maxItems: 3 + clock-names: + items: + - const: sata + - const: pmalive + - const: rxoob + +unevaluatedProperties: false + +examples: + - | + #include + #include + #include + #include + + sata@fe210000 { + compatible = "rockchip,rk3588-dwc-ahci", "snps,dwc-ahci"; + reg = <0xfe210000 0x1000>; + clocks = <&cru ACLK_SATA0>, <&cru CLK_PMALIVE0>, + <&cru CLK_RXOOB0>, <&cru CLK_PIPEPHY0_REF>, + <&cru CLK_PIPEPHY0_PIPE_ASIC_G>; + clock-names = "sata", "pmalive", "rxoob", "ref", "asic"; + interrupts = ; + ports-implemented = <0x1>; + #address-cells = <1>; + #size-cells = <0>; + + sata-port@0 { + reg = <0>; + hba-port-cap = ; + phys = <&combphy0_ps PHY_TYPE_SATA>; + phy-names = "sata-phy"; + snps,rx-ts-max = <32>; + snps,tx-ts-max = <32>; + }; + }; + +... diff --git a/Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml b/Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml index 5afa4b57ce20..4c848fcb5a5d 100644 --- a/Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml +++ b/Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml @@ -13,6 +13,15 @@ description: This document defines device tree bindings for the generic Synopsys DWC implementation of the AHCI SATA controller. +select: + properties: + compatible: + enum: + - snps,dwc-ahci + - snps,spear-ahci + required: + - compatible + allOf: - $ref: snps,dwc-ahci-common.yaml# @@ -23,10 +32,6 @@ properties: const: snps,dwc-ahci - description: SPEAr1340 AHCI SATA device const: snps,spear-ahci - - description: Rockhip RK3568 AHCI controller - items: - - const: rockchip,rk3568-dwc-ahci - - const: snps,dwc-ahci patternProperties: "^sata-port@[0-9a-e]$": From patchwork Mon Jun 12 17:13:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 106720 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp24955vqr; Mon, 12 Jun 2023 10:30:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7UNR/FC/K6QQZ8xt8mplfwgr8OeUNDz2X6Myvo7339/rVUX42CJ99608vMk/4tc6Mp38Js X-Received: by 2002:a17:902:ec8b:b0:1b0:3ab6:5133 with SMTP id x11-20020a170902ec8b00b001b03ab65133mr8670456plg.24.1686591031268; Mon, 12 Jun 2023 10:30:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686591031; cv=none; d=google.com; s=arc-20160816; b=hO4eMg9GzS4wVnwAN//Nm2zRyPNB0x//5F53UMn7MVlJhSXfdl3OTLWMQw0KBvMbWp DGuFbeRNq1gIsBC4OzchLys5aWYfbHTa1dEJzU3GQMIfiaDaP4hgEexzI5Txte+vp+Pw ColE7KAMPyZqAjO8OmuWI4L+OWJU2NlI7KXkIaIsZ6mPlFwjFafFls3rTGiVfRbygfZC 3qNYdeYzF8hcHM7td/3/XjzW+EanoU8gOqc8+A9n/bv3cyQHjzbAQzlpJPDeq63sqdyF ZUrxAXiZ8bYy6eck/y3SBg/2vke7kG+RTCcw/0mGhpG5EUMH010zHmdbuJQh1n7E2pKm c0Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QDM8H2zr3YoE/N01nmUrJHMIy+rGZ6z5vxLxMcGk9/A=; b=BxRRzLTG8Q0VvxVC1KFvDzucu129HkSq4PrgiLEIq3Hd2UIzElrR/6J3/Sqr/Chpx6 4WeLWREy4go74vkQ4MRxLoevG/ddz7P132QEA1cPf7IbDXmxFs2OGApmWtl3ttNdJtvu bgak0IbPbU8i/qfJTXmMx8Mehxt/wK0fIueCanQTLvVK+shgixJaI4vB+PX3rQPFUt04 WZM12TUjRx4BCSmn66O8IL1500m/ft+NFPLVQJEx/I6znWLCu1pwiDvcHDgFrVZTIMN4 7BIWsuiXlVLfjDIbay3LsrWYlIfKlooN9tzxc+YCBORJcPXhq0+682uF4NDIYQe6h/y9 GJ5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Dc25F4tg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j9-20020a170903024900b001afb1e9b2dfsi7315281plh.484.2023.06.12.10.30.12; Mon, 12 Jun 2023 10:30:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=Dc25F4tg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236772AbjFLRNw (ORCPT + 99 others); Mon, 12 Jun 2023 13:13:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233188AbjFLRNo (ORCPT ); Mon, 12 Jun 2023 13:13:44 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF37C10D3; Mon, 12 Jun 2023 10:13:42 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-210-131.ewe-ip-backbone.de [91.248.210.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sre) by madras.collabora.co.uk (Postfix) with ESMTPSA id 32D5A6606ED2; Mon, 12 Jun 2023 18:13:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1686590021; bh=D1KuKR+ZNBWiJnLkvJscHLEqZhzpGY7F8aiTg99e+O0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dc25F4tg8BzzDJwU/KA452v00Pk/TWG3XHaQOKWhZGngcDouQBUEUkzas1y2nshJ7 zlAEeK9IeRnWdrNZyfqCbblU2ZHNpdV+5ptXn81jsVhy1zIl4QxXny+Uc6OW9t8ZWW w3SBKC/zM4qcpHhOxfDIVMPIGAIeeuMjwPHBYZm3CB9WJJK4RpMxBWl7m857cfiZpj ryBUhF5wgKRbTu/ejLOzb7bYhweeGzIBnqY7fbn+uSbH9n9try7R+fPJ5sv4ZuMLys m2M0++IP5ZtTbBNHxccZxYQhbORXrO1UjoF6Iv/lZBKtzOPJtEEed5bcb6NZVWrIv7 Lgb3GIBjw28Sg== Received: by jupiter.universe (Postfix, from userid 1000) id A76CB4807E2; Mon, 12 Jun 2023 19:13:38 +0200 (CEST) From: Sebastian Reichel To: Heiko Stuebner Cc: Rob Herring , Krzysztof Kozlowski , Damien Le Moal , Serge Semin , Vinod Koul , Kishon Vijay Abraham I , linux-ide@vger.kernel.org, linux-phy@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , kernel@collabora.com, Krzysztof Kozlowski Subject: [PATCH v4 3/5] dt-bindings: phy: rockchip: rk3588 has two reset lines Date: Mon, 12 Jun 2023 19:13:35 +0200 Message-Id: <20230612171337.74576-4-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230612171337.74576-1-sebastian.reichel@collabora.com> References: <20230612171337.74576-1-sebastian.reichel@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768518877202735102?= X-GMAIL-MSGID: =?utf-8?q?1768518877202735102?= The RK3588 has two reset lines for the combphy. One for the APB interface and one for the actual PHY. Reviewed-by: Krzysztof Kozlowski Signed-off-by: Sebastian Reichel --- .../phy/phy-rockchip-naneng-combphy.yaml | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml b/Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml index 9ae514fa7533..d3cd7997879f 100644 --- a/Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml +++ b/Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml @@ -31,8 +31,14 @@ properties: - const: pipe resets: + minItems: 1 + maxItems: 2 + + reset-names: + minItems: 1 items: - - description: exclusive PHY reset line + - const: phy + - const: apb rockchip,enable-ssc: type: boolean @@ -78,6 +84,32 @@ required: - rockchip,pipe-phy-grf - "#phy-cells" +allOf: + - if: + properties: + compatible: + contains: + const: rockchip,rk3568-naneng-combphy + then: + properties: + resets: + maxItems: 1 + reset-names: + maxItems: 1 + - if: + properties: + compatible: + contains: + const: rockchip,rk3588-naneng-combphy + then: + properties: + resets: + minItems: 2 + reset-names: + minItems: 2 + required: + - reset-names + additionalProperties: false examples: From patchwork Mon Jun 12 17:13:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 106719 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp24944vqr; Mon, 12 Jun 2023 10:30:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ69uhDmHcRNPPEE5cFgMWR6rrxIm07cJqhnZ1OYa1TZOoCfS4UaR18sgTTpv7Zt6C8XAMi/ X-Received: by 2002:a05:6a00:138f:b0:65c:6881:d86c with SMTP id t15-20020a056a00138f00b0065c6881d86cmr10270769pfg.27.1686591030721; Mon, 12 Jun 2023 10:30:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686591030; cv=none; d=google.com; s=arc-20160816; b=aaoAT5krrXGvLcDJw+3DW25zIiL6pS2wecY9hbMWDjEW/J6SuwEECN+sEVI17dcfJn FNW8f4NP/M9xuF250g1xjTkAQI0EFNOkpbNSUZxzDsCF7Uoau+akmI6Ltf96csnME5L6 83knNkH5V1BTbaXED+l9dhtCc4+aJuMD4Ujkwz+rGUw/uVfiR63zDzTX3aHMzMBHNFiK 0DqYT/1fH3pLQmLR1WOQa7CKz8loP0NDWxr5aO/dYDbwYGccOE+EhcqgBIY2HJvGfWlM 8+zxqaZMqmZyEYQNLmWiFG6Rgr16kYWAsmZ7WIrwqwd+M8ZVW7DCADyZmlqylnH5lgk2 gkEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fyoRyggBeEFlQtPSMiEXKtO3UxhUbABzWFTvptKucSo=; b=0Pc7VciaI/xmCzD/RX77ymQ4ebM1m1ePInBuKBZxZUd26HihT9akM7MdSazDuLC85u EfPZxDQyCUWIX/HGCByPQI12h4WUwFoP5SeoKHQ/xadUYKn0ADKMVGT6soxQfZSMwOkg BV95GqX7uv/vm34UucVgFzNrlaVM+570mYtxfigpb1WYSbumpaVbbbwneNVfiTRYXxxa mTMUySMk90d6MFb5adFI2EPmHPtoEmlSSpCjH6ZwssmJppteq0AWjo/goEiXC39+4TxO O3h2iEPEM31F88muiVyOCcuYfV/vpO2Mvk0V3yZ3vEfy9bE962sPxqPtbMR79pY67LZb IlHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=RjCobkr+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d7-20020aa797a7000000b0064d3fb487cbsi7129664pfq.72.2023.06.12.10.30.08; Mon, 12 Jun 2023 10:30:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=RjCobkr+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235386AbjFLRN7 (ORCPT + 99 others); Mon, 12 Jun 2023 13:13:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232987AbjFLRNo (ORCPT ); Mon, 12 Jun 2023 13:13:44 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C129010D5; Mon, 12 Jun 2023 10:13:42 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-210-131.ewe-ip-backbone.de [91.248.210.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sre) by madras.collabora.co.uk (Postfix) with ESMTPSA id 379786606ED8; Mon, 12 Jun 2023 18:13:41 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1686590021; bh=51auYTRk2rmb/OCj/B4amurTw9Zrd8rSx4SmfWqBalc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RjCobkr+wtR194yCZS3lTknhUGX17QeL9U0W7leeJXxrFaVTU2EgECRQ7bpBawg9e TUm5vmMYyXqqPgReqU5agL05JI55d2CU+qy6YuNvUP7bFpmKmCjJQNCIlPZpk8QAp/ M9kDQJUQ34YVbJYGvdlioCsV/HsDiMiDfSTu5bhcpzrVcrLc59fDNLtsvL0jVDL7k5 bV9nxY2EQEffj0dxbQx9T0mKzfm6M9R7t2TZuS0cnfYwUCZTjVPDSWHmktraxMVmDc 2lD/yAD+uxZuEC5Nirr5CnnBHUXMfuALsm4mGH44IqeJYeWU4rpjhBUHjhcIUkohY8 5TcVJUiD4R1Kw== Received: by jupiter.universe (Postfix, from userid 1000) id A997C4807EF; Mon, 12 Jun 2023 19:13:38 +0200 (CEST) From: Sebastian Reichel To: Heiko Stuebner Cc: Rob Herring , Krzysztof Kozlowski , Damien Le Moal , Serge Semin , Vinod Koul , Kishon Vijay Abraham I , linux-ide@vger.kernel.org, linux-phy@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , kernel@collabora.com Subject: [PATCH v4 4/5] arm64: dts: rockchip: rk3588: add combo PHYs Date: Mon, 12 Jun 2023 19:13:36 +0200 Message-Id: <20230612171337.74576-5-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230612171337.74576-1-sebastian.reichel@collabora.com> References: <20230612171337.74576-1-sebastian.reichel@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768518876229914796?= X-GMAIL-MSGID: =?utf-8?q?1768518876229914796?= Add all 3 combo PHYs that can be found in RK3588. They are used for SATA, PCIe or USB3. Signed-off-by: Sebastian Reichel --- arch/arm64/boot/dts/rockchip/rk3588.dtsi | 21 ++++++++++++ arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 42 +++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588.dtsi b/arch/arm64/boot/dts/rockchip/rk3588.dtsi index 8be75556af8f..9d8539b5309b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588.dtsi @@ -7,6 +7,11 @@ #include "rk3588-pinctrl.dtsi" / { + pipe_phy1_grf: syscon@fd5c0000 { + compatible = "rockchip,rk3588-pipe-phy-grf", "syscon"; + reg = <0x0 0xfd5c0000 0x0 0x100>; + }; + i2s8_8ch: i2s@fddc8000 { compatible = "rockchip,rk3588-i2s-tdm"; reg = <0x0 0xfddc8000 0x0 0x1000>; @@ -123,4 +128,20 @@ gmac0_mtl_tx_setup: tx-queues-config { queue1 {}; }; }; + + combphy1_ps: phy@fee10000 { + compatible = "rockchip,rk3588-naneng-combphy"; + reg = <0x0 0xfee10000 0x0 0x100>; + #phy-cells = <1>; + clocks = <&cru CLK_REF_PIPE_PHY1>, <&cru PCLK_PCIE_COMBO_PIPE_PHY1>, + <&cru PCLK_PHP_ROOT>; + clock-names = "ref", "apb", "pipe"; + assigned-clocks = <&cru CLK_REF_PIPE_PHY1>; + assigned-clock-rates = <100000000>; + resets = <&cru SRST_REF_PIPE_PHY1>, <&cru SRST_P_PCIE2_PHY1>; + reset-names = "phy", "apb"; + rockchip,pipe-grf = <&php_grf>; + rockchip,pipe-phy-grf = <&pipe_phy1_grf>; + status = "disabled"; + }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 01058fed8f96..45ae457a22a4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -944,6 +944,16 @@ php_grf: syscon@fd5b0000 { reg = <0x0 0xfd5b0000 0x0 0x1000>; }; + pipe_phy0_grf: syscon@fd5bc000 { + compatible = "rockchip,rk3588-pipe-phy-grf", "syscon"; + reg = <0x0 0xfd5bc000 0x0 0x100>; + }; + + pipe_phy2_grf: syscon@fd5c4000 { + compatible = "rockchip,rk3588-pipe-phy-grf", "syscon"; + reg = <0x0 0xfd5c4000 0x0 0x100>; + }; + ioc: syscon@fd5f0000 { compatible = "rockchip,rk3588-ioc", "syscon"; reg = <0x0 0xfd5f0000 0x0 0x10000>; @@ -2371,6 +2381,38 @@ dmac2: dma-controller@fed10000 { #dma-cells = <1>; }; + combphy0_ps: phy@fee00000 { + compatible = "rockchip,rk3588-naneng-combphy"; + reg = <0x0 0xfee00000 0x0 0x100>; + #phy-cells = <1>; + clocks = <&cru CLK_REF_PIPE_PHY0>, <&cru PCLK_PCIE_COMBO_PIPE_PHY0>, + <&cru PCLK_PHP_ROOT>; + clock-names = "ref", "apb", "pipe"; + assigned-clocks = <&cru CLK_REF_PIPE_PHY0>; + assigned-clock-rates = <100000000>; + resets = <&cru SRST_REF_PIPE_PHY0>, <&cru SRST_P_PCIE2_PHY0>; + reset-names = "phy", "apb"; + rockchip,pipe-grf = <&php_grf>; + rockchip,pipe-phy-grf = <&pipe_phy0_grf>; + status = "disabled"; + }; + + combphy2_psu: phy@fee20000 { + compatible = "rockchip,rk3588-naneng-combphy"; + reg = <0x0 0xfee20000 0x0 0x100>; + #phy-cells = <1>; + clocks = <&cru CLK_REF_PIPE_PHY2>, <&cru PCLK_PCIE_COMBO_PIPE_PHY2>, + <&cru PCLK_PHP_ROOT>; + clock-names = "ref", "apb", "pipe"; + assigned-clocks = <&cru CLK_REF_PIPE_PHY2>; + assigned-clock-rates = <100000000>; + resets = <&cru SRST_REF_PIPE_PHY2>, <&cru SRST_P_PCIE2_PHY2>; + reset-names = "phy", "apb"; + rockchip,pipe-grf = <&php_grf>; + rockchip,pipe-phy-grf = <&pipe_phy2_grf>; + status = "disabled"; + }; + system_sram2: sram@ff001000 { compatible = "mmio-sram"; reg = <0x0 0xff001000 0x0 0xef000>; From patchwork Mon Jun 12 17:13:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 106718 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp24939vqr; Mon, 12 Jun 2023 10:30:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4P68Ke1/+DjE8srdPxBBB6ArbMu/YwHP95alHu15cQDFTg7xUvsCWKroNg20OucB69hyf9 X-Received: by 2002:a05:6a20:3d8a:b0:119:3650:7751 with SMTP id s10-20020a056a203d8a00b0011936507751mr11255487pzi.7.1686591030379; Mon, 12 Jun 2023 10:30:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686591030; cv=none; d=google.com; s=arc-20160816; b=OV4c63+3ur4/ObqLyq4xGNnmb4bUPmf1MqgL3u3dqcb98nOom7WON+KJIiVDGw8yVn Z8L1EShtx3tR90FrW0PFJECaNAJe4UyYTHoCRsGpgKNRnaVr4eiex1AJ9kkDQJQUW0Oy JIM6GdgZM1bndKMGhTkbiprmn3O2w4O5TTirKzgAr0YTvkZguYWQKQME27hkRVGv8tnl nuikSYIEePNmWyg3ly7zJhGCFppXOPgnyJoq0lDs1b3f83KApYtsO3PIZi40YRR1o+y9 YtDH3CH5qUFKRAJ7Qx9wZZ4ubuPnGG5SIeTIlmg5TJlvCMwfxOXZ3lnLipETBRar5IrI 2inw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=x/QcicFQLw81s1m8hHqiL65ZmMM+OeGKzQbE0DaZtfA=; b=fAhlhCVxiR12g7MpIPZcgbdvSKR+0RwZ8dP58dN/y+DpgPMtTfRgIlbkD1EzKON2sg ZP1XEk0XbY6AQ6Q2wzjqHZWx1KBgVPU+muCDKncgGa/hSWOhNRw73keiSzBo4s8DWVY1 fRpWfrWF5yyiyFdsVoi3eN0HupqPSOCm4W03Wr9QWwL5w3tyWJwxg0cy/Nk5Dq31eT7Q g+NgA+PrsvC3VCn2VTINufV6yabP4Nj1tWYkFf8ocxmq6enNelkxlReaqJYUbBI+NjvN TN4264pzn+gxvX9lCc7m87Dwm9Mc4s2y+Y8tFR2+c1uO/6vdJWH04O0x4FqseutBD33H l9tQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=eo+0Brh0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w189-20020a6382c6000000b00542c7799a44si6708526pgd.768.2023.06.12.10.30.09; Mon, 12 Jun 2023 10:30:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=eo+0Brh0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233661AbjFLRON (ORCPT + 99 others); Mon, 12 Jun 2023 13:14:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237050AbjFLRNq (ORCPT ); Mon, 12 Jun 2023 13:13:46 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 06240188; Mon, 12 Jun 2023 10:13:45 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-210-131.ewe-ip-backbone.de [91.248.210.131]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: sre) by madras.collabora.co.uk (Postfix) with ESMTPSA id C34516606EE0; Mon, 12 Jun 2023 18:13:43 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1686590023; bh=uHNhWU1jmIOWUBoodh01ywxlZr0fhauLWpShle6WDA0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eo+0Brh05JGSEEIja1s2f8Mg+SuZWAm7KhcmxPXYwqNopH7zqOMlpvkm5zL9DuW68 tlzNLCUxN6sGXaUHv5KsH3vThDYuwX2dH0GsR9o+y4nqNMlvpSlMhxRwSsUn+ERDo/ 1IYBMK1GKEVOBqdgMb1dBKWwHbF4IojwaqcmoJh55ZpsAgkyEoNZbesfEh5Im4kfkG JwBQf2Pw43NdP5+jKusfj5CYJELb5my+YC3bHIJO65KMG56Ae+gf6b88ndi0KUQFEo uVVAquepDPJK1lh+ZtYqyzypwA6VlwrRbUm+KGXGyHKcj2pPhqNEb3LUUYuZEi86vS bj3cjkLxCMWbQ== Received: by jupiter.universe (Postfix, from userid 1000) id AAD1F4807F0; Mon, 12 Jun 2023 19:13:38 +0200 (CEST) From: Sebastian Reichel To: Heiko Stuebner Cc: Rob Herring , Krzysztof Kozlowski , Damien Le Moal , Serge Semin , Vinod Koul , Kishon Vijay Abraham I , linux-ide@vger.kernel.org, linux-phy@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Sebastian Reichel , kernel@collabora.com Subject: [PATCH v4 5/5] arm64: dts: rockchip: rk3588: add SATA support Date: Mon, 12 Jun 2023 19:13:37 +0200 Message-Id: <20230612171337.74576-6-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230612171337.74576-1-sebastian.reichel@collabora.com> References: <20230612171337.74576-1-sebastian.reichel@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768518876596157905?= X-GMAIL-MSGID: =?utf-8?q?1768518876596157905?= Add all three SATA IP blocks to the RK3588 DT. Signed-off-by: Sebastian Reichel --- arch/arm64/boot/dts/rockchip/rk3588.dtsi | 23 +++++++++++ arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 48 +++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588.dtsi b/arch/arm64/boot/dts/rockchip/rk3588.dtsi index 9d8539b5309b..b9508cea34f1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588.dtsi @@ -129,6 +129,29 @@ gmac0_mtl_tx_setup: tx-queues-config { }; }; + sata1: sata@fe220000 { + compatible = "rockchip,rk3588-dwc-ahci", "snps,dwc-ahci"; + reg = <0 0xfe220000 0 0x1000>; + clocks = <&cru ACLK_SATA1>, <&cru CLK_PMALIVE1>, + <&cru CLK_RXOOB1>, <&cru CLK_PIPEPHY1_REF>, + <&cru CLK_PIPEPHY1_PIPE_ASIC_G>; + clock-names = "sata", "pmalive", "rxoob", "ref", "asic"; + interrupts = ; + ports-implemented = <0x1>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + sata-port@0 { + reg = <0>; + hba-port-cap = ; + phys = <&combphy1_ps PHY_TYPE_SATA>; + phy-names = "sata-phy"; + snps,rx-ts-max = <32>; + snps,tx-ts-max = <32>; + }; + }; + combphy1_ps: phy@fee10000 { compatible = "rockchip,rk3588-naneng-combphy"; reg = <0x0 0xfee10000 0x0 0x100>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi index 45ae457a22a4..00a91b08e3bb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi @@ -9,6 +9,8 @@ #include #include #include +#include +#include / { compatible = "rockchip,rk3588"; @@ -1717,6 +1719,52 @@ gmac1_mtl_tx_setup: tx-queues-config { }; }; + sata0: sata@fe210000 { + compatible = "rockchip,rk3588-dwc-ahci", "snps,dwc-ahci"; + reg = <0 0xfe210000 0 0x1000>; + clocks = <&cru ACLK_SATA0>, <&cru CLK_PMALIVE0>, + <&cru CLK_RXOOB0>, <&cru CLK_PIPEPHY0_REF>, + <&cru CLK_PIPEPHY0_PIPE_ASIC_G>; + clock-names = "sata", "pmalive", "rxoob", "ref", "asic"; + interrupts = ; + ports-implemented = <0x1>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + sata-port@0 { + reg = <0>; + hba-port-cap = ; + phys = <&combphy0_ps PHY_TYPE_SATA>; + phy-names = "sata-phy"; + snps,rx-ts-max = <32>; + snps,tx-ts-max = <32>; + }; + }; + + sata2: sata@fe230000 { + compatible = "rockchip,rk3588-dwc-ahci", "snps,dwc-ahci"; + reg = <0 0xfe230000 0 0x1000>; + clocks = <&cru ACLK_SATA2>, <&cru CLK_PMALIVE2>, + <&cru CLK_RXOOB2>, <&cru CLK_PIPEPHY2_REF>, + <&cru CLK_PIPEPHY2_PIPE_ASIC_G>; + clock-names = "sata", "pmalive", "rxoob", "ref", "asic"; + interrupts = ; + ports-implemented = <0x1>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + + sata-port@0 { + reg = <0>; + hba-port-cap = ; + phys = <&combphy2_psu PHY_TYPE_SATA>; + phy-names = "sata-phy"; + snps,rx-ts-max = <32>; + snps,tx-ts-max = <32>; + }; + }; + sdmmc: mmc@fe2c0000 { compatible = "rockchip,rk3588-dw-mshc", "rockchip,rk3288-dw-mshc"; reg = <0x0 0xfe2c0000 0x0 0x4000>;