From patchwork Mon Feb 28 13:56:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 12763349 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9243EC433EF for ; Mon, 28 Feb 2022 14:02:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JJ7wEifU74A9DnLEDggeqay6AzncZlmxD0yTlyFOy8w=; b=vFslSXbZk2kBbu 5NA6eMAW5VNybFDI2uqColAQINkRxSMo+v0stM/anNDSO5UcHDOx4b/+kxiT48omwynQAbzeev2q5 ruToYkfOU/wRtXEXY2EDpmveyUPGECrYPtXBibYJeSngBSu4yAZ4HVynklsER0KohxSKwILZPraBt miIW+HU7lEzaLev9r5FYuyBXfd8t/Vv/DEpKWLYyIXDvPr7Lrdvk57d/2WWa3TbOw9wpLOaSHo5fn C64e9NB0jHmVSfcI/DFUSHoN50xKdGgz+yysSY6zwsGBb7gY7Kb+BnIov2zgRsmECcX87l28KQFfj xl5ftaFE6L2ojHGVUuQA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOga6-00Cjpn-Ne; Mon, 28 Feb 2022 14:00:55 +0000 Received: from mail-qk1-x736.google.com ([2607:f8b0:4864:20::736]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOgWT-00CihW-T4; Mon, 28 Feb 2022 13:57:11 +0000 Received: by mail-qk1-x736.google.com with SMTP id q4so10278208qki.11; Mon, 28 Feb 2022 05:57:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RL6lgc9JQzCOWChXKBrpjhVjZkUp1FLcriOwSbYz2iE=; b=oc6VWBpEbroshkPMoR1Hgu8/7KKPhrHKZYPZUwUNPRegB1nJ1Sl2fNfLNrkdg+vzUa 74zrA58Yzorzcv+Lvvb4o6KZgHnpwGPfoQvUBKdFkjU2SRcT9NnT7FO3LdcOWyYbjLYA aFAovpW0TdhyEEClis+xkr4RgOGH8NQlKaqbCKpvLSOZK8rB+n8zegvrD2e08kBqsvtm 3DLSfuiho2nlJqQ/AjEqzJ0C55B85wvcAYJH5sFVOmVd7/sLnYUER01irJHWlzSjctE1 hJh4m77EM/HRhCtIYLmjgqq3DdjvlQ2mJLitRref56joIDWu++Dawp6eBox1I74qGU67 354g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RL6lgc9JQzCOWChXKBrpjhVjZkUp1FLcriOwSbYz2iE=; b=kwurxGnfiovKiNavgLRUKOtrRMcRLyIsszxk75HmqY36qPBcVwaJ4srTN2o4Um4w0l 2PdkRaAPKL2DgfLq/INI9zxC+bsx9mUp0a6pbS1UHP5LJPYIIM9PDKftWGALT/579Ruj QJHM2iw8G/mXxOH6OxblxRmNWzl2r3bQ20BTQckbYcLD+ZNscNy+FXdtLoV+RFLjHdxT XFn2pFW7N7W+hUCXIgbeLpl15g5F0KH7zMG8uE2nz0oCoNVpkm6q7MSUcDr4GJgVd3MJ +XXdIWRyA8A0wlwTHJE4BVV2KTpC8Q9Eu9p7T5+lNl7rVYhzfbi5wJYhSCiYCzdOY6D5 aejw== X-Gm-Message-State: AOAM530wdIt4CavM/wHhMueH3z4FPIA7ExXEXcLSBBfH14jH6KYCxK1g zrjwRc5UPlXfGY0UFyUuRA8= X-Google-Smtp-Source: ABdhPJwKA+QtxdCp2x6ZX6JxtBEUGs0o8ONRL499Hoz/Uzm3NlcJz6Z31+cZv+G5iNxRncj9x3pzKg== X-Received: by 2002:a37:9e87:0:b0:4e1:1921:1f9f with SMTP id h129-20020a379e87000000b004e119211f9fmr10881086qke.480.1646056628485; Mon, 28 Feb 2022 05:57:08 -0800 (PST) Received: from master-x64.sparksnet ([2601:153:980:85b1::10]) by smtp.gmail.com with ESMTPSA id b8-20020a05620a088800b00648bfd00a41sm4932244qka.80.2022.02.28.05.57.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 05:57:08 -0800 (PST) From: Peter Geis To: Rob Herring , Krzysztof Kozlowski , Heiko Stuebner , Vinod Koul , Yifeng Zhao , Johan Jonker Cc: linux-rockchip@lists.infradead.org, michael.riesch@wolfvision.net, Peter Geis , Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/8] dt-bindings: soc: grf: fix rk3568 usb definitions Date: Mon, 28 Feb 2022 08:56:52 -0500 Message-Id: <20220228135700.1089526-2-pgwipeout@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220228135700.1089526-1-pgwipeout@gmail.com> References: <20220228135700.1089526-1-pgwipeout@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220228_055709_975531_5A526032 X-CRM114-Status: GOOD ( 10.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The rockchip,rk3568-pipe-grf and rockchip,rk3568-pipe-phy-grf compatibles were incorrectly assigned to the syscon, simple-mfd enumeration, vice only the syscon enumeration. This leads a dtbs_check failure. Move these to the syscon enumeration. Fixes: b3df807e1fb0 ("dt-bindings: soc: grf: add naneng combo phy register compatible") Signed-off-by: Peter Geis --- Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml index 072318fcd57b..5079e9d24af6 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml @@ -15,6 +15,8 @@ properties: - items: - enum: - rockchip,rk3288-sgrf + - rockchip,rk3568-pipe-grf + - rockchip,rk3568-pipe-phy-grf - rockchip,rk3568-usb2phy-grf - rockchip,rv1108-usbgrf - const: syscon @@ -39,8 +41,6 @@ properties: - rockchip,rk3399-grf - rockchip,rk3399-pmugrf - rockchip,rk3568-grf - - rockchip,rk3568-pipe-grf - - rockchip,rk3568-pipe-phy-grf - rockchip,rk3568-pmugrf - rockchip,rv1108-grf - rockchip,rv1108-pmugrf From patchwork Mon Feb 28 13:56:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 12763362 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 172E6C433EF for ; Mon, 28 Feb 2022 14:07:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=j6ZeL/gijpkZJcqA1OIvZr+iKXz8Dc5eoHDgcZrkgOk=; b=1fLC0ZQeYWEVBh 9ESql+vJyn1Su/aYv0swXXNAUIcjmSyA6K4+/3kIfvIukubvWN6wfJfrqf/jVN5UrW1rCEupsQiGu jFTf6EgWqf85g8OEJxU0j0IcJ2hip6w+7oOw/ADqMxwtsUK2h1E8ypfws1/lSepQ+HuSDg3buauji Y/GOGK1g0ey1SqVnzqkxcyWhhI5fAG3DHfH7HCrPOloXSvsnVbOwmlAOwHtCS75ZgFnHwnnzd/3IB gXlDhoT6DM71JRjtpvvHigrhjh/6RlDm5i08mRsOiEQ/qKzmxUoiXUdI2ASavgIzgbkyhOYVbJrhf Q9wIOlbzNpfFDJ3ngw/Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOgeX-00ClTm-Cz; Mon, 28 Feb 2022 14:05:32 +0000 Received: from mail-qv1-xf2d.google.com ([2607:f8b0:4864:20::f2d]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOgWZ-00Ciho-0u; Mon, 28 Feb 2022 13:57:17 +0000 Received: by mail-qv1-xf2d.google.com with SMTP id c14so7700199qvk.10; Mon, 28 Feb 2022 05:57:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gwYHMhbRHXQxrol3Z4onOOebIeXrEkEaF8cW1M7ix2U=; b=DhunHPDFR2V3Hox2LdEShrwB0I3eShU0H4fvqIdK+bMIwAsCFDMmDxrEpkJkykMeV0 f/P3nuUDuCob8St13oVJktiQ2Ww69QXeBxbSKxX3PPJjfSNxKYx9fljBCgNv89PIeS7b ILdszhgU8EBRvQGJln1QI8D6D698gEXGA3y9SvUdzFUqGQPuntRmm4YPoDyB6qyep1K5 H8nb6oaxe0tWG6CE2PPG8FtfYVVOBXH9iAVatcmO1D7rGTKRa3zJ7RYZZ+u/wiDx99c8 t4kiYnRutathdQFMfvCpkXzi29kKntBXXYiT5TDCR4aaUiUdcKy0zsewS0Py0t98X0Mo f9+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gwYHMhbRHXQxrol3Z4onOOebIeXrEkEaF8cW1M7ix2U=; b=6Dq+6amgW/MDGzoT92EoIJrOUoRzH5IwjFZhTAZD3MKpR619KjBN70D+zFJAoyP5hc dll5UDaw4grbvPMgvTulYlB3rf1diL5hMLtnHV0LHmARGEWUYHlPO2wJmPq9gEvuiMgg erbu+M32wtabKM060QrPw5HK79lMBrYkAeCZok6Arw5iPinVofEnusZXU2JaIaNgTLwx 7+nwNuXTQtOqryhOzgpDSWJWLbxA5HtcZ6IbjKZayOYIiTPu9/H7iFcMIt4HTWlGebE1 7xeBTGPVVRVb5yr4TOlTFqYccy/BIPLXHqftOsHVWj96pkW7VTJUkPaCpEmiUZ8TOP4J 7KZg== X-Gm-Message-State: AOAM532vkyvk7Sv58py99DFvSftaYaq1NwGW6S5QmOQwuHGojR6yvxeG GbigNzck43UoB3zPU2V9EHY= X-Google-Smtp-Source: ABdhPJxkrLbQyS3Zcpt3zgmIhbkWINWdUv5D/WJEcUEfNDhC6TXSahGBuov5CQ56hIdXTZYp9U8VaA== X-Received: by 2002:ad4:5aaf:0:b0:432:ec0a:f90c with SMTP id u15-20020ad45aaf000000b00432ec0af90cmr6051866qvg.27.1646056629455; Mon, 28 Feb 2022 05:57:09 -0800 (PST) Received: from master-x64.sparksnet ([2601:153:980:85b1::10]) by smtp.gmail.com with ESMTPSA id b8-20020a05620a088800b00648bfd00a41sm4932244qka.80.2022.02.28.05.57.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 05:57:09 -0800 (PST) From: Peter Geis To: Rob Herring , Krzysztof Kozlowski , Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, michael.riesch@wolfvision.net, jbx6244@gmail.com, Peter Geis , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/8] dt-bindings: soc: grf: add rk3566-pipe-grf compatible Date: Mon, 28 Feb 2022 08:56:53 -0500 Message-Id: <20220228135700.1089526-3-pgwipeout@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220228135700.1089526-1-pgwipeout@gmail.com> References: <20220228135700.1089526-1-pgwipeout@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220228_055715_109245_59909005 X-CRM114-Status: UNSURE ( 9.54 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The rk3566 requires special handling for the dwc3-otg clock in order for the port to function correctly. Add a binding for the rk3566-pipe-grf so we can handle setup with the grf driver. Signed-off-by: Peter Geis 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 5079e9d24af6..75a2b8bb25fb 100644 --- a/Documentation/devicetree/bindings/soc/rockchip/grf.yaml +++ b/Documentation/devicetree/bindings/soc/rockchip/grf.yaml @@ -15,6 +15,7 @@ properties: - items: - enum: - rockchip,rk3288-sgrf + - rockchip,rk3566-pipe-grf - rockchip,rk3568-pipe-grf - rockchip,rk3568-pipe-phy-grf - rockchip,rk3568-usb2phy-grf From patchwork Mon Feb 28 13:56:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 12763382 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E4D9FC433F5 for ; Mon, 28 Feb 2022 14:09:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=k9YTZvT4KUwQSXq4fBJWBUwvCCOlg+Xk5+7e2R5EkNM=; b=1Z3qhX8cpJlRAm EpP9Pv1ZNkPFdQyttgy5f5smMHz953rV2wGL3N3rsTE/wkmLl9qEgVf6iN9DkdcIShLpo47lxcWgJ IL0f3Vkw94LDBdoGX1MTN9pfJjLJoVtDNV7Y0irBkEGxTKgD5mu3IR73c8OO8YdOmrKr7c/iDN2pV S+zl3mkvfXHhm98toUPDBrf4kPm56BgxkEesm8RSqHoWqHKrLhTJxVRlhNcKAE/5H1013fIEg2Xvk qpAoRs/17lrJ0+bBYZ2t9TaIW/L+j5xl3ttp9gN4KN8QLJn4JZWXigrlexQEbt4upbX9G3tUfh0Iu XR5F6dRKOdnuMcIOwWxQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOggR-00CmER-I2; Mon, 28 Feb 2022 14:07:27 +0000 Received: from mail-qv1-xf34.google.com ([2607:f8b0:4864:20::f34]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOgWa-00CiiO-1r; Mon, 28 Feb 2022 13:57:19 +0000 Received: by mail-qv1-xf34.google.com with SMTP id w7so12560326qvr.3; Mon, 28 Feb 2022 05:57:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cQUDxIOQmLA9ZKQOZ3DN3t0eYopkqsvrJZ7NjA42XWM=; b=D6wZocUmb6FhBDKphSVz7f0+50OiiHnoN4aW4spyaT3McyYINKNrdPC3rrxPTZI/5I p7By6hXY+sQQqS2imvNWYN+Vw/mzJmBVtt/bnGGpdtkFnwtrNCypFPXSW+/pv18qekX6 o+GVc8Eas7xOnZCfKgTJfufQQ3Rz+EA6ePOZXOSZK0oQ6nZRIIUo0nDgsjACfpnn0Th4 x7+NGOhFfcGw0Vt9VAGqHC7dUrW+HHlI8uXrr+VXjHoBpOEk/PiB32oFHTvwpZsUBIWC BvqlzD7ItoFyqBCmRTzwjiBxY1z3g27a8wxpVJz2w3SJ2UO01ZGfuUBe2WN9OABJ7a5x ZwJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cQUDxIOQmLA9ZKQOZ3DN3t0eYopkqsvrJZ7NjA42XWM=; b=Cney2XixdpRamC4m0y2rMVYVr/2WEiRg7c0Tfo3yG1481DjiSHMmD6MwwOHWYvzCW9 YuR1O8/OGfYVEJvADWVUbiO+bDfldQ6ZZAv8YQJbil8pgpUJmRz8YczCjSloU94lt8rJ UyfNIGpeU767E2QUrSNFMrlBx6uD+UGZvpnVBt/SGzLRCOGQ0XGOYwoQy9vHsfaNLsoK CpY1P8ACU7CJGv5P365v2ScsaV9jux7EVxZSNIbPi3y7LDg+LhQjpPuE2ZuArveosdvn sSjPPXfy1+M8wRCLYaUCC1Mjlls9oQApnpzq3Nmmp1wNmmCmFDCjrZYWdFqtz3T4rYis 5x1A== X-Gm-Message-State: AOAM530Ezk/D6yOR0psQAuW/AQxVSZgYujpsWedMsDS04f6hcMsj4g9V HkA/xkSqVeMnmf+wFZbn2m8= X-Google-Smtp-Source: ABdhPJzK8dI/AuVUIiY2N79dEgcXtr0u3v9g6tyJfKve6jayoJ2SoZtpH7AuPI9zJCIbLK8W9zAigQ== X-Received: by 2002:ad4:5fcb:0:b0:432:d049:c6d with SMTP id jq11-20020ad45fcb000000b00432d0490c6dmr9850850qvb.39.1646056630371; Mon, 28 Feb 2022 05:57:10 -0800 (PST) Received: from master-x64.sparksnet ([2601:153:980:85b1::10]) by smtp.gmail.com with ESMTPSA id b8-20020a05620a088800b00648bfd00a41sm4932244qka.80.2022.02.28.05.57.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 05:57:10 -0800 (PST) From: Peter Geis To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, michael.riesch@wolfvision.net, jbx6244@gmail.com, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 3/8] dt-bindings: usb: add rk3568 compatible to rockchip, dwc3 Date: Mon, 28 Feb 2022 08:56:54 -0500 Message-Id: <20220228135700.1089526-4-pgwipeout@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220228135700.1089526-1-pgwipeout@gmail.com> References: <20220228135700.1089526-1-pgwipeout@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220228_055716_176346_95181802 X-CRM114-Status: GOOD ( 10.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Michael Riesch Add the compatible for the Rockchip RK3568 variant. Signed-off-by: Michael Riesch Acked-by: Rob Herring --- Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml b/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml index 04077f2d7faf..b3798d94d2fd 100644 --- a/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml +++ b/Documentation/devicetree/bindings/usb/rockchip,dwc3.yaml @@ -30,6 +30,7 @@ select: enum: - rockchip,rk3328-dwc3 - rockchip,rk3399-dwc3 + - rockchip,rk3568-dwc3 required: - compatible @@ -39,6 +40,7 @@ properties: - enum: - rockchip,rk3328-dwc3 - rockchip,rk3399-dwc3 + - rockchip,rk3568-dwc3 - const: snps,dwc3 reg: From patchwork Mon Feb 28 13:56:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 12763383 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6A987C433EF for ; Mon, 28 Feb 2022 14:11:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=x30ypaG7L2/0QNkkKXzgBIyJMjBmCHNZGMhaeBC620U=; b=ZkZBitHDBDW2XB Ouw8uLaLA50MgKSOxMm3EDzmc+zOCNilfQaVW3OjjNytMExQxlUmqLFCzyE2TGwQjS+UJsMqi85oB TfoP49tkHrtFCQw+Q55D54ZDJDCZoYufVBPrGzmo4L6XMyNXgOKWx2frSCDxh5N8cXwLR1VSCSxcx iC1gA4oW/5VS1+3/wNaIcmAUYsqRkYT0d5TOxtzvA3vEA6W207E79++lFve7opm00uVaSQb37hLZj JgcMKGIr83ApWYttjsljSZ+XAzbSiy6eixPy3A6+Omff/ZxWRh3OLSZjwtlTE2IKD+TNAxCiGvT65 r0+Zk5ZS7vAaYDXlXcuQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOgiK-00Cmnq-6H; Mon, 28 Feb 2022 14:09:28 +0000 Received: from mail-qv1-xf36.google.com ([2607:f8b0:4864:20::f36]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOgWa-00Ciis-81; Mon, 28 Feb 2022 13:57:19 +0000 Received: by mail-qv1-xf36.google.com with SMTP id d3so12551749qvb.5; Mon, 28 Feb 2022 05:57:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZtUJySmbIWUCXkZt6OYhMWHmPcZgwTz+ISBAU3SmGDQ=; b=f7mHaST5NAc+ZIDJY57ZHA0oq8TrhOyfZVssHBsJGecvBXPY/L1UQruS1pWOe1uZLR Wo9UrmY8B7uPAUk1siaDc8QWiwA0jZ4Lo4WXIICX+fW++jbriE10QO833oWDWj2VwLY4 zoUZZ8mlJhqSuwf4E4q8+220BxsKfgZP2Z6fII+erqmLb6iYYwJ2AqmorFubvIP/ZOQ0 7/Cz9afCjP5oCdXMd+DL1/YujlaMltAfzn2o2Rzg7U0KdAT3WtnK+OHopVVXhXGSZwVm euMv1yatBtzNxI9JDnjjtJw8Rzj1IJS9utJLiSCsmqH/D7WSq1W8xJcYqSQb3EZAg/xK ABCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZtUJySmbIWUCXkZt6OYhMWHmPcZgwTz+ISBAU3SmGDQ=; b=Eu+eeXDXyi5s3HFUsHnLyIMKWQ02GLXxaoJxkElFcn8tMHEeu6oWLO1RTcKYqZ05JP kEUKkcDtfrXtqrFTEZDX8hn0PL2nCsT8Gflf+yR6eBBQiipLHKfuiKPeOlQIYT4pfrd/ +TQ0Omz6bpdo76MylW5JZFOeMk3XH61zAQezYSu+l2dF9G+YwG5nSMEcDvDMENW/zZnB 1uGlHlurV9N0vOHMSGfeRQ0R5HpxYMrN7S3ehhs+Rq6mjG9pctSZU8V4mgI/AiC6zCU+ JTwGBMdRfNgThPlFZ+emXRMWWDNZBqIXLkEGmDnSPO+4FYSZ+TYL9UTWv41yZh2wUCSc jKiw== X-Gm-Message-State: AOAM533PBFvzRv7v5L3glwowOvEg//Vg5UebuYy1t3OLrKkc/00XEsQh 1oIl6Ozn92x7pCH/WeQln2A= X-Google-Smtp-Source: ABdhPJwPALj6XKu9+umS4mMfyI8C8p5m+jZ9VT//cuyLwFrVCc5AoMqTn2unAhe0zVjk9nrBQJb5kg== X-Received: by 2002:a05:6214:212e:b0:42c:4226:282e with SMTP id r14-20020a056214212e00b0042c4226282emr14089597qvc.111.1646056631293; Mon, 28 Feb 2022 05:57:11 -0800 (PST) Received: from master-x64.sparksnet ([2601:153:980:85b1::10]) by smtp.gmail.com with ESMTPSA id b8-20020a05620a088800b00648bfd00a41sm4932244qka.80.2022.02.28.05.57.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 05:57:11 -0800 (PST) From: Peter Geis To: Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, michael.riesch@wolfvision.net, jbx6244@gmail.com, Peter Geis , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 4/8] soc: rockchip: set dwc3 clock for rk3566 Date: Mon, 28 Feb 2022 08:56:55 -0500 Message-Id: <20220228135700.1089526-5-pgwipeout@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220228135700.1089526-1-pgwipeout@gmail.com> References: <20220228135700.1089526-1-pgwipeout@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220228_055716_346731_D59D1231 X-CRM114-Status: GOOD ( 12.37 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The rk3566 dwc3 otg port clock is unavailable at boot, as it defaults to the combophy as the clock source. As combophy0 doesn't exist on rk3566, we need to set the clock source to the usb2 phy instead. Add handling to the grf driver to handle this on boot. Signed-off-by: Peter Geis --- drivers/soc/rockchip/grf.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c index 494cf2b5bf7b..384461b70684 100644 --- a/drivers/soc/rockchip/grf.c +++ b/drivers/soc/rockchip/grf.c @@ -108,6 +108,20 @@ static const struct rockchip_grf_info rk3399_grf __initconst = { .num_values = ARRAY_SIZE(rk3399_defaults), }; +#define RK3566_GRF_USB3OTG0_CON1 0x0104 + +static const struct rockchip_grf_value rk3566_defaults[] __initconst = { + { "usb3otg port switch", RK3566_GRF_USB3OTG0_CON1, HIWORD_UPDATE(0, 1, 12) }, + { "usb3otg clock switch", RK3566_GRF_USB3OTG0_CON1, HIWORD_UPDATE(1, 1, 7) }, + { "usb3otg disable usb3", RK3566_GRF_USB3OTG0_CON1, HIWORD_UPDATE(1, 1, 0) }, +}; + +static const struct rockchip_grf_info rk3566_pipegrf __initconst = { + .values = rk3566_defaults, + .num_values = ARRAY_SIZE(rk3566_defaults), +}; + + static const struct of_device_id rockchip_grf_dt_match[] __initconst = { { .compatible = "rockchip,rk3036-grf", @@ -130,6 +144,9 @@ static const struct of_device_id rockchip_grf_dt_match[] __initconst = { }, { .compatible = "rockchip,rk3399-grf", .data = (void *)&rk3399_grf, + }, { + .compatible = "rockchip,rk3566-pipe-grf", + .data = (void *)&rk3566_pipegrf, }, { /* sentinel */ }, }; From patchwork Mon Feb 28 13:56:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 12763361 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AB404C433F5 for ; Mon, 28 Feb 2022 14:05:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=A5cxU2+Blx99HPRbmCufK2YBSl8jmCvaLnSdOCp//gE=; b=vp3mlahtychMVy 1fgqpp1YOb71riH4M9ewJVQ9tMGYL2JpyITG7aE/KzP6/Pqre2NGDXSWu/5kIGb091jlJlpJykZ2V elN98dYX4zUn9ZV13uLS49W/9iWSnHsz/TkmR66oZAF/yXSyulj8Ftp7X0EnKlWeiSJ9RMfL4c3cI DsDI/iijKNMRNVnO8o48wRten2rFeD0/foqx6F4x5hA1jgIultsvuDv493El+o8tfA09koWSZmQ2G SoDHvTShkoCXi9zx9Ztr9ce/RI3Xv8k1hdaYfx+d2HoFUfmrTGf+H1JiQReWwGPe7onds7MJgvatQ HwZth16Mb1pOM7k1LV7g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOgcz-00CkrL-9q; Mon, 28 Feb 2022 14:03:54 +0000 Received: from mail-qk1-x734.google.com ([2607:f8b0:4864:20::734]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOgWY-00Cijs-SS; Mon, 28 Feb 2022 13:57:17 +0000 Received: by mail-qk1-x734.google.com with SMTP id d84so10305328qke.8; Mon, 28 Feb 2022 05:57:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AsODl7JvaXRh2+ut0mxSGhJunK1lBm2DvnylI8wtuII=; b=nwMzOMDPX1uSqS4uzoY1wLkCNhKuCXOb6L0j6ZeNgGlLtL8AKAjnQIHbsSNExBKYJT 4ilHiuGq8rP/uRaNL+h8aoW82w68U529sfqtbKDRaskSEqeqRHPTBP2p95xa2lVlPt9g 1Y0lrS6mm5j08kN+wQB4nUj4igOOpU9jfnwLMa28OfA/7kPYgPY9LaaYcUZ6iSKK1/An xasdcoylogS3Y/gfLnn8n99U6fB0LMsavmoDQsnf5jaypwkAmxitJ+86AkRPmNatPb2q WtrNu/dgWjNLeqDJdunySRQ6v5sbZlEMI78b+LEG+wvF75ybpyg/TqMaBU+ah/RS2bOV XIFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AsODl7JvaXRh2+ut0mxSGhJunK1lBm2DvnylI8wtuII=; b=uaak4W6NSP5OqBAMT+BFpL/x6diGx3oQFqEeJo+NptfnCD2spB8tKu9XsMe11AZ5LF 4jSB9o6HQ6Lu1tTy/TbOD1j6U+rLVuuXcSiEzo5/BylADGKpwJZ4Ti8G7yopuB0h70ZS tsx9BGs62mwOR2hxRcnkeM+9blIeCXj7SmIcAilcdNlpvCmof8+pQ0qGezsGegGxVTdR 3a6R8jrWGkjMeEE6TisKKi1ilOTjFUmuLU/ulMOzLb2KpbR79wJj4OBFwhEigY9n8jzU UC3KuCnff7L04qFDf6oe617eRNySbBAEr+x+vEWCufhnnhk4CFmMiQyQ+7fhISbbFKDZ 2n2g== X-Gm-Message-State: AOAM532ox41ZP8oI/3JlC1jIJNuNjoLXQKJYU31qY7ex9q0Yhg4Jnw3U yAC3xEf+0mLUeRHBEwZOYMtqUvVp56MpWA== X-Google-Smtp-Source: ABdhPJzPrFKZiEYpe9kQCnsOEbJsrl3nbbO6rhnysx54i1jEd/BwaKumcIqB1GeU5ck3q+/1iFEtwg== X-Received: by 2002:a05:620a:165b:b0:648:e786:a251 with SMTP id c27-20020a05620a165b00b00648e786a251mr10955896qko.461.1646056633516; Mon, 28 Feb 2022 05:57:13 -0800 (PST) Received: from master-x64.sparksnet ([2601:153:980:85b1::10]) by smtp.gmail.com with ESMTPSA id b8-20020a05620a088800b00648bfd00a41sm4932244qka.80.2022.02.28.05.57.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 05:57:13 -0800 (PST) From: Peter Geis To: Rob Herring , Krzysztof Kozlowski , Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, michael.riesch@wolfvision.net, jbx6244@gmail.com, Peter Geis , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 6/8] arm64: dts: rockchip: add rk356x dwc3 usb3 nodes Date: Mon, 28 Feb 2022 08:56:57 -0500 Message-Id: <20220228135700.1089526-7-pgwipeout@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220228135700.1089526-1-pgwipeout@gmail.com> References: <20220228135700.1089526-1-pgwipeout@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220228_055714_962173_39C6F9B4 X-CRM114-Status: GOOD ( 12.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add the dwc3 device nodes to the rk356x device trees. The rk3566 has one usb2 capable dwc3 otg controller and one usb3 capable dwc3 host controller. The rk3568 has one usb3 capable dwc3 otg controller and one usb3 capable dwc3 host controller. Signed-off-by: Peter Geis Tested-by: Frank Wunderlich --- arch/arm64/boot/dts/rockchip/rk3566.dtsi | 11 ++++++++ arch/arm64/boot/dts/rockchip/rk3568.dtsi | 9 ++++++ arch/arm64/boot/dts/rockchip/rk356x.dtsi | 35 +++++++++++++++++++++++- 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566.dtsi b/arch/arm64/boot/dts/rockchip/rk3566.dtsi index 3839eef5e4f7..0b957068ff89 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566.dtsi @@ -6,6 +6,10 @@ / { compatible = "rockchip,rk3566"; }; +&pipegrf { + compatible = "rockchip,rk3566-pipe-grf", "syscon"; +}; + &power { power-domain@RK3568_PD_PIPE { reg = ; @@ -18,3 +22,10 @@ power-domain@RK3568_PD_PIPE { #power-domain-cells = <0>; }; }; + +&usb_host0_xhci { + phys = <&usb2phy0_otg>; + phy-names = "usb2-phy"; + extcon = <&usb2phy0>; + maximum-speed = "high-speed"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/arch/arm64/boot/dts/rockchip/rk3568.dtsi index 5b0f528d6818..8ba9334f9753 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568.dtsi @@ -99,6 +99,10 @@ opp-1992000000 { }; }; +&pipegrf { + compatible = "rockchip,rk3568-pipe-grf", "syscon"; +}; + &power { power-domain@RK3568_PD_PIPE { reg = ; @@ -114,3 +118,8 @@ power-domain@RK3568_PD_PIPE { #power-domain-cells = <0>; }; }; + +&usb_host0_xhci { + phys = <&usb2phy0_otg>, <&combphy0 PHY_TYPE_USB3>; + phy-names = "usb2-phy", "usb3-phy"; +}; diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi index 7cdef800cb3c..ca20d7b91fe5 100644 --- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi @@ -230,6 +230,40 @@ scmi_shmem: sram@0 { }; }; + usb_host0_xhci: usb@fcc00000 { + compatible = "rockchip,rk3568-dwc3", "snps,dwc3"; + reg = <0x0 0xfcc00000 0x0 0x400000>; + interrupts = ; + clocks = <&cru CLK_USB3OTG0_REF>, <&cru CLK_USB3OTG0_SUSPEND>, + <&cru ACLK_USB3OTG0>; + clock-names = "ref_clk", "suspend_clk", + "bus_clk"; + dr_mode = "host"; + phy_type = "utmi_wide"; + power-domains = <&power RK3568_PD_PIPE>; + resets = <&cru SRST_USB3OTG0>; + snps,dis_u2_susphy_quirk; + status = "disabled"; + }; + + usb_host1_xhci: usb@fd000000 { + compatible = "rockchip,rk3568-dwc3", "snps,dwc3"; + reg = <0x0 0xfd000000 0x0 0x400000>; + interrupts = ; + clocks = <&cru CLK_USB3OTG1_REF>, <&cru CLK_USB3OTG1_SUSPEND>, + <&cru ACLK_USB3OTG1>; + clock-names = "ref_clk", "suspend_clk", + "bus_clk"; + dr_mode = "host"; + phys = <&usb2phy0_host>, <&combphy1 PHY_TYPE_USB3>; + phy-names = "usb2-phy", "usb3-phy"; + phy_type = "utmi_wide"; + power-domains = <&power RK3568_PD_PIPE>; + resets = <&cru SRST_USB3OTG1>; + snps,dis_u2_susphy_quirk; + status = "disabled"; + }; + gic: interrupt-controller@fd400000 { compatible = "arm,gic-v3"; reg = <0x0 0xfd400000 0 0x10000>, /* GICD */ @@ -297,7 +331,6 @@ pmu_io_domains: io-domains { }; pipegrf: syscon@fdc50000 { - compatible = "rockchip,rk3568-pipe-grf", "syscon"; reg = <0x0 0xfdc50000 0x0 0x1000>; }; From patchwork Mon Feb 28 13:56:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 12763393 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0F083C433EF for ; Mon, 28 Feb 2022 14:14:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=T2W6lE+Vzp8ded8SSvoCyoGvBWlviEPvG9mEQ4SW8ts=; b=QSbUmEQoSlR99C BCLZHtME0CnFzfX+MpkTOp2R0CdCdPPoVw+F5tKu74Inz7AXpSmll5ka9YdodaPtcx+h7RWSwG9kx hSDgSPVJgXbxTp4cSx51VPT5ia95GG6ZPxIOxfIxFBTGZCSt5TZxQ2pA5AhCWg+y0eRbK8imvbLTp eGSpy7AmXsOkPvU/Hu1h1CY+V9PeDDbcmqai9ABjMyGUDNXvDscirGYTgNHsaLaRRr2Up4j/LK+gH k7X+uWxbO2cvTlnUNG5yGMLzMjicPXLqPSX6xYfL7ZY2jDqrC7/j+pBqNQTfBw8fH+67/jLHy4hI6 ZJY/+gFGa+ggEQRVnoVw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOglT-00Cnnq-Bx; Mon, 28 Feb 2022 14:12:40 +0000 Received: from mail-qk1-x733.google.com ([2607:f8b0:4864:20::733]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOgWZ-00Cike-RW; Mon, 28 Feb 2022 13:57:19 +0000 Received: by mail-qk1-x733.google.com with SMTP id z66so10303252qke.10; Mon, 28 Feb 2022 05:57:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BiTCbZuuiqDpXPtBKnm7lrk6/Udlslh2uUBYoU46tJs=; b=Vzhk/l+RrcplqcRl2cXSbNL0mIvK0CRqty0syf5bQQUmHMjOBGQmTZCuabndtJHS36 xXaS4lzWK+xROz5TJtKNdPabb1zD5XMcj4+8BJ5pRW46wRhJ+pp+amtp6rm129LF0Z6P 7ztxky6Yjxzt3HkgcC59vTDSAEagAB5PTSfMz+Df08fUXW1QA8QCZVkc8XBylIYP5kdJ J5nblzMm70KMGgf8Gy5HTHfnfzsopKw26AIwtBXz0ZgsHC2XSeecPMN/tspvdph4+Jwi NspRDdkxFAH/8L4MY1lUMC/CNvDJN+Ru3ekvwruL+yW2a8U0nPvi6Pt4ggbw0GI9+zNl eXSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BiTCbZuuiqDpXPtBKnm7lrk6/Udlslh2uUBYoU46tJs=; b=kr/gxacneBzH9XVzkKJu/sGJKdOKO0DEvEihMuYx6l5q0ERpNLUW6oPiz2OtpDw2Id tg4ugtLu0JujUMc5Y7WD78gbKurugGEXQ+AzgYFUhjy8d93LjykVa0JWRtSVIwz1o5AC HgtstiWwDEUGqGnloOFlBlLUvDb6mP3QnphknHFAKBtkDqHfWYOC6yJ/wSDVgelBL5qG bEmSbM1V3H3WAwptd85F8dEEiae5yaJ6KK8A2f58aa6jqU3FTMZPS4lfZQAI+K3m52M7 g/8ZVGUDWVGzP4aQi8XBsyLMA7XebQvRMrDO6SA0i+Hz0woSXjlrtXtM6BQbgbShWPCi 1Vng== X-Gm-Message-State: AOAM5327MSwoH2rgz1ZuiBaubYFLO5ad/zptQtYl2vqn1mC3QL5QzOrO QJuO0nOF/DGfIRnJb+aauPnMuesx5zsbbA== X-Google-Smtp-Source: ABdhPJzISx6l4WShDyY6KCDsf7X9XfgYN06iL4IV/tf8V+edYxOG/JAz48GCLYEo1nlBEeZAzQqvNg== X-Received: by 2002:a05:620a:8ce:b0:60e:1351:94bb with SMTP id z14-20020a05620a08ce00b0060e135194bbmr10731362qkz.63.1646056634470; Mon, 28 Feb 2022 05:57:14 -0800 (PST) Received: from master-x64.sparksnet ([2601:153:980:85b1::10]) by smtp.gmail.com with ESMTPSA id b8-20020a05620a088800b00648bfd00a41sm4932244qka.80.2022.02.28.05.57.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 05:57:14 -0800 (PST) From: Peter Geis To: Rob Herring , Krzysztof Kozlowski , Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, michael.riesch@wolfvision.net, jbx6244@gmail.com, Peter Geis , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 7/8] arm64: dts: rockchip: enable dwc3 on quartz64-a Date: Mon, 28 Feb 2022 08:56:58 -0500 Message-Id: <20220228135700.1089526-8-pgwipeout@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220228135700.1089526-1-pgwipeout@gmail.com> References: <20220228135700.1089526-1-pgwipeout@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220228_055715_989415_74831B57 X-CRM114-Status: GOOD ( 11.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The quartz64 model a has support for both the dwc3 otg port and the dwc3 host port. Add the otg power supply and dwc3 nodes to the device tree to enable support for these. Signed-off-by: Peter Geis --- .../boot/dts/rockchip/rk3566-quartz64-a.dts | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts index dd7f4b9b686b..141a433429b5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-quartz64-a.dts @@ -151,6 +151,16 @@ vcc5v0_usb20_host: vcc5v0_usb20_host { vin-supply = <&vcc5v0_usb>; }; + vcc5v0_usb20_otg: vcc5v0_usb20_otg { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>; + regulator-name = "vcc5v0_usb20_otg"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&dcdc_boost>; + }; + vcc3v3_sd: vcc3v3_sd { compatible = "regulator-fixed"; enable-active-low; @@ -187,6 +197,10 @@ vcc_wl: vcc_wl { }; }; +&combphy1 { + status = "okay"; +}; + &cpu0 { cpu-supply = <&vdd_cpu>; }; @@ -672,6 +686,29 @@ &usb_host1_ohci { status = "okay"; }; +&usb_host0_xhci { + status = "okay"; +}; + +/* usb3 controller is muxed with sata1 */ +&usb_host1_xhci { + status = "okay"; +}; + +&usb2phy0 { + status = "okay"; +}; + +&usb2phy0_host { + phy-supply = <&vcc5v0_usb20_host>; + status = "okay"; +}; + +&usb2phy0_otg { + phy-supply = <&vcc5v0_usb20_otg>; + status = "okay"; +}; + &usb2phy1 { status = "okay"; }; From patchwork Mon Feb 28 13:56:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Geis X-Patchwork-Id: 12763384 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5BF5FC433EF for ; Mon, 28 Feb 2022 14:13:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1KRVmQ+OukbFy/yQeiUrgMq0iqOEPX8JJP2GEq5+oOk=; b=OK8qx96VQIdmBH 9kRH82/NJOgMlfzRmRwJ0Emt+SVh/sgJg4a1Aum5SlwkahEM/bJUtrckkqklbFiYN6H6JMy/qAEDy kFuiF+Fi5JNb92eDHl7k+JPzgte0BgDJhdOyKA60/q3qIxCs+swJoC3jlq50REW6LwcDmVvz6RZHQ Meq9xyBovDw8dPbJs4DdlrJphHLcPMRhVfzRBv2lC7MvO+DFpaksgt15TiPcRWsZObE645XzJOMvr DCHhVN9Sb4JDXIjiGLuMOZPb60AE06PXC2bFIbGXQiaGPdu6lVcz4VMjR7yuIALL81qkBZyF04Z9A KUIuCB9hQ6wWCqA2JXiA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOgkC-00CnSg-HK; Mon, 28 Feb 2022 14:11:21 +0000 Received: from mail-qv1-xf33.google.com ([2607:f8b0:4864:20::f33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nOgWb-00CilB-Lx; Mon, 28 Feb 2022 13:57:20 +0000 Received: by mail-qv1-xf33.google.com with SMTP id j5so12469344qvs.13; Mon, 28 Feb 2022 05:57:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OHIHH7LBjO7n3w0TkyTvZ+CHhZPHMYRUZ96K/VbT0E0=; b=F6IhWmzb4cnHIFA1qIQwAvnKEQ1K2GIrl4xx2jcR9lR2UnMRm9NjHHo5JqKxIiRNtA Yo4UHxBL6ux+9oyJIsYGmeUoapDPI1Pk9TYmf3Db+2aIKZzv31/IhxZNzfZ5nng9APzo 8ogBn4ijwd/hH6ypNhyN4iT5ZBqf3PsBGn+Lp2e5+KzM0SCTChaUXgjsZ4GL1V0pW1A0 DeA9H60uYVywZ5vMHH9WSJ4XNrBBWCP5qYd1NfNn9VshJW0ZoEDVUfU6flaJjOME0qQw aPEWusYBUcw4KUbAcoxvsiH05fV/21oHvusB4BIIcwjRLS0mUJY2aYDgB9p0QDrLTxDk HWPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OHIHH7LBjO7n3w0TkyTvZ+CHhZPHMYRUZ96K/VbT0E0=; b=SKqHs6cy575btfBgQ2Hu5BA5orer4bH0cGgwyBPhhqmG6kFdRVGSYD6IpQovQ3kN/Q 2IaBcOfDLe9iEMb+JLKCofhAqNsQbNlNQy+SzQplT0/lQ+q5Bqrb4iXwYw4kQ7kRjDSk ltjODinoml4exGqUCfse+vvYf2gvve2WoOdH4hndrbZ8vKUQ4kN7ryWTWs2jemsLafGu 7IH+VVKUiuGcVWPrVHapB4yWPFCuROz5MyvJ1Kgc6dbxEZyM6Pw2Ph/WTtVWYdbXx565 h4IuG0Bn+DmlIn67jNI1n82natEgv/VwJLww6YDHSZgRER8z6XjYMf7l3+pAuxp/Jgu7 QMOg== X-Gm-Message-State: AOAM531qGHe9Af36PLvXWl8DCK+mrpZ8gPwj3u+5mT4qeMj2jKIBDqwH pue8/pCd5/2eD4eDpkumCrW9fEZwzC65KQ== X-Google-Smtp-Source: ABdhPJzXNKADtw0ku6kOnCLRqxDyPgG/YOnDyvyNoSYZ7y5E38ghaI+xQtmpImP6Kw6m2PtIBFhRTw== X-Received: by 2002:ac8:5fd1:0:b0:2d4:d8ee:84d3 with SMTP id k17-20020ac85fd1000000b002d4d8ee84d3mr16473255qta.147.1646056635478; Mon, 28 Feb 2022 05:57:15 -0800 (PST) Received: from master-x64.sparksnet ([2601:153:980:85b1::10]) by smtp.gmail.com with ESMTPSA id b8-20020a05620a088800b00648bfd00a41sm4932244qka.80.2022.02.28.05.57.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Feb 2022 05:57:15 -0800 (PST) From: Peter Geis To: Rob Herring , Krzysztof Kozlowski , Heiko Stuebner Cc: linux-rockchip@lists.infradead.org, michael.riesch@wolfvision.net, jbx6244@gmail.com, Sascha Hauer , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 8/8] arm64: dts: rockchip: add usb3 support to rk3568-evb1-v10 Date: Mon, 28 Feb 2022 08:56:59 -0500 Message-Id: <20220228135700.1089526-9-pgwipeout@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220228135700.1089526-1-pgwipeout@gmail.com> References: <20220228135700.1089526-1-pgwipeout@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220228_055717_836729_1E2B7C75 X-CRM114-Status: GOOD ( 10.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Michael Riesch The Rockchip RK3568 EVB1 features one USB 3.0 device-only (USB 2.0 OTG) port and one USB 3.0 host-only port. Activate the USB 3.0 controller nodes and phy nodes in the device tree. Signed-off-by: Sascha Hauer Signed-off-by: Michael Riesch --- .../boot/dts/rockchip/rk3568-evb1-v10.dts | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts index a794a0ea5c70..622be8be9813 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts @@ -103,6 +103,18 @@ vcc5v0_usb_host: vcc5v0-usb-host { vin-supply = <&vcc5v0_usb>; }; + vcc5v0_usb_otg: vcc5v0-usb-otg { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&vcc5v0_usb_otg_en>; + regulator-name = "vcc5v0_usb_otg"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc5v0_usb>; + }; + vcc3v3_lcd0_n: vcc3v3-lcd0-n { compatible = "regulator-fixed"; regulator-name = "vcc3v3_lcd0_n"; @@ -136,6 +148,14 @@ regulator-state-mem { }; }; +&combphy0 { + status = "okay"; +}; + +&combphy1 { + status = "okay"; +}; + &cpu0 { cpu-supply = <&vdd_cpu>; }; @@ -507,6 +527,9 @@ usb { vcc5v0_usb_host_en: vcc5v0_usb_host_en { rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; }; + vcc5v0_usb_otg_en: vcc5v0_usb_otg_en { + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; + }; }; }; @@ -568,6 +591,11 @@ &usb_host0_ohci { status = "okay"; }; +&usb_host0_xhci { + extcon = <&usb2phy0>; + status = "okay"; +}; + &usb_host1_ehci { status = "okay"; }; @@ -576,6 +604,24 @@ &usb_host1_ohci { status = "okay"; }; +&usb_host1_xhci { + status = "okay"; +}; + +&usb2phy0 { + status = "okay"; +}; + +&usb2phy0_host { + phy-supply = <&vcc5v0_usb_host>; + status = "okay"; +}; + +&usb2phy0_otg { + vbus-supply = <&vcc5v0_usb_otg>; + status = "okay"; +}; + &usb2phy1 { status = "okay"; };