diff options
| author | Linus Torvalds <[email protected]> | 2022-10-08 10:30:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2022-10-08 10:30:44 -0700 |
| commit | a6afa4199d3d038fbfdff5511f7523b0e30cb774 (patch) | |
| tree | b093a529f5e9c0de573d1e1f6418c421e031baf8 /drivers/mailbox/qcom-apcs-ipc-mailbox.c | |
| parent | bdc753c7fcb4eb009ae246a188ea7ac6dac98ce1 (diff) | |
| parent | b8ae88e1e75e5cb7a6df5298ab75334362ed631c (diff) | |
Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar:
- apple: implement poll and flush callbacks
- qcom: fix clocks for IPQ6018 and IPQ8074 irq handler as not-a-thread
- microchip: split reg-space into two
- imx: RST channel fix
- bcm: fix dma_map_sg error handling
- misc: spelling fix in pcc driver
* tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox: qcom-ipcc: flag IRQ NO_THREAD
mailbox: pcc: Fix spelling mistake "Plaform" -> "Platform"
mailbox: bcm-ferxrm-mailbox: Fix error check for dma_map_sg
mailbox: qcom-apcs-ipc: add IPQ8074 APSS clock support
dt-bindings: mailbox: qcom: correct clocks for IPQ6018 and IPQ8074
dt-bindings: mailbox: qcom: set correct #clock-cells
mailbox: mpfs: account for mbox offsets while sending
mailbox: mpfs: fix handling of the reg property
dt-bindings: mailbox: fix the mpfs' reg property
mailbox: imx: fix RST channel support
mailbox: apple: Implement poll_data() operation
mailbox: apple: Implement flush() operation
Diffstat (limited to 'drivers/mailbox/qcom-apcs-ipc-mailbox.c')
| -rw-r--r-- | drivers/mailbox/qcom-apcs-ipc-mailbox.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c index 80a54d81412e..f1f0e87a79e6 100644 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c @@ -142,7 +142,7 @@ static int qcom_apcs_ipc_remove(struct platform_device *pdev) /* .data is the offset of the ipc register within the global block */ static const struct of_device_id qcom_apcs_ipc_of_match[] = { { .compatible = "qcom,ipq6018-apcs-apps-global", .data = &ipq6018_apcs_data }, - { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &msm8994_apcs_data }, + { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq6018_apcs_data }, { .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data }, { .compatible = "qcom,msm8939-apcs-kpss-global", .data = &msm8916_apcs_data }, { .compatible = "qcom,msm8953-apcs-kpss-global", .data = &msm8994_apcs_data }, |