On 07/09/16 16:34, Neil Armstrong wrote:
Add new DT match table to setup the is_legacy boolean value across
the scpi functions.
Add the Amlogic GXBB SoC compatible for platform and as legacy match entry.

Signed-off-by: Neil Armstrong <narmstr...@baylibre.com>
---
 drivers/firmware/arm_scpi.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
index 6a16100..60a76e63 100644
--- a/drivers/firmware/arm_scpi.c
+++ b/drivers/firmware/arm_scpi.c
@@ -979,6 +979,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 = "amlogic,meson-gxbb-scpi"},
+       {},
+};

This needs to be documented.

+
 static int scpi_probe(struct platform_device *pdev)
 {
        int count, idx, ret;
@@ -991,6 +996,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);
@@ -1097,6 +1105,7 @@ err:

 static const struct of_device_id scpi_of_match[] = {
        {.compatible = "arm,scpi"},
+       {.compatible = "amlogic,meson-gxbb-scpi"},

I also prefer adding "arm,legacy-scpi". So far AMLogic has followed the
legacy specification except the capabilities. You could use
"amlogic,meson-gxbb-scpi" for that and "arm,legacy-scpi" for the probe
part or we can add the use of "amlogic,meson-gxbb-scpi" later but just
document it now.

--
Regards,
Sudeep

Reply via email to