arm64: dts: ti: k3-am62-verdin-dahlia: Keep CTRL_SLEEP_MOCI# regulator on

This reverts commit 3935fbc87ddebea5439f3ab6a78b1e83e976bf88.

CTRL_SLEEP_MOCI# is a signal that is defined for all the SoM
implementing the Verdin family specification, this signal is supposed to
control the power enable in the carrier board when the system is in deep
sleep mode. However this is not possible with Texas Instruments AM62
SoC, IOs output buffer is disabled in deep sleep and IOs are in
tri-state mode.

Given that we cannot properly control this pin, force it to be always
high to minimize potential issues.

Fixes: 3935fbc87dde ("arm64: dts: ti: k3-am62-verdin-dahlia: support sleep-moci")
Cc:  <stable@vger.kernel.org>
Link: https://e2e.ti.com/support/processors-group/processors/f/processors-forum/1361669/am625-gpio-output-state-in-deep-sleep/5244802
Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Link: https://lore.kernel.org/r/20240731054804.6061-1-francesco@dolcini.it
Signed-off-by: Nishanth Menon <nm@ti.com>

diff --git a/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi b/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi
index e8f4d136e5dfb4dd67c16f450141ebf9cd498b24..9202181fbd6528e92f6f440bb0f48dc4fde2674b 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-verdin-dahlia.dtsi
@@ -43,15 +43,6 @@
                        sound-dai = <&mcasp0>;
                };
        };
-
-       reg_usb_hub: regulator-usb-hub {
-               compatible = "regulator-fixed";
-               enable-active-high;
-               /* Verdin CTRL_SLEEP_MOCI# (SODIMM 256) */
-               gpio = <&main_gpio0 31 GPIO_ACTIVE_HIGH>;
-               regulator-boot-on;
-               regulator-name = "HUB_PWR_EN";
-       };
 };
 
 /* Verdin ETHs */
@@ -193,11 +184,6 @@
        status = "okay";
 };
 
-/* Do not force CTRL_SLEEP_MOCI# always enabled */
-&reg_force_sleep_moci {
-       status = "disabled";
-};
-
 /* Verdin SD_1 */
 &sdhci1 {
        status = "okay";
@@ -218,15 +204,7 @@
 };
 
 &usb1 {
-       #address-cells = <1>;
-       #size-cells = <0>;
        status = "okay";
-
-       usb-hub@1 {
-               compatible = "usb424,2744";
-               reg = <1>;
-               vdd-supply = <&reg_usb_hub>;
-       };
 };
 
 /* Verdin CTRL_WAKE1_MICO# */

diff --git a/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi b/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi
index 359f53f3e019b1dbdf01017bff1a42af0161bf44..5bef31b8577be52133a4e151727ba8579d0e51ae 100644 (file)
--- a/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi
@@ -138,12 +138,6 @@
                vin-supply = <&reg_1v8>;
        };
 
-       /*
-        * By default we enable CTRL_SLEEP_MOCI#, this is required to have
-        * peripherals on the carrier board powered.
-        * If more granularity or power saving is required this can be disabled
-        * in the carrier board device tree files.
-        */
        reg_force_sleep_moci: regulator-force-sleep-moci {
                compatible = "regulator-fixed";
                enable-active-high;