From mboxrd@z Thu Jan 1 00:00:00 1970 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 091341E0E0B for ; Mon, 2 Jun 2025 09:48:36 +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=1748857716; cv=none; b=r1/YfSUY0niCZ5bXaDDpzkSnr14kyBegQZuFZSqp5iyEWPcjICcEsZowOghTQ4GvdR6kc48uKmVX9iwELFhRsa6lZKlSa8qBldapMswrHqJiCzq9RuXVaGDNq92DnIqe1wtqg3IV+pHQBTzkYWRPWyhf6eOCSC0xrjGUgR6RAvk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748857716; c=relaxed/simple; bh=AHBbZIe/x2spq30BuzJBVZVgESm8d0E2h8XrXz9ifcw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Uh+aOxm89it20xnmJ7pKvaRxvH0C+W4+M5EiCTOL+weex7FdBwPShg+zv9vtNQCk3Yl7+hk4SbvldfcJbwh4kfEK02dZGf7VVtzgrHONi94mlo30y0OclE6MHfDoPJH3Ubwhcw5Ts+WNWzpD7Q+QxPDydyJIYGICgOZvIVYsSys= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NOnFGaJN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="NOnFGaJN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 74AA0C4CEEB; Mon, 2 Jun 2025 09:48:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748857715; bh=AHBbZIe/x2spq30BuzJBVZVgESm8d0E2h8XrXz9ifcw=; h=Subject:To:Cc:From:Date:From; b=NOnFGaJNChfeDu315r91srDUz3UAH0TvC+FmzNwvIO0/lztOuFRfPzwDv50boblq+ eNFi5Y8994j49VIoNFxQEp5hod9mwDMGohDWvPGF4RX3EjZyXM+yrltpM/UhaSlVp4 1HbC6KrLyg0FVPTRcXPnqwfRw9faM5Ryt6jlde+0= Subject: FAILED: patch "[PATCH] arm64: dts: ti: k3-am65-main: Add missing taps to sdhci0" failed to apply to 5.15-stable tree To: jm@ti.com,m-shah@ti.com,nm@ti.com Cc: From: Date: Mon, 02 Jun 2025 11:48:19 +0200 Message-ID: <2025060219-mustang-rocker-6ae2@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.15-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y git checkout FETCH_HEAD git cherry-pick -x f55c9f087cc2e2252d44ffd9d58def2066fc176e # git commit -s git send-email --to '' --in-reply-to '2025060219-mustang-rocker-6ae2@gregkh' --subject-prefix 'PATCH 5.15.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From f55c9f087cc2e2252d44ffd9d58def2066fc176e Mon Sep 17 00:00:00 2001 From: Judith Mendez Date: Tue, 29 Apr 2025 12:30:08 -0500 Subject: [PATCH] arm64: dts: ti: k3-am65-main: Add missing taps to sdhci0 For am65x, add missing ITAPDLYSEL values for Default Speed and High Speed SDR modes to sdhci0 node according to the device datasheet [0]. [0] https://www.ti.com/lit/gpn/am6548 Fixes: eac99d38f861 ("arm64: dts: ti: k3-am654-main: Update otap-del-sel values") Cc: stable@vger.kernel.org Signed-off-by: Judith Mendez Reviewed-by: Moteen Shah Link: https://lore.kernel.org/r/20250429173009.33994-1-jm@ti.com Signed-off-by: Nishanth Menon diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi index 6d3c467d7038..b085e7361116 100644 --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi @@ -449,6 +449,8 @@ sdhci0: mmc@4f80000 { ti,otap-del-sel-mmc-hs = <0x0>; ti,otap-del-sel-ddr52 = <0x5>; ti,otap-del-sel-hs200 = <0x5>; + ti,itap-del-sel-legacy = <0xa>; + ti,itap-del-sel-mmc-hs = <0x1>; ti,itap-del-sel-ddr52 = <0x0>; dma-coherent; status = "disabled";