Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfdf3a9b authored by Jilai Wang's avatar Jilai Wang
Browse files

msm: npu: Allow npu to work without AOP mailbox 



If AOP mailbox is not defined, npu driver should still work
properly.

Change-Id: If06d1894660b9b57546894d60c52ac06b256f16b
Signed-off-by: default avatarJilai Wang <jilaiw@codeaurora.org>
parent 314af848

drivers/media/platform/msm/npu/npu_dev.c

+2 −4
Original line number Diff line number Diff line
@@ -1529,7 +1529,6 @@ static int npu_mbox_init(struct npu_device *npu_dev) 
{

	struct platform_device *pdev = npu_dev->pdev;

	struct npu_mbox *mbox_aop = &npu_dev->mbox_aop;

	int ret = 0;



	if (of_find_property(pdev->dev.of_node, "mboxes", NULL)) {

		mbox_aop->client.dev = &pdev->dev;
@@ -1539,13 +1538,12 @@ static int npu_mbox_init(struct npu_device *npu_dev) 


		mbox_aop->chan = mbox_request_channel(&mbox_aop->client, 0);

		if (IS_ERR(mbox_aop->chan)) {

			ret = PTR_ERR(mbox_aop->chan);

			pr_err("mailbox channel request failed, ret=%d\n", ret);

			pr_warn("mailbox channel request failed\n");

			mbox_aop->chan = NULL;

		}

	}



	return ret;

	return 0;

}



/* -------------------------------------------------------------------------