Merge branch 'fix/fix_usj_pad_retention_v5.2' into 'release/v5.2'

fix(esp_hw_support): fix usj pad config bad retention (v5.2)

See merge request espressif/esp-idf!38748
This commit is contained in:
Jiang Jiang Jian
2025-04-27 14:18:30 +08:00

View File

@@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2015-2025 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@@ -26,9 +26,11 @@ void sleep_console_usj_pad_backup_and_disable(void)
// Enable USJ clock and clear reset // Enable USJ clock and clear reset
usb_serial_jtag_ll_enable_bus_clock(true); usb_serial_jtag_ll_enable_bus_clock(true);
usb_serial_jtag_ll_reset_register(); usb_serial_jtag_ll_reset_register();
}
s_usj_state.usj_pad_enabled = usb_serial_jtag_ll_phy_is_pad_enabled();
usb_serial_jtag_ll_phy_enable_pad(false); usb_serial_jtag_ll_phy_enable_pad(false);
s_usj_state.usj_pad_enabled = false;
} else {
s_usj_state.usj_pad_enabled = usb_serial_jtag_ll_phy_is_pad_enabled();
}
// Disable USJ clock // Disable USJ clock
usb_serial_jtag_ll_enable_bus_clock(false); usb_serial_jtag_ll_enable_bus_clock(false);
} }