Re: [PATCH v3 5/7] usb: typec: tcpci_rt1711h: Add compatible id with rt1715

Heikki Krogerus
2022-08-02T08:28:50Z

On Mon, Aug 01, 2022 at 06:14:45PM +0800, Gene Chen wrote:
> From: Gene Chen <gene_chen@richtek.com>
>
> Add compatible id with rt1715, and add initial setting for
> specific support PD30 command.
>
> Signed-off-by: Gene Chen <gene_chen@richtek.com>

Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>

> ---
> drivers/usb/typec/tcpm/tcpci_rt1711h.c | 43 ++++++++++++++++++++------
> 1 file changed, 34 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/usb/typec/tcpm/tcpci_rt1711h.c b/drivers/usb/typec/tcpm/tcpci_rt1711h.c
> index 33d8ea95b7c1..da35dd3e8a59 100644
> --- a/drivers/usb/typec/tcpm/tcpci_rt1711h.c
> +++ b/drivers/usb/typec/tcpm/tcpci_rt1711h.c
> @@ -19,6 +19,8 @@
>
> #define RT1711H_VID 0x29CF
> #define RT1711H_PID 0x1711
> +#define RT1711H_DID 0x2171
> +#define RT1715_DID 0x2173
>
> #define RT1711H_PHYCTRL1 0x80
> #define RT1711H_PHYCTRL2 0x81
> @@ -30,6 +32,7 @@
> (((ck300) << 7) | ((ship_off) << 5) | \
> ((auto_idle) << 3) | ((tout) & 0x07))
> #define RT1711H_AUTOIDLEEN BIT(3)
> +#define RT1711H_ENEXTMSG BIT(4)
>
> #define RT1711H_RTCTRL11 0x9E
>
> @@ -48,6 +51,7 @@ struct rt1711h_chip {
> struct device *dev;
> struct regulator *vbus;
> bool src_en;
> + u16 did;
> };
>
> static int rt1711h_read16(struct rt1711h_chip *chip, unsigned int reg, u16 *val)
> @@ -84,8 +88,9 @@ static struct rt1711h_chip *tdata_to_rt1711h(struct tcpci_data *tdata)
>
> static int rt1711h_init(struct tcpci *tcpci, struct tcpci_data *tdata)
> {
> - int ret;
> struct rt1711h_chip *chip = tdata_to_rt1711h(tdata);
> + struct regmap *regmap = chip->data.regmap;
> + int ret;
>
> /* CK 300K from 320K, shipping off, auto_idle enable, tout = 32ms */
> ret = rt1711h_write8(chip, RT1711H_RTCTRL8,
> @@ -93,6 +98,14 @@ static int rt1711h_init(struct tcpci *tcpci, struct tcpci_data *tdata)
> if (ret < 0)
> return ret;
>
> + /* Enable PD30 extended message for RT1715 */
> + if (chip->did == RT1715_DID) {
> + ret = regmap_update_bits(regmap, RT1711H_RTCTRL8,
> + RT1711H_ENEXTMSG, RT1711H_ENEXTMSG);
> + if (ret < 0)
> + return ret;
> + }
> +
> /* I2C reset : (val + 1) * 12.5ms */
> ret = rt1711h_write8(chip, RT1711H_RTCTRL11,
> RT1711H_RTCTRL11_SET(1, 0x0F));
> @@ -230,7 +243,7 @@ static int rt1711h_sw_reset(struct rt1711h_chip *chip)
> return 0;
> }
>
> -static int rt1711h_check_revision(struct i2c_client *i2c)
> +static int rt1711h_check_revision(struct i2c_client *i2c, struct rt1711h_chip *chip)
> {
> int ret;
>
> @@ -248,7 +261,15 @@ static int rt1711h_check_revision(struct i2c_client *i2c)
> dev_err(&i2c->dev, "pid is not correct, 0x%04x\n", ret);
> return -ENODEV;
> }
> - return 0;
> + ret = i2c_smbus_read_word_data(i2c, TCPC_BCD_DEV);
> + if (ret < 0)
> + return ret;
> + if (ret != chip->did) {
> + dev_err(&i2c->dev, "did is not correct, 0x%04x\n", ret);
> + return -ENODEV;
> + }
> + dev_dbg(&i2c->dev, "did is 0x%04x\n", ret);
> + return ret;
> }
>
> static int rt1711h_probe(struct i2c_client *client,
> @@ -257,16 +278,18 @@ static int rt1711h_probe(struct i2c_client *client,
> int ret;
> struct rt1711h_chip *chip;
>
> - ret = rt1711h_check_revision(client);
> + chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
> + if (!chip)
> + return -ENOMEM;
> +
> + chip->did = (size_t)device_get_match_data(&client->dev);
> +
> + ret = rt1711h_check_revision(client, chip);
> if (ret < 0) {
> dev_err(&client->dev, "check vid/pid fail\n");
> return ret;
> }
>
> - chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
> - if (!chip)
> - return -ENOMEM;
> -
> chip->data.regmap = devm_regmap_init_i2c(client,
> &rt1711h_regmap_config);
> if (IS_ERR(chip->data.regmap))
> @@ -317,13 +340,15 @@ static int rt1711h_remove(struct i2c_client *client)
>
> static const struct i2c_device_id rt1711h_id[] = {
> { "rt1711h", 0 },
> + { "rt1715", 0 },
> { }
> };
> MODULE_DEVICE_TABLE(i2c, rt1711h_id);
>
> #ifdef CONFIG_OF
> static const struct of_device_id rt1711h_of_match[] = {
> - { .compatible = "richtek,rt1711h", },
> + { .compatible = "richtek,rt1711h", .data = (void *)RT1711H_DID },
> + { .compatible = "richtek,rt1715", .data = (void *)RT1715_DID },
> {},
> };
> MODULE_DEVICE_TABLE(of, rt1711h_of_match);
> --
> 2.25.1

--
heikki