From patchwork Sat Nov 4 08:52:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 161542 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1538229vqu; Sat, 4 Nov 2023 01:52:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEu1XEwZ9Zd4XJglXuOzdsWqcQswOBqEYIJTRoyM2hY90o77VPA7znCQ+d0p0oBe+KJkof5 X-Received: by 2002:a05:6830:4412:b0:6b9:e35e:8dd with SMTP id q18-20020a056830441200b006b9e35e08ddmr29430403otv.2.1699087971850; Sat, 04 Nov 2023 01:52:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699087971; cv=none; d=google.com; s=arc-20160816; b=y5AeBNoIOzLAiIbmicuSuD8Vzih2qeNIQztTWwMIlrA077NhMoVzHnR10lrb3ZXBj0 WTlqoisLOo+ntTECKF0d7zx2ep2uvEtu6JwZHVBrKVrIqDFtePAQLm6dfPDE4Yn+rJm2 WoYpAf1r3C41SJe1DVcbKLGL+CR+9TZ+k1ByRp2WpMLvQZFoma3mTfzjY7GBXx647OAM L8QoI95lRyTv8VsGScngEvyLDIG5DnsV5D6gUGV8dBNQXHkNS1hj3/FOLqUfdF7HDZyP GKyujuGFiw91tdh/kxdv/M0BqaiwsATUMz+OV/rXkXOCAS7KDZG6YsSGBi8raz8Fh7Gf BJUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hHqaC22BDUX5wdFjuthGbc7/iEcww7bj2jxLI4CETgg=; fh=TXmJ51wQtzLLjes0qtH+NOoYV89/uc4AwJxMSeVWyD4=; b=TooP9GAX1kPEai8jR9rn/9H6pOaN7NL7BTVe7xJLVrJwy5fTKof2AiK/O3Nxxx1BPh yG+uggf4+qlE3O7viARoIoGfmy5gVt2UxPIXJKxKY4hP7VbuahYb7uZj4ljwekHf4vO8 BHoVZquNFOrnC1gfPFLYgob4DjiPtil1PXMqf6c4LggbkQIl3aMPkgZA5SJ6LWkJKZY4 A6PH3FJPAz/NOLkQJ97/gLSZ08niKY3BTX73XDBeQUkgsQW0LrPRe2EUA1R7HBxrvFoS 4/he7W1sMESsVMBgIWDvHPso/nUe9ZJ6z/tRxUzDmV3rfmW0vwkfRVVjWqBXMQfXecKJ TJLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=p+vuI95z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id w10-20020a17090abc0a00b002807e5a8b55si3424037pjr.82.2023.11.04.01.52.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Nov 2023 01:52:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=p+vuI95z; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id A9CB281067AE; Sat, 4 Nov 2023 01:52:44 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229612AbjKDIw3 (ORCPT + 35 others); Sat, 4 Nov 2023 04:52:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44754 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229468AbjKDIw2 (ORCPT ); Sat, 4 Nov 2023 04:52:28 -0400 Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net [185.136.65.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6950CD47 for ; Sat, 4 Nov 2023 01:52:23 -0700 (PDT) Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 20231104085221354bf49d2228cb01c0 for ; Sat, 04 Nov 2023 09:52:21 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=hHqaC22BDUX5wdFjuthGbc7/iEcww7bj2jxLI4CETgg=; b=p+vuI95z49Ud7hvUDopjStbVlqm5v/sKgKPj+Plq164K4q0Of7W+k7OhiFZNIj6SIaw5LA Y9KkrIGN0vJvbvaFcNtsOes+LR8A6T+chGXiCd0hil9ZIwfKAPdT9hJzFQrF5fbG4hAAbIV8 aySmoaCNYkq2lWyTFLgI6Y3AsafD4=; From: Jan Kiszka To: Nishanth Menon , Vignesh Raghavendra , Tero Kristo , Rob Herring , Krzysztof Kozlowski Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Bao Cheng Su , Benedikt Niedermayr Subject: [PATCH v4 4/5] arm64: dts: ti: iot2050: Refactor the m.2 and minipcie power pin Date: Sat, 4 Nov 2023 09:52:18 +0100 Message-Id: <8b2f8c1698421b8d0694eb337ad7ea2320d76aa6.1699087938.git.jan.kiszka@siemens.com> In-Reply-To: References: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sat, 04 Nov 2023 01:52:44 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781622868780514126 X-GMAIL-MSGID: 1781622868780514126 From: Su Bao Cheng Make the m.2 power control pin also available on miniPCIE variants. This can fix some miniPCIE card hang issue, by forcing a power on reset during boot. Signed-off-by: Baocheng Su Signed-off-by: Jan Kiszka --- .../arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi | 4 +++- arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 11 +++++++++++ .../boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts | 8 +------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi index e9419c4fe605..e9b57b87e42e 100644 --- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi @@ -20,7 +20,9 @@ AM65X_IOPAD(0x01e0, PIN_OUTPUT, 7) &main_gpio1 { pinctrl-names = "default"; - pinctrl-0 = <&cp2102n_reset_pin_default>; + pinctrl-0 = + <&main_pcie_enable_pins_default>, + <&cp2102n_reset_pin_default>; gpio-line-names = "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi index 41c980d2a242..d2b6439cf496 100644 --- a/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi @@ -852,6 +852,12 @@ AM65X_IOPAD(0x00CC, PIN_INPUT_PULLDOWN, 7) >; }; + main_pcie_enable_pins_default: main-pcie-enable-default-pins { + pinctrl-single,pins = < + AM65X_IOPAD(0x01c4, PIN_INPUT_PULLUP, 7) /* (AH13) GPIO1_17 */ + >; + }; + main_uart1_pins_default: main-uart1-default-pins { pinctrl-single,pins = < AM65X_IOPAD(0x0174, PIN_INPUT, 6) /* (AE23) UART1_RXD */ @@ -981,6 +987,11 @@ &main_gpio0 { "", "IO9"; }; +&main_gpio1 { + pinctrl-names = "default"; + pinctrl-0 = <&main_pcie_enable_pins_default>; +}; + &wkup_gpio0 { pinctrl-names = "default"; pinctrl-0 = diff --git a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts index 8301c35c31b3..bd6f2e696e94 100644 --- a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts +++ b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts @@ -27,12 +27,6 @@ &mcu_r5fss0 { }; &main_pmx0 { - main_m2_enable_pins_default: main-m2-enable-default-pins { - pinctrl-single,pins = < - AM65X_IOPAD(0x01c4, PIN_INPUT_PULLUP, 7) /* (AH13) GPIO1_17 */ - >; - }; - main_bkey_pcie_reset: main-bkey-pcie-reset-default-pins { pinctrl-single,pins = < AM65X_IOPAD(0x01bc, PIN_OUTPUT_PULLUP, 7) /* (AG13) GPIO1_15 */ @@ -72,7 +66,7 @@ &main_gpio0 { &main_gpio1 { pinctrl-names = "default"; pinctrl-0 = - <&main_m2_enable_pins_default>, + <&main_pcie_enable_pins_default>, <&main_pmx0_m2_config_pins_default>, <&main_pmx1_m2_config_pins_default>, <&cp2102n_reset_pin_default>;