| Message ID | 20230917152639.21443-16-alkuor@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add TPS25750 USB type-C PD controller support | expand |
Hi, On Sun, Sep 17, 2023 at 11:26:39AM -0400, Abdel Alkuor wrote: > From: Abdel Alkuor <abdelalkuor@geotab.com> > > tps25750 doesn't have VID register, check VID for PD controllers > other than tps25750 > > Signed-off-by: Abdel Alkuor <abdelalkuor@geotab.com> > --- > drivers/usb/typec/tipd/core.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c > index 326c23bfa8e6..c1399e12a170 100644 > --- a/drivers/usb/typec/tipd/core.c > +++ b/drivers/usb/typec/tipd/core.c > @@ -1142,10 +1142,6 @@ static int tps6598x_probe(struct i2c_client *client) > if (IS_ERR(tps->regmap)) > return PTR_ERR(tps->regmap); > > - ret = tps6598x_read32(tps, TPS_REG_VID, &vid); > - if (ret < 0 || !vid) > - return -ENODEV; > - > /* > * Checking can the adapter handle SMBus protocol. If it can not, the > * driver needs to take care of block reads separately. > @@ -1176,6 +1172,12 @@ static int tps6598x_probe(struct i2c_client *client) > > tps->irq_handler = irq_handler; > > + if (!tps->is_tps25750) { > + ret = tps6598x_read32(tps, TPS_REG_VID, &vid); > + if (ret < 0 || !vid) > + return -ENODEV; > + } You need to do this at the same time you enable tps25750, so I'm guessing in patch 4. You are also changing the execution order just because of that is_tps25750. Instead you need to make sure you have that flag set as soon as possible in the first place, so right after "tps" is allocated: mutex_init(&tps->lock); tps->dev = &client->dev; + tps->is_tps25750 = of_device_is_compatible(np, "ti,tps25750"); tps->regmap = devm_regmap_init_i2c(client, &tps6598x_regmap_config); if (IS_ERR(tps->regmap)) thanks,
diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c index 326c23bfa8e6..c1399e12a170 100644 --- a/drivers/usb/typec/tipd/core.c +++ b/drivers/usb/typec/tipd/core.c @@ -1142,10 +1142,6 @@ static int tps6598x_probe(struct i2c_client *client) if (IS_ERR(tps->regmap)) return PTR_ERR(tps->regmap); - ret = tps6598x_read32(tps, TPS_REG_VID, &vid); - if (ret < 0 || !vid) - return -ENODEV; - /* * Checking can the adapter handle SMBus protocol. If it can not, the * driver needs to take care of block reads separately. @@ -1176,6 +1172,12 @@ static int tps6598x_probe(struct i2c_client *client) tps->irq_handler = irq_handler; + if (!tps->is_tps25750) { + ret = tps6598x_read32(tps, TPS_REG_VID, &vid); + if (ret < 0 || !vid) + return -ENODEV; + } + /* Make sure the controller has application firmware running */ ret = tps6598x_check_mode(tps, &mode); if (ret)