FAILED: patch "[PATCH] arm64: dts: ti: k3-am625-sk-common: Set eMMC clock pin as OUTPUT" failed to apply to 6.12-stable tree
Sasha Levin
maintainerThe patch below does not apply to the 6.12-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 <[email protected]>.
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-6.12.y
git checkout FETCH_HEAD
git cherry-pick -x 8ef8a0e38d1377c6d51c06f95c64d87641b2c717
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '[email protected]' --subject-prefix 'PATCH 6.12.y' 'HEAD^..'
Thanks,
Sasha
------------------ original commit in Linus's tree ------------------
From 8ef8a0e38d1377c6d51c06f95c64d87641b2c717 Mon Sep 17 00:00:00 2001
From: Judith Mendez <[email protected]>
Date: Wed, 9 Sep 2026 16:47:38 -0500
Subject: [PATCH] arm64: dts: ti: k3-am625-sk-common: Set eMMC clock pin as
OUTPUT
MMC clock pins must be configured as OUTPUT-only per TRM [0] with receiver disabled (RXACTIVE bit = 0). Change MMC CLK pins from PIN_INPUT to PIN_OUTPUT to match documentation.
[0] https://www.ti.com/lit/pdf/spruiv7 Rev. C: Table 12-246. MMCSDi I/O Signals
--- arch/arm64/boot/dts/ti/k3-am625-sk-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/ti/k3-am625-sk-common.dtsi +1 -1
@@ -98,7 +98,7 @@ main_mmc0_pins_default: main-mmc0-default-pins { bootph-all; pinctrl-single,pins = < AM62X_IOPAD(0x220, PIN_INPUT, 0) /* (Y3) MMC0_CMD */ - AM62X_IOPAD(0x218, PIN_INPUT, 0) /* (AB1) MMC0_CLK */ + AM62X_IOPAD(0x218, PIN_OUTPUT, 0) /* (AB1) MMC0_CLK */ AM62X_IOPAD(0x214, PIN_INPUT, 0) /* (AA2) MMC0_DAT0 */ AM62X_IOPAD(0x210, PIN_INPUT_PULLUP, 0) /* (AA1) MMC0_DAT1 */ AM62X_IOPAD(0x20c, PIN_INPUT_PULLUP, 0) /* (AA3) MMC0_DAT2 */
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 1/3 arm64: dts: ti: k3-am625-sk: Remove M4 mailbox node redefinition
From: Andrew Davis <[email protected]>
[ Upstream commit 17d0723c6cf841ebaf510eaf9bb1ebf4991d6e9d ]
This node is already defined in the included k3-am62x-sk-common.dtsi. Remove this redefinition.
Stable-dep-of: 8ef8a0e38d13 ("arm64: dts: ti: k3-am625-sk-common: Set eMMC clock pin as OUTPUT")
--- arch/arm64/boot/dts/ti/k3-am625-sk.dts | 7 ------- 1 file changed, 7 deletions(-)
arch/arm64/boot/dts/ti/k3-am625-sk.dts +0 -7
@@ -243,13 +243,6 @@ cpsw3g_phy1: ethernet-phy@1 { }; }; -&mailbox0_cluster0 { - mbox_m4_0: mbox-m4-0 { - ti,mbox-rx = <0 0 0>; - ti,mbox-tx = <1 0 0>; - }; -}; - &fss { bootph-all; };
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/3 arm64: dts: ti: k3-am62*: remove SoC dtsi from common dtsi
From: Anshul Dalal <[email protected]>
[ Upstream commit e0b9feca7329c495a76891d7766a781dea73787d ]
The k3-am62x-sk-common dtsi represents the common hardware used across am62x EVMs which can be configured with various DDR sizes or none (with DDR integrated in the package) based on the specific am62x SoC used.
Therefore this patch moves the memory node and the SoC specific k3-am625 dtsi out of sk-common and into the board dts files. No functional change is intended from this patch. The device-tree inheritance is changed as follows:
Before:
k3-am62
^
k3-am625
^
k3-am62x-sk-common
^am62x EVMs (k3-am625-sk, k3-am62-lp-sk)
After:
k3-am62
^
k3-am625 k3-am62x-sk-common
^ ^am62x EVMs (k3-am625-sk, k3-am62-lp-sk)
Move the SoC include and RAM description out of the shared evaluation board description and into the individual board descriptions. Preserve the existing unlabeled reserved-memory node.
Also extract the existing AM625 SK hardware description into a common include, keeping the SoC selection, board identity and RAM in the board description. This supplies the location needed by the subsequent eMMC clock pin correction without adding support for another board.
Keep all existing hardware properties, including boot phase annotations, the eMMC non-removable flag and the audio codec supply. No functional change is intended.
Stable-dep-of: 8ef8a0e38d13 ("arm64: dts: ti: k3-am625-sk-common: Set eMMC clock pin as OUTPUT")
--- arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 8 + .../arm64/boot/dts/ti/k3-am625-sk-common.dtsi | 304 ++++++++++++++++++ arch/arm64/boot/dts/ti/k3-am625-sk.dts | 301 +---------------- .../arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 8 - 4 files changed, 316 insertions(+), 305 deletions(-) create mode 100644 arch/arm64/boot/dts/ti/k3-am625-sk-common.dtsi
arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts +8 -0
@@ -7,12 +7,20 @@ /dts-v1/; +#include "k3-am625.dtsi" #include "k3-am62x-sk-common.dtsi" / { compatible = "ti,am62-lp-sk", "ti,am625"; model = "Texas Instruments AM62x LP SK"; + memory@80000000 { + /* 2G RAM */ + reg = <0x00000000 0x80000000 0x00000000 0x80000000>; + device_type = "memory"; + bootph-pre-ram; + }; + vmain_pd: regulator-0 { /* TPS65988 PD CONTROLLER OUTPUT */ compatible = "regulator-fixed";
arch/arm64/boot/dts/ti/k3-am625-sk-common.dtsi new file +304 -0
304 lines not on this page · raw message
arch/arm64/boot/dts/ti/k3-am625-sk.dts +4 -297
314 lines not on this page · raw message
arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi +0 -8
@@ -8,7 +8,6 @@ #include <dt-bindings/leds/common.h> #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/net/ti-dp83867.h> -#include "k3-am625.dtsi" / { aliases {
@@ -27,13 +26,6 @@ chosen { stdout-path = "serial2:115200n8"; }; - memory@80000000 { - bootph-pre-ram; - device_type = "memory"; - /* 2G RAM */ - reg = <0x00000000 0x80000000 0x00000000 0x80000000>; - }; - reserved-memory { #address-cells = <2>; #size-cells = <2>;
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 3/3 arm64: dts: ti: k3-am625-sk-common: Set eMMC clock pin as OUTPUT
In reply to Sasha LevinFrom: Judith Mendez <[email protected]>
[ Upstream commit 8ef8a0e38d1377c6d51c06f95c64d87641b2c717 ]
MMC clock pins must be configured as OUTPUT-only per TRM [0] with receiver disabled (RXACTIVE bit = 0). Change MMC CLK pins from PIN_INPUT to PIN_OUTPUT to match documentation.
[0] https://www.ti.com/lit/pdf/spruiv7 Rev. C: Table 12-246. MMCSDi I/O Signals
--- arch/arm64/boot/dts/ti/k3-am625-sk-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/ti/k3-am625-sk-common.dtsi +1 -1
@@ -98,7 +98,7 @@ main_mmc0_pins_default: main-mmc0-default-pins { bootph-all; pinctrl-single,pins = < AM62X_IOPAD(0x220, PIN_INPUT, 0) /* (Y3) MMC0_CMD */ - AM62X_IOPAD(0x218, PIN_INPUT, 0) /* (AB1) MMC0_CLK */ + AM62X_IOPAD(0x218, PIN_OUTPUT, 0) /* (AB1) MMC0_CLK */ AM62X_IOPAD(0x214, PIN_INPUT, 0) /* (AA2) MMC0_DAT0 */ AM62X_IOPAD(0x210, PIN_INPUT_PULLUP, 0) /* (AA1) MMC0_DAT1 */ AM62X_IOPAD(0x20c, PIN_INPUT_PULLUP, 0) /* (AA3) MMC0_DAT2 */
Signature · 1 line
2.53.0