]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
firmware: arm_scpi: add support for pre-v1.0 SCPI compatible
authorSudeep Holla <sudeep.holla@arm.com>
Wed, 19 Oct 2016 12:51:10 +0000 (14:51 +0200)
committerSudeep Holla <sudeep.holla@arm.com>
Thu, 17 Nov 2016 16:31:20 +0000 (16:31 +0000)
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: Sudeep Holla <sudeep.holla@arm.com>
drivers/firmware/arm_scpi.c

index 902233642bd30a320ba468076440651d9e6894da..70e13230d8db835ec201590762ea0ac5331f7ca2 100644 (file)
@@ -871,6 +871,11 @@ static int scpi_alloc_xfer_list(struct device *dev, struct scpi_chan *ch)
        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)
 {
        int count, idx, ret;
@@ -883,6 +888,9 @@ static int scpi_probe(struct platform_device *pdev)
        if (!scpi_info)
                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");
        if (count < 0) {
                dev_err(dev, "no mboxes property in '%s'\n", np->full_name);
@@ -984,6 +992,7 @@ err:
 
 static const struct of_device_id scpi_of_match[] = {
        {.compatible = "arm,scpi"},
+       {.compatible = "arm,scpi-pre-1.0"},
        {},
 };