From patchwork Wed Jan 3 18:12:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 184810 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5187765dyb; Wed, 3 Jan 2024 10:23:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IEUFA3mYhS5EzPKDQmy3CufrrPxRVF4kE5dsTL1xCUjCcbXEFo0k9Zgin3K+ZdfG2no3KjB X-Received: by 2002:a17:902:7d83:b0:1d4:7691:4629 with SMTP id a3-20020a1709027d8300b001d476914629mr5677252plm.24.1704306212986; Wed, 03 Jan 2024 10:23:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704306212; cv=none; d=google.com; s=arc-20160816; b=PUuQcMYqRzqZQ3g58Ggxv1aqRLCNQOsSPzNu7IAyazRXNuJDGmzgMBonxmCAZtgQFl 0+QZo5ZmEPHaptNu8SuqJfgimBXgqDVQ038cKv6NqUfwF5PyBm45LxMrypphepkKUCq8 QAkzHeWcmM6uLHpdLYoLT7J4ff7awZ1t1unBfUKOnWCzllzzXdNwyaxCFzB2tXD4rjFi LjL3GT+1s3Msx1s0P8EDqvEMs3xrFcOqXPWjOLKP9SMS0vPCHJvTZXLlg9aK8FvAeyOp TFxzOGhErnts3HcO3+cEAiBs5KlIaxK36vzk4FgYco6fKULuM+hcYqd/gnbEHodmVUab gB1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=5xW+98WHaV2XUXSnRdkYfMBQBIiopl+UMOYJignJW1c=; fh=tfCrjVfEnzKAxfmcuIHCHZZ5o2OoYwF20+LehZ6vA/A=; b=yP/4BHs6bUEgStEEFFuJ2ty3VDp2EdsWsJJuwOBYHio0x/azi87QOzPxPewTXJAKyW 5HFR+EgwfvOKrOF4cHOcYIgKEwNOUnmeaKJHeZUCM6KJ6jJwqIF2p9C/idymtffK7QIs 5xsn/IFzfIpYk+HSYzN83Ij9Utvysgm/GRNSwkuXg/evAyWgSdxBbBU1TRriUXbTTGNT FfDfFJX9vGgjwzUxM0UB26qlFz7F6bE+N4r9aPo0ypXpLgYEOshJxnSF98W9Nqtmdp2M ocdyzhA6DmeqTdDSWtj6cGJAWPz2Y02/0jka16awqg3o+rRQrT3dU6tg+RY+5J+L6OUP FcyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CbiOh7U5; spf=pass (google.com: domain of linux-kernel+bounces-15851-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-15851-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id o2-20020a1709026b0200b001d4726415b6si13602181plk.395.2024.01.03.10.23.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 10:23:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-15851-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CbiOh7U5; spf=pass (google.com: domain of linux-kernel+bounces-15851-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-15851-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id B92D2284830 for ; Wed, 3 Jan 2024 18:23:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 823991CF9A; Wed, 3 Jan 2024 18:22:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=siemens.com header.i=jan.kiszka@siemens.com header.b="CbiOh7U5" X-Original-To: linux-kernel@vger.kernel.org Received: from mta-64-228.siemens.flowmailer.net (mta-64-228.siemens.flowmailer.net [185.136.64.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 530BE1C693 for ; Wed, 3 Jan 2024 18:22:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=siemens.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rts-flowmailer.siemens.com Received: by mta-64-228.siemens.flowmailer.net with ESMTPSA id 20240103181226ec777398c771f7020a for ; Wed, 03 Jan 2024 19:12:26 +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=5xW+98WHaV2XUXSnRdkYfMBQBIiopl+UMOYJignJW1c=; b=CbiOh7U5507ZjpM3sPs3sCY2UyB3zakd2oH1WqzqyiNU+fxVC2y7RBty6cwqcyxhpcm7jm u3puY91Ys+0iPbPUMFqEHMKGlGkNjNFTGW9loBJdy2sKqvpBJ8rLamqEfi68wL+ivR/rkI9D kzjRkJHMu6RoZa0I8B2UUCZ1giKx8=; From: Jan Kiszka To: Nishanth Menon , Vignesh Raghavendra , Tero Kristo , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Bao Cheng Su Subject: [PATCH v2 2/7] arm64: dts: ti: iot2050: Disable R5 lockstep for all PG2 boards Date: Wed, 3 Jan 2024 19:12:19 +0100 Message-Id: <3090610bbbf9b2b7f994704ef9d049a7955756ee.1704305544.git.jan.kiszka@siemens.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1787094591863372641 X-GMAIL-MSGID: 1787094591863372641 From: Baocheng Su The R5 lockstep disabling should be common for all PG2 boards, move it from variants dts to common-pg2.dtsi. As now the Basic PG2 consumes this twice, move Basic disabling to the PG1 variant. Signed-off-by: Baocheng Su [Jan: avoid duplication of disabling for Basic PG2] Signed-off-by: Jan Kiszka --- arch/arm64/boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi | 7 ++++++- arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi | 5 ----- arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts | 5 +++++ arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2.dts | 5 ----- arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts | 7 +------ 5 files changed, 12 insertions(+), 17 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 e9b57b87e42e..42adb8815f38 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 @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (c) Siemens AG, 2021 + * Copyright (c) Siemens AG, 2021-2023 * * Authors: * Chao Zeng @@ -9,6 +9,11 @@ * Common bits of the IOT2050 Basic and Advanced variants, PG2 */ +&mcu_r5fss0 { + /* lock-step mode not supported on PG2 boards */ + ti,cluster-mode = <0>; +}; + &main_pmx0 { cp2102n_reset_pin_default: cp2102n-reset-default-pins { pinctrl-single,pins = < diff --git a/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi b/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi index 5ab434c02ab6..2300abe69e94 100644 --- a/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-common.dtsi @@ -54,8 +54,3 @@ &main_uart0 { pinctrl-names = "default"; pinctrl-0 = <&main_uart0_pins_default>; }; - -&mcu_r5fss0 { - /* lock-step mode not supported on Basic boards */ - ti,cluster-mode = <0>; -}; diff --git a/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts b/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts index 87928ff28214..be9c8db4c43a 100644 --- a/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts +++ b/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts @@ -22,3 +22,8 @@ / { compatible = "siemens,iot2050-basic", "ti,am654"; model = "SIMATIC IOT2050 Basic"; }; + +&mcu_r5fss0 { + /* lock-step mode not supported on this board */ + ti,cluster-mode = <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 bd6f2e696e94..1e5d4d98b69b 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 @@ -21,11 +21,6 @@ / { model = "SIMATIC IOT2050 Advanced M2"; }; -&mcu_r5fss0 { - /* lock-step mode not supported on this board */ - ti,cluster-mode = <0>; -}; - &main_pmx0 { main_bkey_pcie_reset: main-bkey-pcie-reset-default-pins { pinctrl-single,pins = < diff --git a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts index f00dc86d01b9..a8ce8c891894 100644 --- a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts +++ b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-pg2.dts @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * Copyright (c) Siemens AG, 2018-2021 + * Copyright (c) Siemens AG, 2018-2023 * * Authors: * Le Jin @@ -22,8 +22,3 @@ / { compatible = "siemens,iot2050-advanced-pg2", "ti,am654"; model = "SIMATIC IOT2050 Advanced PG2"; }; - -&mcu_r5fss0 { - /* lock-step mode not supported on this board */ - ti,cluster-mode = <0>; -};