230c6f44ab
Remove upstreamed: 004-v6.7-firmware-qcom_scm-disable-SDI-if-required.patch [1] 709-ARM-dts-qcom-ipq4019-add-QCA8075-PHY-Package-nodes.patch [2] Manually rebased: 422-firmware-qcom-scm-fix-SCM-cold-boot-address.patch 701-net-dsa-add-out-of-band-tagging-protocol.patch 850-soc-add-qualcomm-syscon.patch 900-PCI-qcom-add-hack-compatible-for-ipq4019-Lantiq-DSL.patch 910-Revert-firmware-qcom_scm-Clear-download-bit-during-r.patch [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=ff4aa3bc98258a240b9bbab53fd8d2fb8184c485 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=2338f4315f16b937e924ff679b91bb8c0ab53f25 Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/18725 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
27 lines
941 B
Diff
27 lines
941 B
Diff
From c668fd2c4d9ad4a510fd214a2da83bd9b67a2508 Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Sun, 13 Aug 2023 18:13:08 +0200
|
|
Subject: [PATCH] Revert "firmware: qcom_scm: Clear download bit during reboot"
|
|
|
|
This reverts commit a3ea89b5978dbcd0fa55f675c5a1e04611093709.
|
|
|
|
It is breaking reboot on IPQ4019 boards, so revert until a proper fix
|
|
is found.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
---
|
|
drivers/firmware/qcom/qcom_scm.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/firmware/qcom/qcom_scm.c
|
|
+++ b/drivers/firmware/qcom/qcom_scm.c
|
|
@@ -2095,7 +2095,8 @@ err:
|
|
static void qcom_scm_shutdown(struct platform_device *pdev)
|
|
{
|
|
/* Clean shutdown, disable download mode to allow normal restart */
|
|
- qcom_scm_set_download_mode(QCOM_DLOAD_NODUMP);
|
|
+ if (download_mode)
|
|
+ qcom_scm_set_download_mode(QCOM_DLOAD_NODUMP);
|
|
}
|
|
|
|
static const struct of_device_id qcom_scm_dt_match[] = {
|