From patchwork Fri Feb 9 07:23:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 198770 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp682135dyd; Thu, 8 Feb 2024 23:24:12 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUOIj1yBcapcBdrQng57ash+RP9X4PwudiNm/2Lk3SgMlfuRWJABsobxl7/j6kQJkK3Asqam/IwzmqBWPIGYxRkQbfg2A== X-Google-Smtp-Source: AGHT+IEfE4NOzlSaXNkUICpSNA7fzquV92x3CZmgHxvcrfeS31UqsSxrXa5UFuZWdCVeD7l2ytDy X-Received: by 2002:a17:906:16c4:b0:a38:29e5:e6e6 with SMTP id t4-20020a17090616c400b00a3829e5e6e6mr472414ejd.8.1707463452741; Thu, 08 Feb 2024 23:24:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707463452; cv=pass; d=google.com; s=arc-20160816; b=cCaW/57J73UVK5HOvq/cx7mrEngA6n5vqk+2T+UdXNrVnYpt+4gUE9CMKINY1IVp9q gg47psOAJ5/Cj5jQ32sCFIiICtGlnGjGIBwuCqFz5k9wTSped1EYWfEWy4Xf2oq1XVLt qragwkJj4VsnOq32YONcACUpMn9VFio10o3UXi26yMDiL3W/Q9h4OeiQMWyK8MpfBmzR 6ZGjchg8xN1DL45AcHppW0rYt8xtACPuelqZUQMvuCsgwFNlkNp7G1NXnn4f7l+uM306 OmRoQO5M3IZvfZ2+D9E/ab8fsqzPVBWkax8WAYcUbAU/L6PM6Is9u86lSpTAcV3NUCRr 62pg== ARC-Message-Signature: i=2; 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=yA1XgL1R9WxxOtIY8CnNkY8TcITrL/GQzQuoi7f9MIE=; fh=SrlLg6MeVVbYXlxx6OhbdqIGfKgw7NCoid9SlmjGkRE=; b=VPmj6PPPU1z6Vb09GZX6AhGuX7/MvoFGvRUUqYCubys3R5+1X1MJSxHT7rU2bf3lIJ TjRrpQUwJLd0LUCgyFnT6nryMCmGkk8Io0eYL2wlY3cTD49IXFH5Ei1A3UVMCRdpkjrD k9DOZu1aWYUJm8fJcWmHMWtJhkMh9W/uGrSrPecBXuhOOAt4fVL22L7HpceQe3q8fsBc ywlX2SNCBUcXd84JyX3csHG0k/X3pU/o/7+wS8jO6MB5siyxZTEHHBesmSqHUKD/0T1R a84Q229HFewmbDyewcHC8fvLf2hbYJSFLo4WqGyezMeIU1G6eXM3BaTWyGwrcFzVZLe8 HTqw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=gTRqxxzt; arc=pass (i=1 spf=pass spfdomain=rts-flowmailer.siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of linux-kernel+bounces-59062-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59062-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Forwarded-Encrypted: i=2; AJvYcCVHbiNSFk1GZg7ILmM5XA/grYy7ROFkequfnUckWUN/rHcex4ImXleGaaSzeGo9f5vgmCCfC8WVAI4njNv9Jnbg8DeLpQ== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id cw17-20020a170906c79100b00a3bb83f2392si489537ejb.1054.2024.02.08.23.24.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 23:24:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-59062-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=gTRqxxzt; arc=pass (i=1 spf=pass spfdomain=rts-flowmailer.siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of linux-kernel+bounces-59062-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59062-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 5E0511F2506B for ; Fri, 9 Feb 2024 07:24:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9A301664CC; Fri, 9 Feb 2024 07:23:32 +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="gTRqxxzt" 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 1693365BB7 for ; Fri, 9 Feb 2024 07:23:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.136.64.228 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707463409; cv=none; b=Dgb9XO5kq98lSMtAC2fsrIBHnsMw5KS1yUZK5CkjJunmJ0NKInHAyqCHzoh5M07qF813tggFzG7Jvi+0/DrXNUm4iEsq6jKrcYOc3OULoxU/UdqMb3zXoEehumpBth5t/8O9Zfww4mYTJijdwqcD1U5gZ5Te7AyeCN2xChHe3Xs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707463409; c=relaxed/simple; bh=RLUBw5rRXak8EjSpQFHg4m3NozL4KVpKO2aKpiNsJRw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NL/v/5F/S7Frp/+f//LX5PvS0zOD6uh0qNLvHNCQ+5jIO72yH+1StdfeCxa5RNac0aTJNPq1npjTJQt8O3M4czjCzOjJH2baucWZr1PGkQ+Pe8PAsdQRS9mzNpzzgVU9C1dWByZP2+3VjfyG6MCbifZB8qaQ3ZJnoDvhYPItw/o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=siemens.com; spf=pass smtp.mailfrom=rts-flowmailer.siemens.com; dkim=pass (1024-bit key) header.d=siemens.com header.i=jan.kiszka@siemens.com header.b=gTRqxxzt; arc=none smtp.client-ip=185.136.64.228 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 2024020907232358eb532dec3571116f for ; Fri, 09 Feb 2024 08:23:23 +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=yA1XgL1R9WxxOtIY8CnNkY8TcITrL/GQzQuoi7f9MIE=; b=gTRqxxztly4FS8drCSRCTqbssCSQ+A3SVMLaKQSv8PwkxIWjO0QJofo+2HSODB5FRs+fT1 C9FCI3I+viLBjAFB+jPJtqx6FO9w8dzavQhRexM5lQht+N0jtemKlsJvse1VUkgnCUHA02lk tZvVc8rh1QdDWcfQHkbjIDAkGnUmw=; 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 v3 2/7] arm64: dts: ti: iot2050: Disable R5 lockstep for all PG2 boards Date: Fri, 9 Feb 2024 08:23:16 +0100 Message-Id: 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: 1790405197753451395 X-GMAIL-MSGID: 1790405197753451395 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 1d6cddb11991..3bb6bcb0a5d3 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 @@ -40,8 +40,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>; -};