usb: typec: ucsi_ccg: Add OF support

Add device-tree support for the Cypress CCG UCSI driver. The device-tree
binding for the Cypress CCG device uses the standard device-tree
'firmware-name' string property to indicate the firmware build that is
used.

The NVIDIA GPU I2C driver has been updated to use an ACPI string
property that is also named 'firmware-build' and given that this was the
only users of the 'ccgx,firmware-build' property, we can now remove
support for this legacy property.

Signed-off-by: Wayne Chang <waynec@nvidia.com>
Co-developed-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20230131175748.256423-4-jonathanh@nvidia.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
index 46441f1..e0ed465 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi_ccg.c
+++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
@@ -643,7 +643,7 @@ static int ccg_request_irq(struct ucsi_ccg *uc)
 {
        unsigned long flags = IRQF_ONESHOT;
 
-       if (!has_acpi_companion(uc->dev))
+       if (!dev_fwnode(uc->dev))
                flags |= IRQF_TRIGGER_HIGH;
 
        return request_threaded_irq(uc->irq, NULL, ccg_irq_handler, flags, dev_name(uc->dev), uc);
@@ -1342,6 +1342,7 @@ static int ucsi_ccg_probe(struct i2c_client *client)
 {
        struct device *dev = &client->dev;
        struct ucsi_ccg *uc;
+       const char *fw_name;
        int status;
 
        uc = devm_kzalloc(dev, sizeof(*uc), GFP_KERNEL);
@@ -1357,9 +1358,15 @@ static int ucsi_ccg_probe(struct i2c_client *client)
        INIT_WORK(&uc->pm_work, ccg_pm_workaround_work);
 
        /* Only fail FW flashing when FW build information is not provided */
-       status = device_property_read_u16(dev, "ccgx,firmware-build",
-                                         &uc->fw_build);
-       if (status)
+       status = device_property_read_string(dev, "firmware-name", &fw_name);
+       if (!status) {
+               if (!strcmp(fw_name, "nvidia,jetson-agx-xavier"))
+                       uc->fw_build = CCG_FW_BUILD_NVIDIA_TEGRA;
+               else if (!strcmp(fw_name, "nvidia,gpu"))
+                       uc->fw_build = CCG_FW_BUILD_NVIDIA;
+       }
+
+       if (!uc->fw_build)
                dev_err(uc->dev, "failed to get FW build information\n");
 
        /* reset ccg device and initialize ucsi */
@@ -1426,6 +1433,12 @@ static void ucsi_ccg_remove(struct i2c_client *client)
        free_irq(uc->irq, uc);
 }
 
+static const struct of_device_id ucsi_ccg_of_match_table[] = {
+               { .compatible = "cypress,cypd4226", },
+               { /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, ucsi_ccg_of_match_table);
+
 static const struct i2c_device_id ucsi_ccg_device_id[] = {
        {"ccgx-ucsi", 0},
        {}
@@ -1480,6 +1493,7 @@ static struct i2c_driver ucsi_ccg_driver = {
                .pm = &ucsi_ccg_pm,
                .dev_groups = ucsi_ccg_groups,
                .acpi_match_table = amd_i2c_ucsi_match,
+               .of_match_table = ucsi_ccg_of_match_table,
        },
        .probe_new = ucsi_ccg_probe,
        .remove = ucsi_ccg_remove,