| Message ID | 20230906080619.36930-3-biju.das.jz@bp.renesas.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e2d514dffcb583977150a6bee9d39aeb393ee8d9 |
| Headers | show |
| Series | Match data improvements for rt1711h driver | expand |
On Wed, Sep 06, 2023 at 09:06:16AM +0100, Biju Das wrote: > Currently did varaible is used for HW differences between the devices which > complicates the code by adding checks. > > Therefore it is better to convert enum->pointer for data match and extend > match support for both ID and OF tables by using i2c_get_match_data(). > > Add struct rt1711h_chip_info with did variable and replace did->info in > struct rt1711h_chip. Later patch will add more hw differences to > struct rt1711h_chip_info and avoid checking did for HW differences. > > Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > v2->v3: > * Added Rb tag from Andy. > v1->v2: > * Updated commit description. > --- > drivers/usb/typec/tcpm/tcpci_rt1711h.c | 30 ++++++++++++++++++-------- > 1 file changed, 21 insertions(+), 9 deletions(-) > > diff --git a/drivers/usb/typec/tcpm/tcpci_rt1711h.c b/drivers/usb/typec/tcpm/tcpci_rt1711h.c > index 6146bca8e55f..2b7258d3cb4e 100644 > --- a/drivers/usb/typec/tcpm/tcpci_rt1711h.c > +++ b/drivers/usb/typec/tcpm/tcpci_rt1711h.c > @@ -51,13 +51,17 @@ > /* 1b0 as fixed rx threshold of rd/rp 0.55V, 1b1 depends on RTCRTL4[0] */ > #define BMCIO_RXDZEN BIT(0) > > +struct rt1711h_chip_info { > + u16 did; > +}; > + > struct rt1711h_chip { > struct tcpci_data data; > struct tcpci *tcpci; > struct device *dev; > struct regulator *vbus; > + const struct rt1711h_chip_info *info; > bool src_en; > - u16 did; > }; > > static int rt1711h_read16(struct rt1711h_chip *chip, unsigned int reg, u16 *val) > @@ -105,7 +109,7 @@ static int rt1711h_init(struct tcpci *tcpci, struct tcpci_data *tdata) > return ret; > > /* Enable PD30 extended message for RT1715 */ > - if (chip->did == RT1715_DID) { > + if (chip->info->did == RT1715_DID) { > ret = regmap_update_bits(regmap, RT1711H_RTCTRL8, > RT1711H_ENEXTMSG, RT1711H_ENEXTMSG); > if (ret < 0) > @@ -200,7 +204,7 @@ static inline int rt1711h_init_cc_params(struct rt1711h_chip *chip, u8 status) > if ((cc1 >= TYPEC_CC_RP_1_5 && cc2 < TYPEC_CC_RP_DEF) || > (cc2 >= TYPEC_CC_RP_1_5 && cc1 < TYPEC_CC_RP_DEF)) { > rxdz_en = BMCIO_RXDZEN; > - if (chip->did == RT1715_DID) > + if (chip->info->did == RT1715_DID) > rxdz_sel = RT1711H_BMCIO_RXDZSEL; > else > rxdz_sel = 0; > @@ -319,7 +323,7 @@ static int rt1711h_check_revision(struct i2c_client *i2c, struct rt1711h_chip *c > ret = i2c_smbus_read_word_data(i2c, TCPC_BCD_DEV); > if (ret < 0) > return ret; > - if (ret != chip->did) { > + if (ret != chip->info->did) { > dev_err(&i2c->dev, "did is not correct, 0x%04x\n", ret); > return -ENODEV; > } > @@ -336,7 +340,7 @@ static int rt1711h_probe(struct i2c_client *client) > if (!chip) > return -ENOMEM; > > - chip->did = (size_t)device_get_match_data(&client->dev); > + chip->info = i2c_get_match_data(client); > > ret = rt1711h_check_revision(client, chip); > if (ret < 0) { > @@ -391,17 +395,25 @@ static void rt1711h_remove(struct i2c_client *client) > tcpci_unregister_port(chip->tcpci); > } > > +static const struct rt1711h_chip_info rt1711h = { > + .did = RT1711H_DID, > +}; > + > +static const struct rt1711h_chip_info rt1715 = { > + .did = RT1715_DID, > +}; > + > static const struct i2c_device_id rt1711h_id[] = { > - { "rt1711h", 0 }, > - { "rt1715", 0 }, > + { "rt1711h", (kernel_ulong_t)&rt1711h }, > + { "rt1715", (kernel_ulong_t)&rt1715 }, > {} > }; > MODULE_DEVICE_TABLE(i2c, rt1711h_id); > > #ifdef CONFIG_OF > static const struct of_device_id rt1711h_of_match[] = { > - { .compatible = "richtek,rt1711h", .data = (void *)RT1711H_DID }, > - { .compatible = "richtek,rt1715", .data = (void *)RT1715_DID }, > + { .compatible = "richtek,rt1711h", .data = &rt1711h }, > + { .compatible = "richtek,rt1715", .data = &rt1715 }, > {} > }; > MODULE_DEVICE_TABLE(of, rt1711h_of_match); > -- > 2.25.1
diff --git a/drivers/usb/typec/tcpm/tcpci_rt1711h.c b/drivers/usb/typec/tcpm/tcpci_rt1711h.c index 6146bca8e55f..2b7258d3cb4e 100644 --- a/drivers/usb/typec/tcpm/tcpci_rt1711h.c +++ b/drivers/usb/typec/tcpm/tcpci_rt1711h.c @@ -51,13 +51,17 @@ /* 1b0 as fixed rx threshold of rd/rp 0.55V, 1b1 depends on RTCRTL4[0] */ #define BMCIO_RXDZEN BIT(0) +struct rt1711h_chip_info { + u16 did; +}; + struct rt1711h_chip { struct tcpci_data data; struct tcpci *tcpci; struct device *dev; struct regulator *vbus; + const struct rt1711h_chip_info *info; bool src_en; - u16 did; }; static int rt1711h_read16(struct rt1711h_chip *chip, unsigned int reg, u16 *val) @@ -105,7 +109,7 @@ static int rt1711h_init(struct tcpci *tcpci, struct tcpci_data *tdata) return ret; /* Enable PD30 extended message for RT1715 */ - if (chip->did == RT1715_DID) { + if (chip->info->did == RT1715_DID) { ret = regmap_update_bits(regmap, RT1711H_RTCTRL8, RT1711H_ENEXTMSG, RT1711H_ENEXTMSG); if (ret < 0) @@ -200,7 +204,7 @@ static inline int rt1711h_init_cc_params(struct rt1711h_chip *chip, u8 status) if ((cc1 >= TYPEC_CC_RP_1_5 && cc2 < TYPEC_CC_RP_DEF) || (cc2 >= TYPEC_CC_RP_1_5 && cc1 < TYPEC_CC_RP_DEF)) { rxdz_en = BMCIO_RXDZEN; - if (chip->did == RT1715_DID) + if (chip->info->did == RT1715_DID) rxdz_sel = RT1711H_BMCIO_RXDZSEL; else rxdz_sel = 0; @@ -319,7 +323,7 @@ static int rt1711h_check_revision(struct i2c_client *i2c, struct rt1711h_chip *c ret = i2c_smbus_read_word_data(i2c, TCPC_BCD_DEV); if (ret < 0) return ret; - if (ret != chip->did) { + if (ret != chip->info->did) { dev_err(&i2c->dev, "did is not correct, 0x%04x\n", ret); return -ENODEV; } @@ -336,7 +340,7 @@ static int rt1711h_probe(struct i2c_client *client) if (!chip) return -ENOMEM; - chip->did = (size_t)device_get_match_data(&client->dev); + chip->info = i2c_get_match_data(client); ret = rt1711h_check_revision(client, chip); if (ret < 0) { @@ -391,17 +395,25 @@ static void rt1711h_remove(struct i2c_client *client) tcpci_unregister_port(chip->tcpci); } +static const struct rt1711h_chip_info rt1711h = { + .did = RT1711H_DID, +}; + +static const struct rt1711h_chip_info rt1715 = { + .did = RT1715_DID, +}; + static const struct i2c_device_id rt1711h_id[] = { - { "rt1711h", 0 }, - { "rt1715", 0 }, + { "rt1711h", (kernel_ulong_t)&rt1711h }, + { "rt1715", (kernel_ulong_t)&rt1715 }, {} }; MODULE_DEVICE_TABLE(i2c, rt1711h_id); #ifdef CONFIG_OF static const struct of_device_id rt1711h_of_match[] = { - { .compatible = "richtek,rt1711h", .data = (void *)RT1711H_DID }, - { .compatible = "richtek,rt1715", .data = (void *)RT1715_DID }, + { .compatible = "richtek,rt1711h", .data = &rt1711h }, + { .compatible = "richtek,rt1715", .data = &rt1715 }, {} }; MODULE_DEVICE_TABLE(of, rt1711h_of_match);