Re: [PATCH v3 05/13] usb: typec: ucsi_ccg: Add OF support
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Date: 2022-11-16 12:54:46
Also in:
linux-devicetree, linux-i2c, linux-tegra, linux-usb, lkml
On Mon, Nov 14, 2022 at 08:40:45PM +0800, Wayne Chang wrote:
quoted hunk ↗ jump to hunk
The change enables the device tree infrastructure support. Signed-off-by: Wayne Chang <redacted> --- V2 -> V3:nothing has changed V1 -> V2:nothing has changed drivers/usb/typec/ucsi/ucsi_ccg.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c index 835f1c4372ba..139707a2f3d6 100644 --- 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;
Sorry, I had to double check this, and the above does not work after
all. In the function i2c_new_ccgx_ucsi() the device is given a fwnode
(of type software_node).
So that probable has to be changed to:
if (is_software_node(dev_fwnode(uc->dev)))
flags |= IRQF_TRIGGER_HIGH;
quoted hunk ↗ jump to hunk
return request_threaded_irq(uc->irq, NULL, ccg_irq_handler, flags, dev_name(uc->dev), uc);@@ -1427,6 +1427,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}, {}@@ -1481,6 +1487,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 = ucsi_ccg_probe, .remove = ucsi_ccg_remove,
thanks, -- heikki -- linux-phy mailing list linux-phy@lists.infradead.org https://lists.infradead.org/mailman/listinfo/linux-phy