From patchwork Sat Mar 18 08:37:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianling Shen X-Patchwork-Id: 664823 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 935D1C74A5B for ; Sat, 18 Mar 2023 08:38:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230043AbjCRIiJ (ORCPT ); Sat, 18 Mar 2023 04:38:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230025AbjCRIiH (ORCPT ); Sat, 18 Mar 2023 04:38:07 -0400 Received: from mail-io1-xd34.google.com (mail-io1-xd34.google.com [IPv6:2607:f8b0:4864:20::d34]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61BDFA76B9; Sat, 18 Mar 2023 01:37:55 -0700 (PDT) Received: by mail-io1-xd34.google.com with SMTP id t129so3320557iof.12; Sat, 18 Mar 2023 01:37:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679128675; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wNoijDRMgUGYwTQk51CaDMUDN+KxP0US29mL2A3xBvU=; b=XTd+RyshUmyQzK+GnEwmpUB715Q/+3GD23ggNEgdM5AKgUpdjYarNFzxu9QoNs6kzo c5SK6Z6HppnvKdG+F/p9r8mnwjwrG+cYW5WCCzZlpE/JXOhG3hTIJpoIkxSInNAwFDrz qDcat2SpDionvPdmU8bs5kCZ6toWpdy2RpG2OQzIj8AQQ2mPqZAxVTpHlxM6HEJ0VeCo U37Rzqd+NIRKwU1xKTrpavEfatzJ3G3M/79vIFsRLEmzuOFd3Vm1ZY2ypeliN9Wqb0K1 rUi33j62o5uVD3rklysBoByRHWpvkTLzr6n6cOScqkdOaZBMkq0lk6p2inVfSxDZHpbI dxig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679128675; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wNoijDRMgUGYwTQk51CaDMUDN+KxP0US29mL2A3xBvU=; b=QlfjEOvQrZzcz58NiZNBHa5vgDZryyKBfz0XZl4NMRuHHUknm68K49RYID0h8Qjw+V kUm/j98z2eq1/k1g0n+Niw91yzn1IJWs90J9AgUb+VSYx4XlbDf+26rb+uoVwjchHjLl NGCz/HXYcZI/X9Pti/4x1Tqltez70Tf5ooxaUiyArdGdAMgQiiEm7vUI5n6Um4CIaQpP GnSXSxaLoLrG4HGHXdLRvPsYazQyMw7PSXS390vyistkopHVZ5fLIqUmekkAbL8EY6IM NByjNg6mlloan244Z/yHlgkz+arki1NHtxPOc6oss/uvtCAZ9C6QuuYTI31+MhuMWQJL Da5w== X-Gm-Message-State: AO0yUKVNaK7lQRHduLBpJSbIkxUXH5ozGljTz+fm7ZL5mmZNLShyqzRt EQe1tqSlqzJGgx5x3+TKmXI= X-Google-Smtp-Source: AK7set/F1NtDVyHhOFJmWG7a1TB0Kfgk5Zwx3vOBh5pVh+W0ztTzXaMExGrUCfnxshiOj0n9goy+6g== X-Received: by 2002:a6b:7e4d:0:b0:74c:97ee:4e56 with SMTP id k13-20020a6b7e4d000000b0074c97ee4e56mr958857ioq.3.1679128674694; Sat, 18 Mar 2023 01:37:54 -0700 (PDT) Received: from localhost.localdomain (tunnel785484-pt.tunnel.tserv9.chi1.ipv6.he.net. [2001:470:1f10:aed::2]) by smtp.googlemail.com with ESMTPSA id h8-20020a6b7a08000000b00746041ecbf9sm1174834iom.39.2023.03.18.01.37.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 01:37:54 -0700 (PDT) From: Tianling Shen To: Rob Herring , Krzysztof Kozlowski , Heiko Stuebner , Jagan Teki , Peter Geis , Andy Yan , Tianling Shen , Brian Norris , Chris Morgan , Sebastian Reichel , Andrew Lunn , Michael Riesch , Maya Matuszczyk , Andrew Powers-Holmes , Sascha Hauer , Vasily Khoruzhick Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/5] arm64: dts: rockchip: fix gmac support for NanoPi R5S Date: Sat, 18 Mar 2023 16:37:44 +0800 Message-Id: <20230318083745.6181-5-cnsztl@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230318083745.6181-1-cnsztl@gmail.com> References: <20230318083745.6181-1-cnsztl@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org - Changed phy-mode to rgmii. - Fixed pull type in pinctrl for gmac0. - Removed duplicate properties in mdio node. These properties are defined in the gmac0 node already. Fixes: c6629b9a6738 ("arm64: dts: rockchip: Add FriendlyElec Nanopi R5S") Signed-off-by: Tianling Shen --- arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts index e9adf5e66529..2a1118f15c29 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dts @@ -57,7 +57,7 @@ &gmac0 { assigned-clock-rates = <0>, <125000000>; clock_in_out = "output"; phy-handle = <&rgmii_phy0>; - phy-mode = "rgmii-id"; + phy-mode = "rgmii"; pinctrl-names = "default"; pinctrl-0 = <&gmac0_miim &gmac0_tx_bus2 @@ -79,9 +79,6 @@ rgmii_phy0: ethernet-phy@1 { reg = <1>; pinctrl-0 = <ð_phy0_reset_pin>; pinctrl-names = "default"; - reset-assert-us = <10000>; - reset-deassert-us = <50000>; - reset-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_LOW>; }; }; @@ -115,7 +112,7 @@ &pcie3x2 { &pinctrl { gmac0 { eth_phy0_reset_pin: eth-phy0-reset-pin { - rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_down>; + rockchip,pins = <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_up>; }; }; From patchwork Sat Mar 18 08:37:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianling Shen X-Patchwork-Id: 664824 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52768C76196 for ; Sat, 18 Mar 2023 08:38:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229845AbjCRIiJ (ORCPT ); Sat, 18 Mar 2023 04:38:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230029AbjCRIiH (ORCPT ); Sat, 18 Mar 2023 04:38:07 -0400 Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF4E5AFBB7; Sat, 18 Mar 2023 01:37:56 -0700 (PDT) Received: by mail-io1-xd33.google.com with SMTP id d14so448715ion.9; Sat, 18 Mar 2023 01:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679128676; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6ieG7L9msYA/7lhUnPh05XbQYvh9ea1Tc8rd619ZsgQ=; b=d5Jmz/4FBL6d+7r7Y7GwenCb+4EgG6JMg97ed/mqotPa/wVddpfWwlNAkkvWrtgpbW phAlK1urY3kUsWzeTCQA6CfaKd+WEwt/MZ5e0TOFEXGbIlZaTE70UeNoUTnLsWNmgIU6 MI7QafQ8P8ccnOpFQpWJdgS1vlotiYEIRV+U8nkZWphxdDzr2EgfPKxcDbBgFGOvqoJw WYWCr0J0N4g0i4iTaetmBrV4OQZ8XQA6rrRXIVCc4syJI7nVjTtP6Pgy3uy2eINzn202 mhl8tXl7aIGe9SKhQnPkHsRX3hPwByXriNw3MC6oK/D/oqwsYPcTUe7DZqtujWULD8aA Pp1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679128676; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6ieG7L9msYA/7lhUnPh05XbQYvh9ea1Tc8rd619ZsgQ=; b=Hshd0YzyViJoocYAlGvSWTq71SVs7KmTrAEVINoe1DD8w0lLEVNr5sH002v9XCWyuD 75y3bocc+pGpIUAS2W3lEjoTHMkV+GjNgXn762zf7dCsVpZFttK+eFK7SRHhko47l1tr QO1qD7N4yTYZxdbGSk1TFOdu3IckUeiyTHxwL7tBQArMok4JRXhvggEZiub3ziGgTU78 EKzBwMhz5jz1+BqCC0bFeS20jM6iO4h5telqp0+8TZtvkZC9ZHoaOP0qJAHKvH0NsvoE AaeDYdS8z2sYuK/x8fGNe/EPIMTapoF6/SB2m0Iuln0TrAnZL7WjVnz6F+fOdUiebia5 brLQ== X-Gm-Message-State: AO0yUKUmhhJhWGO301E+qrmYERSOtiunGHLZBhV0G6mDTdoqMyaof8rv xNCY0Kn4GpA4+1vryrNsgAI= X-Google-Smtp-Source: AK7set9FGB4F1uRNXAX0Pk/2KXzDRt5VIXEaOZtMbjLEJaLnLm3z4gatwEwLDItxcVLd8R8Up8yo5Q== X-Received: by 2002:a05:6602:1c4:b0:74c:8dc7:aa1 with SMTP id w4-20020a05660201c400b0074c8dc70aa1mr1012004iot.17.1679128676172; Sat, 18 Mar 2023 01:37:56 -0700 (PDT) Received: from localhost.localdomain (tunnel785484-pt.tunnel.tserv9.chi1.ipv6.he.net. [2001:470:1f10:aed::2]) by smtp.googlemail.com with ESMTPSA id h8-20020a6b7a08000000b00746041ecbf9sm1174834iom.39.2023.03.18.01.37.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Mar 2023 01:37:55 -0700 (PDT) From: Tianling Shen To: Rob Herring , Krzysztof Kozlowski , Heiko Stuebner , Jagan Teki , Peter Geis , Andy Yan , Tianling Shen , Brian Norris , Chris Morgan , Sebastian Reichel , Andrew Lunn , Michael Riesch , Maya Matuszczyk , Andrew Powers-Holmes , Sascha Hauer , Vasily Khoruzhick Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] arm64: dts: rockchip: remove I2S1 TDM node for the NanoPi R5 series Date: Sat, 18 Mar 2023 16:37:45 +0800 Message-Id: <20230318083745.6181-6-cnsztl@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230318083745.6181-1-cnsztl@gmail.com> References: <20230318083745.6181-1-cnsztl@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This is for the audio output which does not exist on the boards. Also disable regulator-always-on for vccio_acodec since it's only used by the audio output. Fixes: c6629b9a6738 ("arm64: dts: rockchip: Add FriendlyElec Nanopi R5S") Signed-off-by: Tianling Shen --- arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi index dd9a7907a1c5..58ba328ea782 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi @@ -330,7 +330,6 @@ regulator-state-mem { vccio_acodec: LDO_REG4 { regulator-name = "vccio_acodec"; - regulator-always-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; @@ -441,11 +440,6 @@ &i2s0_8ch { status = "okay"; }; -&i2s1_8ch { - rockchip,trcm-sync-tx-only; - status = "okay"; -}; - &pcie30phy { data-lanes = <1 2>; status = "okay";