diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-25 15:10:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-02-25 15:10:14 -0800 |
| commit | 562ed38ded83a5cd3ecf9a1a875c7ee786c146ae (patch) | |
| tree | b70d0c82742d92c4a32b01f5c0090c09d21388c3 /drivers/mailbox/qcom-apcs-ipc-mailbox.c | |
| parent | 2e3036a2642b6145a8117d21514bfc5f8d5ea595 (diff) | |
| parent | 6ccbe33a39523f6d62b22c5ee99c6695993c935e (diff) | |
| download | linux-562ed38ded83a5cd3ecf9a1a875c7ee786c146ae.tar.gz linux-562ed38ded83a5cd3ecf9a1a875c7ee786c146ae.tar.bz2 linux-562ed38ded83a5cd3ecf9a1a875c7ee786c146ae.zip | |
Merge tag 'mailbox-v6.3' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar:
- qcom: misc changes to bindings for sa8775p, QDU1000/QRU1000, IPQ5332,
SDX55, msm8976, glink-rpm-edge
- sti: convert to DT schema
- zynq: switch to flexible array to simplify code
* tag 'mailbox-v6.3' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
dt-bindings: mailbox: qcom-ipcc: Add compatible for QDU1000/QRU1000
mailbox: qcom-apcs-ipc: add IPQ5332 APSS clock support
dt-bindings: mailbox: qcom: add compatible for the IPQ5332 SoC
dt-bindings: remoteproc: qcom,glink-rpm-edge: convert to DT schema
mailbox: qcom-apcs-ipc: enable APCS clock device for MSM8996
dt-bindings: mailbox: qcom: add #clock-cells to msm8996 example
dt-bindings: mailbox: qcom: add missing platforms to conditional clauses
dt-bindings: mailbox: qcom: correct the list of platforms using clocks
dt-bindings: mailbox: qcom: enable syscon compatible for msm8976
dt-bindings: mailbox: qcom: add SDX55 compatible
dt-bindings: mailbox: qcom-ipcc: document the sa8775p platform
dt-bindings: mailbox: sti-mailbox: convert to DT schema
mailbox: zynq: Switch to flexible array to simplify code
Diffstat (limited to 'drivers/mailbox/qcom-apcs-ipc-mailbox.c')
| -rw-r--r-- | drivers/mailbox/qcom-apcs-ipc-mailbox.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c index 0e9f9cba8668..6bbf87c6d60b 100644 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c @@ -42,7 +42,7 @@ static const struct qcom_apcs_ipc_data msm8994_apcs_data = { }; static const struct qcom_apcs_ipc_data msm8996_apcs_data = { - .offset = 16, .clk_name = NULL + .offset = 16, .clk_name = "qcom-apcs-msm8996-clk" }; static const struct qcom_apcs_ipc_data apps_shared_apcs_data = { @@ -141,6 +141,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,ipq5332-apcs-apps-global", .data = &ipq6018_apcs_data }, { .compatible = "qcom,ipq6018-apcs-apps-global", .data = &ipq6018_apcs_data }, { .compatible = "qcom,ipq8074-apcs-apps-global", .data = &ipq6018_apcs_data }, { .compatible = "qcom,msm8916-apcs-kpss-global", .data = &msm8916_apcs_data }, |