From patchwork Thu Apr 13 18:23:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 83059 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1242223vqo; Thu, 13 Apr 2023 11:37:13 -0700 (PDT) X-Google-Smtp-Source: AKy350YbB3Iaj4v33RMNbuYrLTiDp8IfAWixGkeDMiF7R/U0kQBob2m/svVmcOB1AgEJNhI5auSA X-Received: by 2002:a17:903:80d:b0:1a2:8c7e:f310 with SMTP id kr13-20020a170903080d00b001a28c7ef310mr2862378plb.35.1681411033408; Thu, 13 Apr 2023 11:37:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681411033; cv=none; d=google.com; s=arc-20160816; b=ENwx+EKFu7xXKskMPMKD3VL3b2+7es2Hv7/5uihwLvZWy8DHa400zLoi0sfe5Lseqk rMs1Sof93e5BvoE6F68qx8pMTFBFWxkpzGuuOZnjuY8BeXV0SIPpmbGdwl/SZ027SXN+ T2j0BKIoqKWWZRSEPlZYNirJbAHTcWKu4XNfNTQagTlLcnPlE7wtSgv8kPFcqEB95T2v Wm3q0sOcvZ+ViA/XOC//pH7tfCR8K5fTtqX2DmH7KTnwgVYSmnn6j45GDwwhP0NZk2RL KhOAEitW/rIK3xtvwKQmM2xETSCx8uUApLQcB4nIyFo/PVaixW+jBOp3uvuEfc/c6JMr LP/A== 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=QDO5KJ8BR1GBU4ZljK+AKuz8qIYjZXi2rKBjK9qPce4=; b=0/kh2sm15AbJC3/6Wl9LIOFWvLpQYdGaYd2jpl0PngVPPbzE/eJtm6D0SW+UDirCmy FAvpxEKOxAma+2XpeD4ph8BacOA188n45+DO4IXMG9/N9mO/fC5T2Oyk+vdS+U02VSTh BfOP01fDxKpxsYTVGMj4H/BVoEkFGfo/zh6mkCgTvseqQOSE+zyDCym8ML2Qk8jH9ekS j6Gp78dUJgYk/NEDs0FVZ/2HE44cPqU26q1xkkQrkCQkD3nebkINjo507Aik8xcPjZvg aq+JsEX7Y5wn8VxA5fhiOh31NmNgT/oV+tW8n62Pt0BqGBb/SZxCailDei33ChxoeFsD U7Sg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=kSJI4qzg; 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 b11-20020a170903228b00b001a637615a89si2804497plh.561.2023.04.13.11.37.00; Thu, 13 Apr 2023 11:37:13 -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=kSJI4qzg; 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 S230071AbjDMSYF (ORCPT + 99 others); Thu, 13 Apr 2023 14:24:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229636AbjDMSXy (ORCPT ); Thu, 13 Apr 2023 14:23:54 -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 3234E61BE; Thu, 13 Apr 2023 11:23:53 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-212-251.ewe-ip-backbone.de [91.248.212.251]) (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 4BE72660321C; Thu, 13 Apr 2023 19:23:51 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1681410231; bh=J/aAZ1smSAAsG9/uQ7OFDO0676ZcUa7ugt0BDTtD/es=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kSJI4qzgzI3qItD2MLXvZahzmwBLn0qhNZhGLmLdDvuSd6LVIZJI6sp4pWhNQ9v5Q RaxKQAo9l4cMm8NSykNz4Sxg1MW9s0katZv6t23gWLn3c2/SdkWsgPXWunpfXCHS1q /ycdgXHHFX4o9sjSSbaiwe2cOOdXHANFA4p06E1Fu15Uo6c7OXLn8nPf4njPbEZxcY R1i/ru+/GjqKed/HrgkC3/dCLG/wxy3/oONOGiAGk+NiQEFpExosbZJq9bwYrvwE+x rQLY98zPZR3SR9iOfGMCoa374HNhLmK3xLm39UF/8Fd7m+4mnkR3e8ejlSPFXg/5E6 6u5uNCtnkCdcg== Received: by jupiter.universe (Postfix, from userid 1000) id 89F3B4807E3; Thu, 13 Apr 2023 20:23:48 +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: [PATCHv1 1/5] dt-bindings: soc: rockchip: add rk3588 pipe-phy syscon Date: Thu, 13 Apr 2023 20:23:41 +0200 Message-Id: <20230413182345.92557-2-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230413182345.92557-1-sebastian.reichel@collabora.com> References: <20230413182345.92557-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, URIBL_BLOCKED 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?1763087255553688266?= X-GMAIL-MSGID: =?utf-8?q?1763087255553688266?= The pipe-phy syscon is used by rockchip,rk3588-naneng-combphy, which in turn is the PHY for USB3, PCIe and SATA. Signed-off-by: Sebastian Reichel Acked-by: Rob Herring --- Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml index a873f74564f2..dda071b66813 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml @@ -24,6 +24,7 @@ properties: - rockchip,rk3588-bigcore1-grf - rockchip,rk3588-ioc - rockchip,rk3588-php-grf + - rockchip,rk3588-pipe-phy-grf - rockchip,rk3588-sys-grf - rockchip,rk3588-pcie3-phy-grf - rockchip,rk3588-pcie3-pipe-grf From patchwork Thu Apr 13 18:23:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 83061 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1244177vqo; Thu, 13 Apr 2023 11:41:23 -0700 (PDT) X-Google-Smtp-Source: AKy350aD83zY3WCvVaAykTvwwIijTCg36vqiYv5C6sWjuFla/N50EdAP4FdtTuf0pwXe7xElHnJF X-Received: by 2002:a17:90b:c15:b0:246:85ec:d816 with SMTP id bp21-20020a17090b0c1500b0024685ecd816mr2954740pjb.3.1681411283568; Thu, 13 Apr 2023 11:41:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681411283; cv=none; d=google.com; s=arc-20160816; b=reC765yw3V2Fm3vtiE5xNMIcGdykITM5T4c8vu7LFFz/ahHJC/QM73IKQk33Uqf+1e RLsf2nowCiKUh33jnEXZYMFZzuIf/exM6N4lvy9JSqPd96079Q7JHNUe4YCOgkkPVNgc wlczy3L45CDOOijkdoT3i6ldUGpyjbU3J/VBb10o7Q8URW+jpqJt/0FPE7iU91LrgIcu kpnwR1YBaFrHsyl4TpdVFfKi3lmflTxe0mH23aOUZZS+S8KnjCVXmxbijNZYke0t1uQO Vo2gVsiEJ3PwuEndpZMk2eM2yOcckiDxJH6pzdZyhN1z9iHheRX8huwN1CMMkymEBDbo JLwg== 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=ommqNHLCt9kjT3gX5Fwx7F4cPu1jqcszROCbSFMhIz0=; b=aaSTvw/d5/gb9JCvBNt7m12ggE093l7os81CGG1vq+1OAuz5A5zc8hknryYddTTcTH 046sGRVLcR0kDtWp2A/iQJIyT10gBtaxtUtUsYxMPBzmbNJUZ7icAv1kC8G0/Bqmwpnd lOAc6uGOPxYQZZ5pc2jRzueJ3e3xCmkQWcm0e7XjhDh8Aaf0AEPLExHOwIU4Z0jE/aKd OmSd4QqIQ3klP7nMsYUW4phX5l0gh2hZZvt5McB97sFVpyo+zbuX9MFuy//cFuXImbYX tuvBKk/DfnpxyebFPDAadyvgOUA21ub4dg3ybJ/KtNIzamSBljsJrMLqOFJPMOq9rWnj /7+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=BLL+poNl; 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 q15-20020a170902dacf00b001a179169d6bsi2909744plx.610.2023.04.13.11.41.10; Thu, 13 Apr 2023 11:41:23 -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=BLL+poNl; 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 S229815AbjDMSXz (ORCPT + 99 others); Thu, 13 Apr 2023 14:23:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229479AbjDMSXx (ORCPT ); Thu, 13 Apr 2023 14:23:53 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E45BD59FF; Thu, 13 Apr 2023 11:23:52 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-212-251.ewe-ip-backbone.de [91.248.212.251]) (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 57910660321D; Thu, 13 Apr 2023 19:23:51 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1681410231; bh=KE/Qh2dz/391cip/CPeIBTyPxaiySIGR7XU//jF9HQ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BLL+poNly6f3IBlk3AcHxjpOJ8gIQE2cGE4I6Xg1ZFICMpx1DyZUTlpHA+IUtO4hJ kCZbWdMjfXNjAgcx/JbDOatnmGbyWSZXPW5qG54p7HUJHRqE4deVIBld/FouDB2Ki0 M0uO0E06O/+8f+ROutsz3y42AeShpdj/HORVnBWjn/5K9k91zRQ/TC//tvP8w11COD HKG7PivvGp93lzC9lqw6xk+mIOIX7gaIG1/yBJQ3XVUWflmgBdxsASaN2clW4zfaq3 sxyPYMDcFM80u21UXU2UzLqLucuLRXRoCz2siDHI/1q5EvtMuOCp9dd4xROp6dRgGK 68pN6ewd0rHMA== Received: by jupiter.universe (Postfix, from userid 1000) id 8CA424807EF; Thu, 13 Apr 2023 20:23:48 +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: [PATCHv1 2/5] dt-bindings: ata: ahci: add RK3588 AHCI controller Date: Thu, 13 Apr 2023 20:23:42 +0200 Message-Id: <20230413182345.92557-3-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230413182345.92557-1-sebastian.reichel@collabora.com> References: <20230413182345.92557-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, URIBL_BLOCKED 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?1763087517972850821?= X-GMAIL-MSGID: =?utf-8?q?1763087517972850821?= Just like RK3568, the RK3588 has a DWC based AHCI controller. Signed-off-by: Sebastian Reichel --- FWIW IDK what exactly the ASIC clock is. The TRM does not provide any details unfortunately. It is required for functional SATA, though. --- .../devicetree/bindings/ata/snps,dwc-ahci-common.yaml | 6 ++++-- Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml | 6 ++++-- 2 files changed, 8 insertions(+), 4 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..0df8f49431eb 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: 5 clock-names: minItems: 1 - maxItems: 4 + maxItems: 5 items: oneOf: - description: Application APB/AHB/AXI BIU clock @@ -50,6 +50,8 @@ properties: const: rxoob - description: SATA Ports reference clock const: ref + - description: Rockchip ASIC clock + const: asic resets: description: diff --git a/Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml b/Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml index 5afa4b57ce20..c6a0d6c8b62c 100644 --- a/Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml +++ b/Documentation/devicetree/bindings/ata/snps,dwc-ahci.yaml @@ -23,9 +23,11 @@ properties: const: snps,dwc-ahci - description: SPEAr1340 AHCI SATA device const: snps,spear-ahci - - description: Rockhip RK3568 AHCI controller + - description: Rockhip AHCI controller items: - - const: rockchip,rk3568-dwc-ahci + - enum: + - rockchip,rk3568-dwc-ahci + - rockchip,rk3588-dwc-ahci - const: snps,dwc-ahci patternProperties: From patchwork Thu Apr 13 18:23:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 83055 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1236120vqo; Thu, 13 Apr 2023 11:25:40 -0700 (PDT) X-Google-Smtp-Source: AKy350aHLYfIyajBGcLUh96AlU3gWC4GsZvA51x6Uhku+4WEbXg0i3AETncoliEpUqkVQeX3NFvr X-Received: by 2002:a17:90b:33cd:b0:234:384f:79c with SMTP id lk13-20020a17090b33cd00b00234384f079cmr2815709pjb.33.1681410339944; Thu, 13 Apr 2023 11:25:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681410339; cv=none; d=google.com; s=arc-20160816; b=VCy24v0jvaTaGbz5M8BFqMAAjeUBJ9N8MLBe4G9Ac04CaGOD2yNNqKMhB9MuZN5Ntr 6L+EKs0e9RvhNujqY1L3Qrr34Afatd6zcriXyGYqH+H4OfsKOi+OOSpxtn4rul/+RJlr hZwnXym+CDj5G9HmvBf1fvhVrQQ7KKp0tnNLZrGeid2XSQmWCXI2aMcxm0cn4lzEh6Yu +Y3E6UI0Vn6g16BUh5wVY4QkCAnMHrTU4rbW2VMExy6Cpo2KovXa/B5ky0tH/7wBXCTe 7SbxiyHPSrxakuJyS74UqiMYfUFjvusD0iFYa38ZNn2Tu0OJrv37UrMHv/pzy9VG4Vfd sDYg== 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=/K9pzmZl7HoQrlDSW17v4cTLX/j873TrUFnWfLZHMRM=; b=Ia4FtPf62wkHgA2cNlawihzxgsxsqpaiIXekh6/nHmMzT+6nfIdkCF0fatFCNJLQXO xXF7Pl2HS2AyNZvlPUfhHAJelsmGAUlgOmOhSSJTS3xen8tEqEBC7smJVnzG2pcRHr3G YiC7AlBlFPK0I6NLjpVKfb1o5rlyQfX8HGmHREG91VMsUA8FvpZyZZIClrg/XAEWXK0X GlZ3IOs+ssgq9u2oDgBi4Vpr2z+7H9tb5NGuqMped4vv6aggV54rqrzHEfwjVDfYuloe B2qRXGysaQOkAMD0PNEoigYmjERm4dFsO+QIqt8OmwW6gk6+QRMsoq+BHdMAJWAeGSQQ 3HVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=G7ZQvrSF; 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 ot7-20020a17090b3b4700b0023f59037719si5794596pjb.98.2023.04.13.11.25.25; Thu, 13 Apr 2023 11:25:39 -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=G7ZQvrSF; 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 S229920AbjDMSYC (ORCPT + 99 others); Thu, 13 Apr 2023 14:24:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229674AbjDMSXy (ORCPT ); Thu, 13 Apr 2023 14:23:54 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 126C06181; Thu, 13 Apr 2023 11:23:53 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-212-251.ewe-ip-backbone.de [91.248.212.251]) (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 6A0516603220; Thu, 13 Apr 2023 19:23:51 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1681410231; bh=zAjmL1BsGoOklDz1it3NJmReakUPeGQCam58Z7IsTXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G7ZQvrSFBMb0jXOSMCMBBP5lIgdeFmRUiJLqNmPe16V5VkkuL/e94NdSeKrbtxBhr C/dOfzTpPbuMCGuXA3YzTV1A5fKgFfqR0vAK48ytk1H1//LWADehUjHfuLfoqCyGK4 O5oaxj1juSox7QkYE7D1B4nPtfXLqNWBIys6qws3JUG6VDrvaLP2LBq/cM6j0A84Tu FOkYRDpK3BbxCmfxxeyycBgduMYc2/bf+kfNavs9KmiJruMxrlyn33L6pP0VuaaS3o BvCz1iiDZRYUrUl3nB7TAem6bKgrn3PNyRXkSViM30XrbaxvJZasGY/iIZb/6tDXVC sniDnVZACTxiw== Received: by jupiter.universe (Postfix, from userid 1000) id 8ED504807F0; Thu, 13 Apr 2023 20:23:48 +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: [PATCHv1 3/5] dt-bindings: phy: rockchip: rk3588 has two reset lines Date: Thu, 13 Apr 2023 20:23:43 +0200 Message-Id: <20230413182345.92557-4-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230413182345.92557-1-sebastian.reichel@collabora.com> References: <20230413182345.92557-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, URIBL_BLOCKED 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?1763086528612096902?= X-GMAIL-MSGID: =?utf-8?q?1763086528612096902?= The RK3588 has two reset lines for the combphy. One for the APB interface and one for the actual PHY. Signed-off-by: Sebastian Reichel --- .../bindings/phy/phy-rockchip-naneng-combphy.yaml | 7 ++++++- 1 file changed, 6 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..bac1aae07555 100644 --- a/Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml +++ b/Documentation/devicetree/bindings/phy/phy-rockchip-naneng-combphy.yaml @@ -31,8 +31,13 @@ properties: - const: pipe resets: + minItems: 1 + maxItems: 2 + + reset-names: items: - - description: exclusive PHY reset line + - const: phy + - const: apb rockchip,enable-ssc: type: boolean From patchwork Thu Apr 13 18:23:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 83058 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1241507vqo; Thu, 13 Apr 2023 11:35:43 -0700 (PDT) X-Google-Smtp-Source: AKy350aAkMFPcRcLTCeIMJNh1HL5vx8a4xhLD+byHIMIoCbqeXIwXLyCzFRLQ6aT3Q/cUV5kdCXX X-Received: by 2002:a17:903:22ca:b0:1a0:5524:eb8e with SMTP id y10-20020a17090322ca00b001a05524eb8emr3617783plg.68.1681410943447; Thu, 13 Apr 2023 11:35:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681410943; cv=none; d=google.com; s=arc-20160816; b=w7gYJK0970mEauJ8cNjOU+9XwD+s601XIdvoDs3ml1wG3nj6ekncbboQ1ACdamFhq+ hXJgcyPFeedVz+WVl+cGy5ElLWaJcCz84m1AcVq1tn6Pds/EVwqz5V2ZKEo0CucQ44dP /c//sFfXTh0MRJyXgJCeqm0Elq+zXxX22cTAMcPC5Jfv3psxaKJkZg6ysjqwXzMaM156 yEr6zvRmddGy5xudCgNaZbc78hwv8PyaiCbxoZ0YUq2y7OdET9YzQV8glq/A1TGn0ZUS 2RNqft110tsDGtM6W272seHVdejZ+pVgscIkIPS2fGMKZacQm96cXQq8IV952mu2+KVI xjMA== 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=1H3Na6Tzd/XYwWjEiW+U6C+yn/WnTI/NTV/ceUpezpc=; b=BhTqwIGonFth0JVZFS/wB3p1qSs4ZQpg99GWEmOQU2RO0in2mJ06DyEUaXSeZCgWdT ryKJTASXaFwEh+BA1LmeM+bVrQWFJbKZU+MXtVdZeyjcGdJfjzVDg/VyChasTZCbBmqn 4/tXEKMlxBpXX+fpiUm6KvQM4fX9IXhMPEkTuUhLxOK+R7+o5YJUczjvtqdWRRBBIfPu +h0xzChY3YpyhWa+EMYvuDLenFR6I9gA6BNOSg56csVR+35TtsegKGRs/M7L8dbkeWTI 4BXo2Wws5HxI4nP7EnI21vY6UVagfuUBuW1Q1YmnZpw1XZ9rROgdYa8X0fgW0biNL1Mo CcTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=FbhrVWG2; 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 n7-20020a170902e54700b001a24c039005si2759666plf.289.2023.04.13.11.35.31; Thu, 13 Apr 2023 11:35:43 -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=FbhrVWG2; 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 S230088AbjDMSYH (ORCPT + 99 others); Thu, 13 Apr 2023 14:24:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49340 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229747AbjDMSXy (ORCPT ); Thu, 13 Apr 2023 14:23:54 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F32B61AE; Thu, 13 Apr 2023 11:23:53 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-212-251.ewe-ip-backbone.de [91.248.212.251]) (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 94AF86603221; Thu, 13 Apr 2023 19:23:51 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1681410231; bh=KpDLVmY7MLRSnWayLikD4zY8rROUxg2D6rCjRLznobU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FbhrVWG2OsHm7fJqsv6mJONTZF7mu8HIroXjj4b1nkr2ZMJD0FQxyyByntADT+ZjO YDoLBlrvgqS2Q3t18BLk60R90YlJbomF6IQKFMk9EptMhZ5HLEGGLt8RX1qmhsBcrb rpcYxIZahfATD/ww/UlfynrAo5NIK7DLotWsmXplAj4Nasxjvxx+D5+B5pSTzRDqd5 4jGkI6+dOzPkjCflw6eEh0vFH6vipziG/9f1Lxz0f1gx65EDF7pm/4StnzEvAx+x6Y ud4zP3Po7BzSBxMFhiatgWfB8dzexV2c2QqCG0BcsklApPwgNIATJRJDQwpibuTM8D a99yA40QCXRnQ== Received: by jupiter.universe (Postfix, from userid 1000) id 90FCD4807F1; Thu, 13 Apr 2023 20:23:48 +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: [PATCHv1 4/5] arm64: dts: rockchip: rk3588: add combo PHYs Date: Thu, 13 Apr 2023 20:23:44 +0200 Message-Id: <20230413182345.92557-5-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230413182345.92557-1-sebastian.reichel@collabora.com> References: <20230413182345.92557-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, URIBL_BLOCKED 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?1763087161011231645?= X-GMAIL-MSGID: =?utf-8?q?1763087161011231645?= 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 d085e57fbc4c..fe1866a3697a 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>; + }; + gmac0: ethernet@fe1b0000 { compatible = "rockchip,rk3588-gmac", "snps,dwmac-4.20a"; reg = <0x0 0xfe1b0000 0x0 0x10000>; @@ -55,4 +60,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 422b31e342ca..7227c918f825 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>; @@ -2200,6 +2210,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 Thu Apr 13 18:23:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Reichel X-Patchwork-Id: 83056 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1236157vqo; Thu, 13 Apr 2023 11:25:43 -0700 (PDT) X-Google-Smtp-Source: AKy350bnVct5Unw50U2DyKdab6ylNt8WrjBemysYx8/IXdhiz8wJvLC8qAWDFoTvz5D3SILuI9aP X-Received: by 2002:a17:902:a3cf:b0:1a6:81f8:63c5 with SMTP id q15-20020a170902a3cf00b001a681f863c5mr3080446plb.12.1681410343401; Thu, 13 Apr 2023 11:25:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681410343; cv=none; d=google.com; s=arc-20160816; b=lgeo0LPboqRvT7cpe9XSV//4BUShjt21x+aAtVz429bDZ4NJRGFu483Q5zVcYeGHQ+ yg6beN0bImsMCvjoOlHcrSahfcn8FOkEKEV7FoOMllxfyPjtOxaKHDdl+blPg2sMq9KR 85p1SNDZCWw3JSZuBqYbH94v8Xs1tQhBjclhr1sbkwbVJ76+4Cfx6k50oDMnX7zzOQVa HMHnFRbvJY0wvvCJefkaPar9TTQFC1gnP8hYe/u89rIFDB5BkiFIYhF8QIOsGqC13Kxb 8GZPKdTooW6didu2ViRw4sATNd24ugJdKXxvwT3SrUMtoHO8o4RMLiVH5E5LtFEwOqFV F75Q== 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=/6Hvszrt0lubiO6hvOw/YA7WTcJUk359Il1V8S5S3/E=; b=jugIKgXE0e1tR1u/xZZ3l/UyUMnBj5G3QmlartXbqrcPqlUZBuTIDKKSelL7xfhU2h McBzFti+Ip0qVP8kfD3hkY8COZNlDCp8fniKRpzjJIcfaOtWJVTUJejOC62/2n9YWfLg QMFdVwquqTAhxPqrLK4B4+0FTduwdYLodcWfWY9w+z+UNWZUNLOSNX2I6ktwjnev4nrB rg4Acmi/hIYSl59qOqmWF1J5szh+g72TMF9nZ4W7niWj0fcmsMG6ud3upipGOkSAdPU9 P8UBGU3NHsF5hde9hANawxcD0+g/iAFEM3M1mRsQHJuip2N+oJ4M9LA7pqUz5ey/rrvx EqJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=XgkE4oQt; 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 r10-20020a638f4a000000b0051b631334f1si566286pgn.764.2023.04.13.11.25.28; Thu, 13 Apr 2023 11:25:43 -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=XgkE4oQt; 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 S230098AbjDMSYK (ORCPT + 99 others); Thu, 13 Apr 2023 14:24:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229839AbjDMSX4 (ORCPT ); Thu, 13 Apr 2023 14:23:56 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED7EF526F; Thu, 13 Apr 2023 11:23:54 -0700 (PDT) Received: from jupiter.universe (dyndsl-091-248-212-251.ewe-ip-backbone.de [91.248.212.251]) (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 80B5B6603258; Thu, 13 Apr 2023 19:23:53 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1681410233; bh=U9HSGHcaBoWrjSZxqEllJenGE2UR8Js0ktkaIRChRy0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XgkE4oQtBFKdiYImvtpJ8CSwauNcg6VIpuQW7ccw5sgIbMXxtH3WUd9FpQdWR60eX /XxutSMY5vwZ4HeGfWJrlgspK3sSnjYBnrWZmdCirbmyho6aLreuR6j776K7h3CuFX MnkOtYMugm12bhXVyU5DpuVmbjnH1Qr6xqSrOXlSUn0lgVkvk+LjcsgJDPP3apqDZ/ 3k50bSdGImu2IFvz4AowC4QYqJck34VEVGEX090k79n9+g3JJ1sNMfxAoOvZzNnTUW 9EeST+r151EUvkoPa++NQUYNp6H2WdPafE0N3DwoOvR3yFXgrtmorch7TAxyY1+VZy G12k623CB9rwA== Received: by jupiter.universe (Postfix, from userid 1000) id 934E44807F2; Thu, 13 Apr 2023 20:23:48 +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: [PATCHv1 5/5] arm64: dts: rockchip: rk3588: add SATA support Date: Thu, 13 Apr 2023 20:23:45 +0200 Message-Id: <20230413182345.92557-6-sebastian.reichel@collabora.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230413182345.92557-1-sebastian.reichel@collabora.com> References: <20230413182345.92557-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, URIBL_BLOCKED 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?1763086531851680460?= X-GMAIL-MSGID: =?utf-8?q?1763086531851680460?= 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 fe1866a3697a..65d818964bff 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588.dtsi @@ -61,6 +61,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 7227c918f825..2124c654f665 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"; @@ -1666,6 +1668,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>; + }; + }; + sdhci: mmc@fe2e0000 { compatible = "rockchip,rk3588-dwcmshc"; reg = <0x0 0xfe2e0000 0x0 0x10000>;