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

Commit 8358c6b5 authored by Sudeep Holla's avatar Sudeep Holla
Browse files

firmware: arm_scpi: add support for pre-v1.0 SCPI compatible 



This patch adds new DT match table to setup the support for SCPI protocol
versions prior to v1.0 releases. It also adds "arm,scpi-pre-1.0" to the
SCPI match entry.

Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
parent 42b3178b

drivers/firmware/arm_scpi.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -871,6 +871,11 @@ static int scpi_alloc_xfer_list(struct device *dev, struct scpi_chan *ch) 
	return 0;

	return 0;

}

}





static const struct of_device_id legacy_scpi_of_match[] = {

	{.compatible = "arm,scpi-pre-1.0"},

	{},

};



static int scpi_probe(struct platform_device *pdev)

static int scpi_probe(struct platform_device *pdev)

{

{

	int count, idx, ret;

	int count, idx, ret;
@@ -883,6 +888,9 @@ static int scpi_probe(struct platform_device *pdev) 
	if (!scpi_info)

	if (!scpi_info)

		return -ENOMEM;

		return -ENOMEM;





	if (of_match_device(legacy_scpi_of_match, &pdev->dev))

		scpi_info->is_legacy = true;



	count = of_count_phandle_with_args(np, "mboxes", "#mbox-cells");

	count = of_count_phandle_with_args(np, "mboxes", "#mbox-cells");

	if (count < 0) {

	if (count < 0) {

		dev_err(dev, "no mboxes property in '%s'\n", np->full_name);

		dev_err(dev, "no mboxes property in '%s'\n", np->full_name);
@@ -984,6 +992,7 @@ static int scpi_probe(struct platform_device *pdev) 




static const struct of_device_id scpi_of_match[] = {

static const struct of_device_id scpi_of_match[] = {

	{.compatible = "arm,scpi"},

	{.compatible = "arm,scpi"},

	{.compatible = "arm,scpi-pre-1.0"},

	{},

	{},

};

};