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 C1CE71E5210 for ; Mon, 2 Jun 2025 09:48:52 +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=1748857732; cv=none; b=ZONEoAPaPPyGPF9wahM98Pe2xO6XyWNVJjfzmATICIwaeBISbWjNWaurLI7kgDWHc/965kJWzdIT4N5dLKxsECLL3uV3sigTGD4RzL/W7Okw1AQsf6absRZ3Q/il/jhP8AxGJmqCagb5qR2ftVogCgqdY6659JViBkiyqYzrgK8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748857732; c=relaxed/simple; bh=A+3sCFYa0hgunMWZWG0UHXkdFL4j1/J/y/6+C1nez/M=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=WVF3gTJcm7PLvSnIUFYUgxSNGireQAyG3LJWk1iLzFV6zZPQyVcRa259/K9efRfxtdTY+JobFDzpeP0MvJ0RjWX1I6iLPfvOTCrE10zVaJebbkyePkiRaMGit4WRfjIpAE5WjSyqpJSsrmWvG+LIj81RenHRAyhl5OpgQoK40SE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZDTnh7Rb; 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="ZDTnh7Rb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 292B4C4CEEB; Mon, 2 Jun 2025 09:48:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1748857732; bh=A+3sCFYa0hgunMWZWG0UHXkdFL4j1/J/y/6+C1nez/M=; h=Subject:To:Cc:From:Date:From; b=ZDTnh7Rb4Has3BAEM1zhx1VESVUNIEy4Lkb3W6FUGaI8vobLdltEi3eehdew5XFFA QfksQNKQS0D/kgrumUUKW4ti+LZnuauuDQOUAEzFFfRAC3pwPA3J+IaOfA5AzYOZ5m 9o/dSgnQT5/uReOMBQEykBTknH4JiNQep2XEVFUQ= Subject: FAILED: patch "[PATCH] arm64: dts: ti: k3-j721e-sk: Add DT nodes for power" failed to apply to 6.1-stable tree To: y-abhilashchandra@ti.com,nm@ti.com,u-kumar1@ti.com Cc: From: Date: Mon, 02 Jun 2025 11:48:41 +0200 Message-ID: <2025060241-precut-candle-50a9@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 6.1-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-6.1.y git checkout FETCH_HEAD git cherry-pick -x 97b67cc102dc2cc8aa39a569c22a196e21af5a21 # git commit -s git send-email --to '' --in-reply-to '2025060241-precut-candle-50a9@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 97b67cc102dc2cc8aa39a569c22a196e21af5a21 Mon Sep 17 00:00:00 2001 From: Yemike Abhilash Chandra Date: Tue, 15 Apr 2025 16:43:22 +0530 Subject: [PATCH] arm64: dts: ti: k3-j721e-sk: Add DT nodes for power regulators Add device tree nodes for two power regulators on the J721E SK board. vsys_5v0: A fixed regulator representing the 5V supply output from the LM61460 and vdd_sd_dv: A GPIO-controlled TLV71033 regulator. J721E-SK schematics: https://www.ti.com/lit/zip/sprr438 Fixes: 1bfda92a3a36 ("arm64: dts: ti: Add support for J721E SK") Cc: stable@vger.kernel.org Signed-off-by: Yemike Abhilash Chandra Reviewed-by: Udit Kumar Link: https://lore.kernel.org/r/20250415111328.3847502-2-y-abhilashchandra@ti.com Signed-off-by: Nishanth Menon diff --git a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts index 440ef57be294..ffef3d1cfd55 100644 --- a/arch/arm64/boot/dts/ti/k3-j721e-sk.dts +++ b/arch/arm64/boot/dts/ti/k3-j721e-sk.dts @@ -184,6 +184,17 @@ vsys_3v3: fixedregulator-vsys3v3 { regulator-boot-on; }; + vsys_5v0: fixedregulator-vsys5v0 { + /* Output of LM61460 */ + compatible = "regulator-fixed"; + regulator-name = "vsys_5v0"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vusb_main>; + regulator-always-on; + regulator-boot-on; + }; + vdd_mmc1: fixedregulator-sd { compatible = "regulator-fixed"; pinctrl-names = "default"; @@ -211,6 +222,20 @@ vdd_sd_dv_alt: gpio-regulator-tps659411 { <3300000 0x1>; }; + vdd_sd_dv: gpio-regulator-TLV71033 { + compatible = "regulator-gpio"; + pinctrl-names = "default"; + pinctrl-0 = <&vdd_sd_dv_pins_default>; + regulator-name = "tlv71033"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + vin-supply = <&vsys_5v0>; + gpios = <&main_gpio0 118 GPIO_ACTIVE_HIGH>; + states = <1800000 0x0>, + <3300000 0x1>; + }; + transceiver1: can-phy1 { compatible = "ti,tcan1042"; #phy-cells = <0>; @@ -613,6 +638,12 @@ J721E_WKUP_IOPAD(0xd4, PIN_OUTPUT, 7) /* (G26) WKUP_GPIO0_9 */ >; }; + vdd_sd_dv_pins_default: vdd-sd-dv-default-pins { + pinctrl-single,pins = < + J721E_IOPAD(0x1dc, PIN_OUTPUT, 7) /* (Y1) SPI1_CLK.GPIO0_118 */ + >; + }; + wkup_uart0_pins_default: wkup-uart0-default-pins { pinctrl-single,pins = < J721E_WKUP_IOPAD(0xa0, PIN_INPUT, 0) /* (J29) WKUP_UART0_RXD */