From patchwork Tue Feb 13 23:57:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Judith Mendez X-Patchwork-Id: 200758 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp892708dyb; Tue, 13 Feb 2024 16:22:50 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWrWxEneOXcKge5djZ4iXh7OmtBuk0zR840iFQEcGilv2IUFFZcjAHsT2vd+u6ReChTg7D05kUQTUTiVm24d4kk9dX5MQ== X-Google-Smtp-Source: AGHT+IGm5Ce4SwUXX4DB8vYR6yoUSCQHib6jsRJWgxYGhBytAyFoJ/ehWnKhCn52PVDlOEHrnx/t X-Received: by 2002:a05:6830:11:b0:6e2:f274:ae45 with SMTP id c17-20020a056830001100b006e2f274ae45mr1148060otp.8.1707870169928; Tue, 13 Feb 2024 16:22:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707870169; cv=pass; d=google.com; s=arc-20160816; b=vrojJ1jbqix69h92RB0EcHl0u7nLSwSk8dJKO56wD+F/j7k6Y1GCW49306QKnOYrci ch6oaFOIWPNFajNzT5q1xPMnF0XBMi80h0OrGRU9qaGidLR3GYSDi1GNzRioBaxuHto2 rcuOVosadCWXVF+4t2vwDsjvNwPfW+Zxz5PvcJdIvoPqcfFZIFw/sX4cRzWLRVULNXsz u5jzhCZ98cDx3JsHicdoWPVqdZbSGe9V5ZzOcWD3ePXGzKOiNUv/yJUw4BCKqGbvthzf JPtKpaNDUrjjkj5ym+V91SR+/oJbXNG425crEAdbwsjGm/E6/swLqgq8o9f9T+0kMlGr m8sA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=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=/WcExtCyjlnfkA+bJp5aMo+t4fHPF5BrVXG9tvI1no8=; fh=KIb79fxbC0H256YBgTca6QTzVNLBouHYqpjrQ8oS3g8=; b=OSSAdqbXrGWy1WyngHGtAIRY/v8BrNRkFLBSphviVpxlBGVbO4LrSC2VDyDy/T+D4e o9lXcx+TsjF3l1K/bScmWJ9PXi99KWQqKiH2MQF1um4yBm3DSNVYyL6Ms1HI1nLpRo/h vig2x18WxbF76SODoOjwSRH4f7/JHMRpm5dzDWU/TFyzoC6IJDqBu9l7jAOS2+eQu+uJ rSHx8SZEi/kT3n2iQ2hLd55aHgm8j850P13E5RQXHS3Gx90hpGJBgNOkOM929zjCGXXL XWJvsXTYYJsVK+1htMJLiyl8/c5Uawo11QSMCqylq/GwOB+cXhvEiMIFmPFyqCaA+cO3 Rfrw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=tQYFYptP; arc=pass (i=1 spf=pass spfdomain=ti.com dkim=pass dkdomain=ti.com dmarc=pass fromdomain=ti.com); spf=pass (google.com: domain of linux-kernel+bounces-64583-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64583-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com X-Forwarded-Encrypted: i=2; AJvYcCVmC5bcPZaGvTW7lnIafF1ibfa4paRijBN9mOOhh4QHjqbWyGlPD91lJUCXolBXZJ9O+blUKfF5zvr9/zUhm2Em6nrlXw== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id cb11-20020a056a02070b00b005aaab9e7bcfsi3008517pgb.388.2024.02.13.16.22.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 16:22:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-64583-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=tQYFYptP; arc=pass (i=1 spf=pass spfdomain=ti.com dkim=pass dkdomain=ti.com dmarc=pass fromdomain=ti.com); spf=pass (google.com: domain of linux-kernel+bounces-64583-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-64583-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.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 sy.mirrors.kernel.org (Postfix) with ESMTPS id B29B7B29937 for ; Wed, 14 Feb 2024 00:00:00 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8998D69D19; Tue, 13 Feb 2024 23:57:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="tQYFYptP" Received: from lelv0142.ext.ti.com (lelv0142.ext.ti.com [198.47.23.249]) (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 96B1665BD1; Tue, 13 Feb 2024 23:57:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.47.23.249 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707868665; cv=none; b=A844o4WkWFBXFpx8tERJJI2KKlkajwlGrEuAg2P5h4HpAMlV3mS0Z51LVBy489OvyK/Ij05hL4mMnY9hso4Nih2Bd4ISrRr/uh83+Unbrj2zPUlqYLJ1ybIn4jlZxVkCvRg7c3fyb6Cdhsm4cwLpxe6NYHi9qEsQ1Ufe9KgN85Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707868665; c=relaxed/simple; bh=i6WiIEqsFU8zLyOp1haUKZufFMK1rTv4kW7VGD+KgQg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SM3V3w5x/3wFsHAepLmVoE/8vfXDQWqxMbg0qTeBxLcjx9DqtP7xWJLPrpSoN/21IUJ4j6VM5BB5cF0oC5XhRtkPRQ0qivG2FI7Ll82FgpnXsb8Uo+JEeoOtmSVvulmj/BU3BcQ6Jl5KIKoeOdwtdrEpOhn9qe0U7Fz0oSiOiZ4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=tQYFYptP; arc=none smtp.client-ip=198.47.23.249 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0142.ext.ti.com (8.15.2/8.15.2) with ESMTP id 41DNv2iK082884; Tue, 13 Feb 2024 17:57:02 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1707868622; bh=/WcExtCyjlnfkA+bJp5aMo+t4fHPF5BrVXG9tvI1no8=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=tQYFYptPV2s427QX6nC3ME5bkbheM1zmZq/3te4kwcei0W/LTfvNKFl6nJT44jfou MVknRrY/CvOaMteGDmNPi1U7cwRkIVeaTcKC7ccVgWBa9fW8stAZRmeVTsiptwjbpc YqS5tuw36GMe9TrhSKlbKA4/iTDIUhtK/kBbe0/I= Received: from DFLE103.ent.ti.com (dfle103.ent.ti.com [10.64.6.24]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 41DNv2d4050665 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Tue, 13 Feb 2024 17:57:02 -0600 Received: from DFLE111.ent.ti.com (10.64.6.32) by DFLE103.ent.ti.com (10.64.6.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23; Tue, 13 Feb 2024 17:57:01 -0600 Received: from lelvsmtp6.itg.ti.com (10.180.75.249) by DFLE111.ent.ti.com (10.64.6.32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.23 via Frontend Transport; Tue, 13 Feb 2024 17:57:01 -0600 Received: from judy-hp.dhcp.ti.com (judy-hp.dhcp.ti.com [128.247.81.105]) by lelvsmtp6.itg.ti.com (8.15.2/8.15.2) with ESMTP id 41DNv1RC091761; Tue, 13 Feb 2024 17:57:01 -0600 From: Judith Mendez To: Rob Herring , Krzysztof Kozlowski , Conor Dooley CC: Nishanth Menon , Vignesh Raghavendra , Tero Kristo , , , , Wadim Egorov , Francesco Dolcini Subject: [PATCH v3 8/9] arm64: dts: ti: k3-am6*: Fix bus-width property in MMC nodes Date: Tue, 13 Feb 2024 17:57:00 -0600 Message-ID: <20240213235701.2438513-9-jm@ti.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213235701.2438513-1-jm@ti.com> References: <20240213235701.2438513-1-jm@ti.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790831671319138302 X-GMAIL-MSGID: 1790831671319138302 Move bus-width property to *main.dtsi, above the OTAP/ITAP delay values. While there is no error with where it is currently at, it is easier to read the MMC node if the bus-width property is located above the OTAP/ITAP delay values consistently across MMC nodes. Add missing bus-width for MMC2 in k3-am62-main. Signed-off-by: Judith Mendez --- Changes since V3: - No change --- arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 5 +++-- arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 1 - arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 2 +- arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 2 ++ arch/arm64/boot/dts/ti/k3-am642-evm.dts | 2 -- arch/arm64/boot/dts/ti/k3-am642-sk.dts | 1 - 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi index 410b390ce5d5..55420eb1c620 100644 --- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi @@ -559,9 +559,9 @@ sdhci0: mmc@fa10000 { clock-names = "clk_ahb", "clk_xin"; assigned-clocks = <&k3_clks 57 6>; assigned-clock-parents = <&k3_clks 57 8>; + bus-width = <8>; mmc-ddr-1_8v; mmc-hs200-1_8v; - bus-width = <8>; ti,clkbuf-sel = <0x7>; ti,otap-del-sel-legacy = <0x0>; ti,otap-del-sel-mmc-hs = <0x0>; @@ -579,6 +579,7 @@ sdhci1: mmc@fa00000 { power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 58 5>, <&k3_clks 58 6>; clock-names = "clk_ahb", "clk_xin"; + bus-width = <4>; ti,clkbuf-sel = <0x7>; ti,otap-del-sel-legacy = <0x8>; ti,otap-del-sel-sd-hs = <0x0>; @@ -591,7 +592,6 @@ sdhci1: mmc@fa00000 { ti,itap-del-sel-sd-hs = <0x1>; ti,itap-del-sel-sdr12 = <0xa>; ti,itap-del-sel-sdr25 = <0x1>; - bus-width = <4>; status = "disabled"; }; @@ -602,6 +602,7 @@ sdhci2: mmc@fa20000 { power-domains = <&k3_pds 184 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 184 5>, <&k3_clks 184 6>; clock-names = "clk_ahb", "clk_xin"; + bus-width = <4>; ti,clkbuf-sel = <0x7>; ti,otap-del-sel-legacy = <0x8>; ti,otap-del-sel-sd-hs = <0x0>; diff --git a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts index bb6a5837bcb3..a34e0df2ab86 100644 --- a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts +++ b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts @@ -842,7 +842,6 @@ &sdhci2 { vmmc-supply = <&wlan_en>; pinctrl-names = "default"; pinctrl-0 = <&wifi_pins_default>, <&wifi_32k_clk>; - bus-width = <4>; non-removable; ti,fails-without-test-cd; cap-power-off-card; diff --git a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi index ddb76cd66f88..253c1857eedf 100644 --- a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi @@ -561,6 +561,7 @@ sdhci1: mmc@fa00000 { power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 58 5>, <&k3_clks 58 6>; clock-names = "clk_ahb", "clk_xin"; + bus-width = <4>; ti,clkbuf-sel = <0x7>; ti,otap-del-sel-legacy = <0x0>; ti,otap-del-sel-sd-hs = <0x0>; @@ -573,7 +574,6 @@ sdhci1: mmc@fa00000 { ti,itap-del-sel-sd-hs = <0x0>; ti,itap-del-sel-sdr12 = <0x0>; ti,itap-del-sel-sdr25 = <0x0>; - bus-width = <4>; no-1-8-v; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi index bea05be7cb48..bc9c9ff993e6 100644 --- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi @@ -626,6 +626,7 @@ sdhci0: mmc@fa10000 { power-domains = <&k3_pds 57 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 57 0>, <&k3_clks 57 1>; clock-names = "clk_ahb", "clk_xin"; + bus-width = <8>; mmc-ddr-1_8v; mmc-hs200-1_8v; ti,clkbuf-sel = <0x7>; @@ -647,6 +648,7 @@ sdhci1: mmc@fa00000 { power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 58 3>, <&k3_clks 58 4>; clock-names = "clk_ahb", "clk_xin"; + bus-width = <4>; ti,clkbuf-sel = <0x7>; ti,otap-del-sel-legacy = <0x0>; ti,otap-del-sel-sd-hs = <0x0>; diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts index f308076d608a..83f2b00726b5 100644 --- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts +++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts @@ -494,7 +494,6 @@ eeprom@0 { /* eMMC */ &sdhci0 { status = "okay"; - bus-width = <8>; non-removable; ti,driver-strength-ohm = <50>; disable-wp; @@ -506,7 +505,6 @@ &sdhci1 { status = "okay"; vmmc-supply = <&vdd_mmc1>; pinctrl-names = "default"; - bus-width = <4>; pinctrl-0 = <&main_mmc1_pins_default>; disable-wp; }; diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts index b286eaa02ada..67cd41bf806e 100644 --- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts +++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts @@ -469,7 +469,6 @@ &sdhci1 { status = "okay"; vmmc-supply = <&vdd_mmc1>; pinctrl-names = "default"; - bus-width = <4>; pinctrl-0 = <&main_mmc1_pins_default>; disable-wp; };