From nobody Fri Dec 19 06:58:34 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A14CC1DC7ED; Sun, 24 Mar 2024 22:51:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320710; cv=none; b=lEqLJnrg3SY8brhQ1sKMlgDNSv7CabSTEopDTspWAc1XTTS+qs17W31AbnfX1brFZ0+aAl16WR/TOmTEoduYpFaSta4e8m7J6y04j+2r9V4PqugYnCH4O3q1OUCa+ezC22HJ2CwC57o6dTj2tP9lZ3c7X2h657U+q45+XbcTupQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320710; c=relaxed/simple; bh=TFfAVrGD8nWkaGmaO0qqtQoMlM7QoySNF8X+9tFaBkY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rVHTNqyyfMzlPcMqruG+m/VI+TJfv6UO9qBCdogM+ephaQS2jmOowE96dwAPNJARMulIG1a9m0R18xcqpNQnD/x7/6GS0Vx4wVlqlYBgSKlw/ORoW0iYyiONpSP/7NO6kt8Hf86SJi8jthgVjoPYmUDpRJQEt0C5+1LErNYtNXc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=vFQWRf7Z; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="vFQWRf7Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DFD14C43390; Sun, 24 Mar 2024 22:51:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320710; bh=TFfAVrGD8nWkaGmaO0qqtQoMlM7QoySNF8X+9tFaBkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vFQWRf7Zt3Slm/gNhYjT5rtGvEne3+8eveDwPNmYROb9D5lp6EAJw5CNNlFumpU1k mUZ2wbVRkie8EqykCw7s6YtkeL2ZiUvgkcarONgiilWtgx/wLCq8wIKqRuSv0fVDZD bXF49Chp9gIfQvVpjGDhUdrprSPqlNRTXjr+iPC5bJnPZc43TNR+LqUOGM69iRczII UGN94deKByT29hgoOYW4rKmekUdqDUnXcdU4epPBYcnq/awHRMJAsQUbWJzWKtZmBF /Gxn3BT2GSBpvdsB87q5sOXhsSe26OmbhYLX/cv2W8bvSPRsuG21nBPELWVqhJET5e HpiU8Qy3UUbBQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrew Davis , Nishanth Menon , Sasha Levin Subject: [PATCH 6.7 273/713] arm64: dts: ti: k3-am64: Enable SDHCI nodes at the board level Date: Sun, 24 Mar 2024 18:39:59 -0400 Message-ID: <20240324224720.1345309-274-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Andrew Davis [ Upstream commit 3b6345e3fcf4c93a79f396121cd0e6f98f04da13 ] SDHCI nodes defined in the top-level AM64 SoC dtsi files are incomplete and will not be functional unless they are extended. As the attached SD/eMMC is only known about at the board integration level, these nodes should only be enabled when provided with this information. Disable the SDHCI nodes in the dtsi files and only enable the ones that are actually pinned out on a given board. Signed-off-by: Andrew Davis Link: https://lore.kernel.org/r/20231117163339.89952-2-afd@ti.com Signed-off-by: Nishanth Menon Stable-dep-of: 379c7752bbd0 ("arm64: dts: ti: k3-am64-main: Fix ITAP/OTAP v= alues for MMC") Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 2 ++ arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi | 1 + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 6 ++++-- arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 1 + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 4 +++- arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts | 1 - arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi | 1 + 7 files changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts= /ti/k3-am64-main.dtsi index 0be642bc1b86d..c3300c36fdbcb 100644 --- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi @@ -623,6 +623,7 @@ sdhci0: mmc@fa10000 { ti,otap-del-sel-mmc-hs =3D <0x0>; ti,otap-del-sel-ddr52 =3D <0x6>; ti,otap-del-sel-hs200 =3D <0x7>; + status =3D "disabled"; }; =20 sdhci1: mmc@fa00000 { @@ -641,6 +642,7 @@ sdhci1: mmc@fa00000 { ti,otap-del-sel-sdr104 =3D <0x6>; ti,otap-del-sel-ddr50 =3D <0x9>; ti,clkbuf-sel =3D <0x7>; + status =3D "disabled"; }; =20 cpsw3g: ethernet@8000000 { diff --git a/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi b/arch/arm64/b= oot/dts/ti/k3-am64-phycore-som.dtsi index f87f09d83c956..b8f844f667afc 100644 --- a/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi @@ -211,6 +211,7 @@ flash@0 { }; =20 &sdhci0 { + status =3D "okay"; bus-width =3D <8>; non-removable; ti,driver-strength-ohm =3D <50>; diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/= ti/k3-am642-evm.dts index 4dba18941015d..256606be56fef 100644 --- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts +++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts @@ -487,17 +487,19 @@ eeprom@0 { }; }; =20 +/* eMMC */ &sdhci0 { - /* emmc */ + status =3D "okay"; bus-width =3D <8>; non-removable; ti,driver-strength-ohm =3D <50>; disable-wp; }; =20 +/* SD/MMC */ &sdhci1 { - /* SD/MMC */ bootph-all; + status =3D "okay"; vmmc-supply =3D <&vdd_mmc1>; pinctrl-names =3D "default"; bus-width =3D <4>; diff --git a/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts b/arc= h/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts index 9175e96842d82..53b64e55413f9 100644 --- a/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts +++ b/arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts @@ -264,6 +264,7 @@ &main_uart1 { }; =20 &sdhci1 { + status =3D "okay"; vmmc-supply =3D <&vcc_3v3_mmc>; pinctrl-names =3D "default"; pinctrl-0 =3D <&main_mmc1_pins_default>; diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/t= i/k3-am642-sk.dts index f29c8a9b59ba7..bffbd234f715a 100644 --- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts +++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts @@ -439,6 +439,7 @@ &mcu_gpio0 { }; =20 &sdhci0 { + status =3D "okay"; vmmc-supply =3D <&wlan_en>; bus-width =3D <4>; non-removable; @@ -458,9 +459,10 @@ wlcore: wlcore@2 { }; }; =20 +/* SD/MMC */ &sdhci1 { - /* SD/MMC */ bootph-all; + status =3D "okay"; vmmc-supply =3D <&vdd_mmc1>; pinctrl-names =3D "default"; bus-width =3D <4>; diff --git a/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts b/arch/= arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts index d95d80076a427..55102d35cecc1 100644 --- a/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts +++ b/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts @@ -425,7 +425,6 @@ &sdhci1 { ti,driver-strength-ohm =3D <50>; ti,fails-without-test-cd; /* Enabled by overlay */ - status =3D "disabled"; }; =20 &tscadc0 { diff --git a/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi b/arch/arm64/bo= ot/dts/ti/k3-am642-tqma64xxl.dtsi index d82d4a98306a7..6c785eff7d2ff 100644 --- a/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi @@ -219,6 +219,7 @@ partitions { }; =20 &sdhci0 { + status =3D "okay"; non-removable; disable-wp; no-sdio; --=20 2.43.0