Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp266318rwb; Mon, 26 Sep 2022 12:03:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4xM8VS5ZfxLD+urpTtenc0UcYwV74e5FfZrrg/mwsUYiy7A7JTkHalasa5XJer/FydcfjT X-Received: by 2002:a17:903:247:b0:179:b5e1:54b7 with SMTP id j7-20020a170903024700b00179b5e154b7mr23267912plh.84.1664219029533; Mon, 26 Sep 2022 12:03:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664219029; cv=none; d=google.com; s=arc-20160816; b=sdpv0Sg3BwIvBTDQam3pVMTwMFvvsUlh6cQVr4juau4yOmMRlVavCBz9dV/xpinsbK RzP0aDyIqrHUXdmZT8cRf4wl47RcXsu9ndr8vaWIRUTWvv9kQIt4LijHwT9vS3kwfU8Y LqaViRUARthB30qI+lJXEPHOCoS7soLnzsvan+wLEUUKzyv9sWzhOyle6IKWDE5mGULt idj9TWnOaQqqWQUjUjy/SvI0SKhp67XIF9DwO3kAYk2KfcxdvK5DHpV/6TixHMlnOJgS h8i76US05iJcpXO+ryXm0rtuyRqKUb25uuB7+LW7z/AKsHEFL+87GROyQjIcQMI2+nHo A8zg== 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; bh=8tzVjEw6wHywY1V78okyf4mzpG2ipXWiLJMsngZ7T0s=; b=xD98bfIMFoD8Q9Zj2yTR+ynnV6G9zPT7EOaw4uqTxfP4POURvnu3zle1nC1muBpgWT 7SucXheo1SsKJ6XBYNfNVzAC4U/esOD73JnmV3GfEfCWgRboClhD8129jdtTBPg1Dkq+ iZvoUdH9z18u9TCKNp/cnVka83pOjDvSn9z+2QlLjOd85aOa1q8TuAEFnJDTw5FuP6Da ZAxc4xvF/YDoz6TTPDBISHKGpW/5oZNOu4KFA7yY3308QyLUZUvpqSIb9hz1gAAdOWQ5 MzIUlfIqDcnc+4YfjWHrAn4k0gZ5cViF2qDz+eA8PC/qnPLTIw/2SOIAtkBH99R0vbRK lcIg== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=jmu.edu.cn Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c5-20020a170902724500b00178aa0b29ebsi11564718pll.552.2022.09.26.12.03.33; Mon, 26 Sep 2022 12:03:49 -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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=jmu.edu.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229482AbiIZSWi (ORCPT + 99 others); Mon, 26 Sep 2022 14:22:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230525AbiIZSWQ (ORCPT ); Mon, 26 Sep 2022 14:22:16 -0400 Received: from mail-m121145.qiye.163.com (mail-m121145.qiye.163.com [115.236.121.145]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7F83E2126F; Mon, 26 Sep 2022 11:18:47 -0700 (PDT) Received: from amadeus-VLT-WX0.lan (unknown [218.85.118.195]) by mail-m121145.qiye.163.com (Hmail) with ESMTPA id AFC048000E8; Tue, 27 Sep 2022 02:01:25 +0800 (CST) From: Chukun Pan To: linux.amoon@gmail.com Cc: heiko@sntech.de, krzysztof.kozlowski+dt@linaro.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-arm-kernel@lists.infradead.org, michael.riesch@wolfvision.net, robh+dt@kernel.org, Chukun Pan Subject: [PATCH 2/3] arm64: dts: rockchip: Rename pinctrl label of pcie2x1 on rock-3a Date: Tue, 27 Sep 2022 02:01:01 +0800 Message-Id: <20220926180102.37614-3-amadeus@jmu.edu.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220926180102.37614-1-amadeus@jmu.edu.cn> References: <20220926061420.1248-1-linux.amoon@gmail.com> <20220926180102.37614-1-amadeus@jmu.edu.cn> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-HM-Spam-Status: e1kfGhgUHx5ZQUpXWQgPGg8OCBgUHx5ZQUlOS1dZFg8aDwILHllBWSg2Ly tZV1koWUFITzdXWS1ZQUlXWQ8JGhUIEh9ZQVlCTUxLVhodSRoZTkhJQ01ISFUTARMWGhIXJBQOD1 lXWRgSC1lBWUlKQ1VDTlVKSkNVSkJOWVdZFhoPEhUdFFlBWU9LSFVKSktISkNVSktLVUtZBg++ X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6MDY6Ojo4KD0eUQhDHCohSS4X PBdPCg1VSlVKTU1PSUpOSUNNSENKVTMWGhIXVRoWGh8eDgg7ERYOVR4fDlUYFUVZV1kSC1lBWUlK Q1VDTlVKSkNVSkJOWVdZCAFZQUlOSEg3Bg++ X-HM-Tid: 0a837af600bdb03akuuuafc048000e8 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS 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 Distinguish it from the pinctrl label of pcie3x2 added later. Also added comments to the pcie2x1 node. Signed-off-by: Chukun Pan --- arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts index 8adf672709e8..1b195355da2a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts @@ -539,8 +539,9 @@ rgmii_phy1: ethernet-phy@0 { }; &pcie2x1 { + /* M.2 slot */ pinctrl-names = "default"; - pinctrl-0 = <&pcie_reset_h>; + pinctrl-0 = <&ngffpcie_reset_h>; reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_pcie>; status = "okay"; @@ -582,7 +583,7 @@ pcie_enable_h: pcie-enable-h { rockchip,pins = <0 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>; }; - pcie_reset_h: pcie-reset-h { + ngffpcie_reset_h: ngffpcie-reset-h { rockchip,pins = <3 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; }; }; -- 2.25.1