diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-07 13:35:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-07 13:35:59 -0700 |
| commit | 3a979e8c07e3ee9933016368db0a55943b00a089 (patch) | |
| tree | ae736c374725c2c2ef1ee2e01ba44a1dd7026a30 /drivers/mailbox/qcom-apcs-ipc-mailbox.c | |
| parent | a1cdde8c411dbde19863e5104a4a1f218dd07b89 (diff) | |
| parent | f83d1cfc8bcddf93bb6f55940fd59f5b047863e5 (diff) | |
Merge tag 'mailbox-v4.18' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar:
- Remove HAS_DMA config dependencies
- New STMicroelectronics STM32 IPCC driver
- Enable QCom driver to run more controllers
- Fixed return code from null to ptr-err for Brcm driver
- Fix kconfig dependencies for the HiSilicon driver
* tag 'mailbox-v4.18' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox/drivers/hisi: Consolidate the Kconfig for the MAILBOX
mailbox: Add support for Qualcomm SDM845 SoCs
dt-bindings: mailbox: Add APSS shared binding for SDM845 SoCs
mailbox: bcm2835: Fix of_xlate return value
mailbox: qcom: Add msm8998 hmss compatible
mailbox: add STMicroelectronics STM32 IPCC driver
dt-bindings: mailbox: add STMicroelectronics STM32 IPCC binding
mailbox: Remove depends on HAS_DMA in case of platform dependency
Diffstat (limited to 'drivers/mailbox/qcom-apcs-ipc-mailbox.c')
| -rw-r--r-- | drivers/mailbox/qcom-apcs-ipc-mailbox.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c index 57bde0dfd12f..333ed4a9d4b8 100644 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c @@ -125,6 +125,8 @@ static int qcom_apcs_ipc_remove(struct platform_device *pdev) static const struct of_device_id qcom_apcs_ipc_of_match[] = { { .compatible = "qcom,msm8916-apcs-kpss-global", .data = (void *)8 }, { .compatible = "qcom,msm8996-apcs-hmss-global", .data = (void *)16 }, + { .compatible = "qcom,msm8998-apcs-hmss-global", .data = (void *)8 }, + { .compatible = "qcom,sdm845-apss-shared", .data = (void *)12 }, {} }; MODULE_DEVICE_TABLE(of, qcom_apcs_ipc_of_match); |