bus: mhi: host: pci_generic: Update EDL firmware path for Foxconn modems
authorSlark Xiao <slark_xiao@163.com>
Thu, 25 Jul 2024 02:29:40 +0000 (10:29 +0800)
committerManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Thu, 5 Sep 2024 14:07:26 +0000 (19:37 +0530)
Foxconn uses a unique firmware for their MHI based modems. So the generic
firmware from Qcom won't work. Hence, update the EDL firmware path to
include the 'foxconn' subdirectory based on the modem SoC so that the
Foxconn specific firmware could be used.

Respective firmware will be upstreamed to linux-firmware repo.

Cc: stable@vger.kernel.org # 6.11
Fixes: bf30a75e6e00 ("bus: mhi: host: Add support for Foxconn SDX72 modems")
Signed-off-by: Slark Xiao <slark_xiao@163.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20240725022941.65948-1-slark_xiao@163.com
[mani: Reworded the subject and description]
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
drivers/bus/mhi/host/pci_generic.c

index f162d2adcc01731cacf7047d565e74d9fcba4361..235f269b0758210b493699f2fa3c4e6496af1797 100644 (file)
@@ -434,8 +434,7 @@ static const struct mhi_controller_config modem_foxconn_sdx72_config = {
 
 static const struct mhi_pci_dev_info mhi_foxconn_sdx55_info = {
        .name = "foxconn-sdx55",
-       .fw = "qcom/sdx55m/sbl1.mbn",
-       .edl = "qcom/sdx55m/edl.mbn",
+       .edl = "qcom/sdx55m/foxconn/prog_firehose_sdx55.mbn",
        .config = &modem_foxconn_sdx55_config,
        .bar_num = MHI_PCI_DEFAULT_BAR_NUM,
        .dma_data_width = 32,
@@ -445,8 +444,7 @@ static const struct mhi_pci_dev_info mhi_foxconn_sdx55_info = {
 
 static const struct mhi_pci_dev_info mhi_foxconn_t99w175_info = {
        .name = "foxconn-t99w175",
-       .fw = "qcom/sdx55m/sbl1.mbn",
-       .edl = "qcom/sdx55m/edl.mbn",
+       .edl = "qcom/sdx55m/foxconn/prog_firehose_sdx55.mbn",
        .config = &modem_foxconn_sdx55_config,
        .bar_num = MHI_PCI_DEFAULT_BAR_NUM,
        .dma_data_width = 32,
@@ -456,8 +454,7 @@ static const struct mhi_pci_dev_info mhi_foxconn_t99w175_info = {
 
 static const struct mhi_pci_dev_info mhi_foxconn_dw5930e_info = {
        .name = "foxconn-dw5930e",
-       .fw = "qcom/sdx55m/sbl1.mbn",
-       .edl = "qcom/sdx55m/edl.mbn",
+       .edl = "qcom/sdx55m/foxconn/prog_firehose_sdx55.mbn",
        .config = &modem_foxconn_sdx55_config,
        .bar_num = MHI_PCI_DEFAULT_BAR_NUM,
        .dma_data_width = 32,
@@ -503,7 +500,7 @@ static const struct mhi_pci_dev_info mhi_foxconn_dw5932e_info = {
 
 static const struct mhi_pci_dev_info mhi_foxconn_t99w515_info = {
        .name = "foxconn-t99w515",
-       .edl = "fox/sdx72m/edl.mbn",
+       .edl = "qcom/sdx72m/foxconn/edl.mbn",
        .edl_trigger = true,
        .config = &modem_foxconn_sdx72_config,
        .bar_num = MHI_PCI_DEFAULT_BAR_NUM,
@@ -514,7 +511,7 @@ static const struct mhi_pci_dev_info mhi_foxconn_t99w515_info = {
 
 static const struct mhi_pci_dev_info mhi_foxconn_dw5934e_info = {
        .name = "foxconn-dw5934e",
-       .edl = "fox/sdx72m/edl.mbn",
+       .edl = "qcom/sdx72m/foxconn/edl.mbn",
        .edl_trigger = true,
        .config = &modem_foxconn_sdx72_config,
        .bar_num = MHI_PCI_DEFAULT_BAR_NUM,