From patchwork Wed Jan 3 18:12:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kiszka X-Patchwork-Id: 184811 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5187939dyb; Wed, 3 Jan 2024 10:23:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IHNHHvyuED0+snziYiB8d8QEVpHoubB5COTfgBp4kIbmEeSg2mAYbuQxyzXPmnJBll7troV X-Received: by 2002:a05:6e02:1b09:b0:35f:c0c2:4bd0 with SMTP id i9-20020a056e021b0900b0035fc0c24bd0mr32577719ilv.43.1704306233081; Wed, 03 Jan 2024 10:23:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704306233; cv=none; d=google.com; s=arc-20160816; b=BLkjOAD4QBtrh3kpuwqiX15TNI1uD1laZy8iYmOVzKf3bueVWKeYnencqp+vPUwJli HuVnHF3AXYIy3PAygS37DhFm5VaybtlgcZmXvIUsqmHZnTHr/1Z+984QRRmMxoNCqYXE iZsjyIq7/P0KTceTk3hN6c/DpuTXNhtLimJmp2tqbGyZi/fvKuTRceuAHMQ2ti1i+4Ap yB1MM1eHaTRn4St7RbcNYGKxSUxxan1CxqxhDZt5x4zerNBMjnuzSba3824owWn1xiwD gZlW10t1qJZsBFm0kClHxLw90oryBgF+OO4Th5CjfGfj5aZL6ZvwjJsF5WYoUXTVbkJp C6ig== 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=UsB2q7UTNVWkhSlQ0b0abrpeXuTMKXjbbt56rKrEWgE=; fh=tfCrjVfEnzKAxfmcuIHCHZZ5o2OoYwF20+LehZ6vA/A=; b=yqGM9DHcWxUOY5vKClrsqK8iKVzfEb/xjeCECZrz00Sszg46E4xgZtXSb9iVKxC2rE IKpvFZ+3LUz4/So+A/pvPPGZ1iQmXxwaEp9NDFBOnWxNIRmUXB+OZn4euOiDYYEFAdPl KDxjlLO5fdeeXFngYOHZU6Ltb9HQQgrQBryyE2QzWh1hMXAzhT3tBwjFw6eMy+A55lnG zgvQNYwvSQLcTz7w5Hu995RY9eNAEIBsJz34QSiENcvOlRkvxLWbay0YtfHX3F6p4ftm lAoIckyqCrW0ndUM64Mi5xCfC4caBspGwQZhfSbxLctgfhyEegm19nvmQ4VTC4RV10tG e5HA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=aB51HCgg; spf=pass (google.com: domain of linux-kernel+bounces-15853-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-15853-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 w186-20020a6382c3000000b005ce02d98991si17862745pgd.875.2024.01.03.10.23.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 10:23:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-15853-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=aB51HCgg; spf=pass (google.com: domain of linux-kernel+bounces-15853-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-15853-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 D479A285AA8 for ; Wed, 3 Jan 2024 18:23:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4463C1D52E; Wed, 3 Jan 2024 18:22:42 +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="aB51HCgg" 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 AF45D1C698 for ; Wed, 3 Jan 2024 18:22:36 +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 20240103181227fabd985ac71e50af22 for ; Wed, 03 Jan 2024 19:12:27 +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=UsB2q7UTNVWkhSlQ0b0abrpeXuTMKXjbbt56rKrEWgE=; b=aB51HCggmHjkYM5lEkIJ1q+PH0UDVw00wRA9fRTBgNsgoiakDtcaiLO0aqf3tolfSYYXrS sLB+dlzucwPLAPNQo7P4fTG2NQxxtfAQJbHx0ceGFICGtAntKdAGVUTLVcKS1Vca5JM5AT5J VBF2ESnDtLsiYrVar38PYaqpVqqDQ=; 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 4/7] arm64: dts: ti: iot2050: Factor out enabling of USB3 support Date: Wed, 3 Jan 2024 19:12:21 +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: 1787094612575175880 X-GMAIL-MSGID: 1787094612575175880 From: Jan Kiszka Already simplifies the existing code by avoid the switch back in the m2 variant to what k3-am65-main.dtsi provided as base. Signed-off-by: Jan Kiszka --- .../dts/ti/k3-am65-iot2050-common-pg2.dtsi | 18 ------------- .../boot/dts/ti/k3-am65-iot2050-usb3.dtsi | 27 +++++++++++++++++++ .../dts/ti/k3-am6528-iot2050-basic-pg2.dts | 1 + .../dts/ti/k3-am6548-iot2050-advanced-m2.dts | 13 --------- .../dts/ti/k3-am6548-iot2050-advanced-pg2.dts | 1 + 5 files changed, 29 insertions(+), 31 deletions(-) create mode 100644 arch/arm64/boot/dts/ti/k3-am65-iot2050-usb3.dtsi 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 42adb8815f38..93d966b67d8d 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 @@ -38,21 +38,3 @@ &dss { /* Workaround needed to get DP clock of 154Mhz */ assigned-clocks = <&k3_clks 67 0>; }; - -&serdes0 { - assigned-clocks = <&k3_clks 153 4>, <&serdes0 AM654_SERDES_CMU_REFCLK>; - assigned-clock-parents = <&k3_clks 153 7>, <&k3_clks 153 4>; -}; - -&dwc3_0 { - assigned-clock-parents = <&k3_clks 151 4>, /* set REF_CLK to 20MHz i.e. PER0_PLL/48 */ - <&k3_clks 151 8>; /* set PIPE3_TXB_CLK to WIZ8B2M4VSB */ - phys = <&serdes0 PHY_TYPE_USB3 0>; - phy-names = "usb3-phy"; -}; - -&usb0 { - maximum-speed = "super-speed"; - snps,dis-u1-entry-quirk; - snps,dis-u2-entry-quirk; -}; diff --git a/arch/arm64/boot/dts/ti/k3-am65-iot2050-usb3.dtsi b/arch/arm64/boot/dts/ti/k3-am65-iot2050-usb3.dtsi new file mode 100644 index 000000000000..3f5fe4c38ebc --- /dev/null +++ b/arch/arm64/boot/dts/ti/k3-am65-iot2050-usb3.dtsi @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) Siemens AG, 2024 + * + * Authors: + * Jan Kiszka + * + * Common bits for IOT2050 variants with USB3 support + */ + +&serdes0 { + assigned-clocks = <&k3_clks 153 4>, <&serdes0 AM654_SERDES_CMU_REFCLK>; + assigned-clock-parents = <&k3_clks 153 7>, <&k3_clks 153 4>; +}; + +&dwc3_0 { + assigned-clock-parents = <&k3_clks 151 4>, /* set REF_CLK to 20MHz i.e. PER0_PLL/48 */ + <&k3_clks 151 8>; /* set PIPE3_TXB_CLK to WIZ8B2M4VSB */ + phys = <&serdes0 PHY_TYPE_USB3 0>; + phy-names = "usb3-phy"; +}; + +&usb0 { + maximum-speed = "super-speed"; + snps,dis-u1-entry-quirk; + snps,dis-u2-entry-quirk; +}; diff --git a/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts b/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts index c62549a4b436..8be3370d3de1 100644 --- a/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts +++ b/arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic-pg2.dts @@ -17,6 +17,7 @@ #include "k3-am6528-iot2050-basic-common.dtsi" #include "k3-am65-iot2050-common-pg2.dtsi" +#include "k3-am65-iot2050-usb3.dtsi" / { compatible = "siemens,iot2050-basic-pg2", "ti,am654"; 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 2401cbe2b66c..38623501a14f 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 @@ -92,16 +92,3 @@ &pcie0_rc { &pcie1_rc { status = "disabled"; }; - -&dwc3_0 { - assigned-clock-parents = <&k3_clks 151 4>, /* set REF_CLK to 20MHz i.e. PER0_PLL/48 */ - <&k3_clks 151 9>; /* set PIPE3_TXB_CLK to CLK_12M_RC/256 (for HS only) */ - /delete-property/ phys; - /delete-property/ phy-names; -}; - -&usb0 { - maximum-speed = "high-speed"; - /delete-property/ snps,dis-u1-entry-quirk; - /delete-property/ snps,dis-u2-entry-quirk; -}; 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 c1205feef54e..b6e878a31c27 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 @@ -18,6 +18,7 @@ #include "k3-am6548-iot2050-advanced-common.dtsi" #include "k3-am65-iot2050-common-pg2.dtsi" #include "k3-am65-iot2050-arduino-connector.dtsi" +#include "k3-am65-iot2050-usb3.dtsi" / { compatible = "siemens,iot2050-advanced-pg2", "ti,am654";