diff options
| author | Andy Hu <andy.hu@starfivetech.com> | 2023-07-20 12:04:41 +0300 |
|---|---|---|
| committer | Andy Hu <andy.hu@starfivetech.com> | 2023-07-20 12:04:41 +0300 |
| commit | 445fc6374dc6825e3e1bb3e2801ab26448838853 (patch) | |
| tree | bb5139dcdda174c62f9914d4998570e267e34e90 | |
| parent | 4d6009b608823b9289ca653767e3d9da0f73a923 (diff) | |
| parent | 4b8c452a710d72395be8dc9f914dc58e8bc9411c (diff) | |
| download | linux-445fc6374dc6825e3e1bb3e2801ab26448838853.tar.xz | |
Merge tag 'JH7110_515_SDK_v5.4.1' into vf2-515-devel
| -rwxr-xr-x | arch/riscv/boot/dts/starfive/jh7110.dtsi | 13 | ||||
| -rw-r--r-- | drivers/mailbox/starfive_mailbox-test.c | 11 |
2 files changed, 7 insertions, 17 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi index b00c8a5d5c7a..3e2ab987475a 100755 --- a/arch/riscv/boot/dts/starfive/jh7110.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi @@ -229,6 +229,13 @@ }; }; + mailbox_client0: mailbox_client { + compatible = "starfive,mailbox-test"; + mbox-names = "rx", "tx"; + mboxes = <&mailbox_contrl0 0 1>,<&mailbox_contrl0 1 0>; + status = "disabled"; + }; + soc: soc { compatible = "simple-bus"; interrupt-parent = <&plic>; @@ -1628,12 +1635,6 @@ status = "disabled"; }; - mailbox_client0: mailbox_client@0 { - compatible = "starfive,mailbox-test"; - mbox-names = "rx", "tx"; - mboxes = <&mailbox_contrl0 0 1>,<&mailbox_contrl0 1 0>; - status = "disabled"; - }; display: display-subsystem { compatible = "starfive,jh7110-display","verisilicon,display-subsystem"; diff --git a/drivers/mailbox/starfive_mailbox-test.c b/drivers/mailbox/starfive_mailbox-test.c index bf4bf2d42b11..4da866445630 100644 --- a/drivers/mailbox/starfive_mailbox-test.c +++ b/drivers/mailbox/starfive_mailbox-test.c @@ -283,17 +283,6 @@ static void mbox_test_prepare_message(struct mbox_client *client, void *message) } } -static void mbox_test_message_sent(struct mbox_client *client, - void *message, int r) -{ - if (r) - dev_warn(client->dev, - "Client: Message could not be sent: %d\n", r); - else - dev_info(client->dev, - "Client: Message sent\n"); -} - static struct mbox_chan * mbox_test_request_channel(struct platform_device *pdev, const char *name) { |