Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Sun, 01 Aug 2021 10:07:18 +0000
To:     MyungJoo Ham <myungjoo.ham@samsung.com>,
        Chanwoo Choi <cw00.choi@samsung.com>,
        Rob Herring <robh+dt@kernel.org>
From:   Yassine Oudjana <y.oudjana@protonmail.com>
Cc:     Yassine Oudjana <y.oudjana@protonmail.com>,
        Michael Auchter <michael.auchter@ni.com>,
        linux-kernel@vger.kernel.org, devicetree@vger.kernel.org
Reply-To: Yassine Oudjana <y.oudjana@protonmail.com>
Subject: [PATCH v3 2/3] extcon: usbc-tusb320: Add support for TUSB320L
Message-ID: <20210801100519.440574-3-y.oudjana@protonmail.com>
In-Reply-To: <20210801100519.440574-1-y.oudjana@protonmail.com>
References: <20210801100519.440574-1-y.oudjana@protonmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

TUSB320L is a newer chip with additional features, and it has additional st=
eps
in its mode changing sequence:
 - Disable CC state machine,
 - Write to mode register,
 - Wait for 5 ms,
 - Re-enable CC state machine.
It also has an additional register that a revision number can be read from.

Add support for the mode changing sequence, and read the revision number du=
ring
probe and print it as info.

Changes since v2:
 - Use a separate mode setting function for each of TUSB320 and TUSB320L. =
=20

Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
---
 drivers/extcon/extcon-usbc-tusb320.c | 74 +++++++++++++++++++++++++++-
 1 file changed, 72 insertions(+), 2 deletions(-)

diff --git a/drivers/extcon/extcon-usbc-tusb320.c b/drivers/extcon/extcon-u=
sbc-tusb320.c
index 867fb2bf2bdc..5a80ca7a15eb 100644
--- a/drivers/extcon/extcon-usbc-tusb320.c
+++ b/drivers/extcon/extcon-usbc-tusb320.c
@@ -21,10 +21,13 @@
 #define TUSB320_REG9_INTERRUPT_STATUS=09=09BIT(4)
=20
 #define TUSB320_REGA=09=09=09=090xa
+#define TUSB320L_REGA_DISABLE_TERM=09=09BIT(0)
 #define TUSB320_REGA_I2C_SOFT_RESET=09=09BIT(3)
 #define TUSB320_REGA_MODE_SELECT_SHIFT=09=094
 #define TUSB320_REGA_MODE_SELECT_MASK=09=090x3
=20
+#define TUSB320L_REGA0_REVISION=09=09=090xa0
+
 enum tusb320_attached_state {
 =09TUSB320_ATTACHED_STATE_NONE,
 =09TUSB320_ATTACHED_STATE_DFP,
@@ -39,9 +42,16 @@ enum tusb320_mode {
 =09TUSB320_MODE_DRP,
 };
=20
+enum tusb320_type {
+=09TYPE_TUSB320,
+=09TYPE_TUSB320L,
+};
+
+
 struct tusb320_priv {
 =09struct device *dev;
 =09struct regmap *regmap;
+=09enum tusb320_type type;
 =09struct extcon_dev *edev;
=20
 =09enum tusb320_attached_state state;
@@ -106,12 +116,53 @@ static int tusb320_set_mode(struct tusb320_priv *priv=
, enum tusb320_mode mode)
 =09return 0;
 }
=20
+static int tusb320l_set_mode(struct tusb320_priv *priv, enum tusb320_mode =
mode)
+{
+=09int ret;
+
+=09/* Disable CC state machine */
+=09ret =3D regmap_write_bits(priv->regmap, TUSB320_REGA,
+=09=09TUSB320L_REGA_DISABLE_TERM, 1);
+=09if (ret) {
+=09=09dev_err(priv->dev,
+=09=09=09"failed to disable CC state machine: %d\n", ret);
+=09=09return ret;
+=09}
+
+=09/* Write mode */
+=09ret =3D regmap_write_bits(priv->regmap, TUSB320_REGA,
+=09=09TUSB320_REGA_MODE_SELECT_MASK << TUSB320_REGA_MODE_SELECT_SHIFT,
+=09=09mode << TUSB320_REGA_MODE_SELECT_SHIFT);
+=09if (ret) {
+=09=09dev_err(priv->dev, "failed to write mode: %d\n", ret);
+=09=09goto err;
+=09}
+
+=09msleep(5);
+err:
+=09/* Re-enable CC state machine */
+=09ret =3D regmap_write_bits(priv->regmap, TUSB320_REGA,
+=09=09TUSB320L_REGA_DISABLE_TERM, 0);
+=09if (ret)
+=09=09dev_err(priv->dev,
+=09=09=09"failed to re-enable CC state machine: %d\n", ret);
+
+=09return ret;
+}
+
 static int tusb320_reset(struct tusb320_priv *priv)
 {
 =09int ret;
=20
 =09/* Set mode to default (follow PORT pin) */
-=09ret =3D tusb320_set_mode(priv, TUSB320_MODE_PORT);
+=09switch (priv->type) {
+=09case TYPE_TUSB320:
+=09=09ret =3D tusb320_set_mode(priv, TUSB320_MODE_PORT);
+=09=09break;
+=09case TYPE_TUSB320L:
+=09=09ret =3D tusb320l_set_mode(priv, TUSB320_MODE_PORT);
+=09=09break;
+=09}
 =09if (ret && ret !=3D -EBUSY) {
 =09=09dev_err(priv->dev,
 =09=09=09"failed to set mode to PORT: %d\n", ret);
@@ -183,6 +234,8 @@ static int tusb320_extcon_probe(struct i2c_client *clie=
nt,
 =09=09=09=09const struct i2c_device_id *id)
 {
 =09struct tusb320_priv *priv;
+=09const void *match_data;
+=09unsigned int revision;
 =09int ret;
=20
 =09priv =3D devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL);
@@ -198,12 +251,28 @@ static int tusb320_extcon_probe(struct i2c_client *cl=
ient,
 =09if (ret)
 =09=09return ret;
=20
+=09match_data =3D device_get_match_data(&client->dev);
+=09if (!match_data)
+=09=09return -EINVAL;
+
+=09priv->type =3D (enum tusb320_type)match_data;
+
 =09priv->edev =3D devm_extcon_dev_allocate(priv->dev, tusb320_extcon_cable=
);
 =09if (IS_ERR(priv->edev)) {
 =09=09dev_err(priv->dev, "failed to allocate extcon device\n");
 =09=09return PTR_ERR(priv->edev);
 =09}
=20
+=09if (priv->type =3D=3D TYPE_TUSB320L) {
+=09=09ret =3D regmap_read(priv->regmap, TUSB320L_REGA0_REVISION, &revision=
);
+
+=09=09if (ret)
+=09=09=09dev_warn(priv->dev,
+=09=09=09=09"failed to read revision register: %d\n", ret);
+=09=09else
+=09=09=09dev_info(priv->dev, "chip revision %d\n", revision);
+=09}
+
 =09ret =3D devm_extcon_dev_register(priv->dev, priv->edev);
 =09if (ret < 0) {
 =09=09dev_err(priv->dev, "failed to register extcon device\n");
@@ -238,7 +307,8 @@ static int tusb320_extcon_probe(struct i2c_client *clie=
nt,
 }
=20
 static const struct of_device_id tusb320_extcon_dt_match[] =3D {
-=09{ .compatible =3D "ti,tusb320", },
+=09{ .compatible =3D "ti,tusb320", .data =3D (void *)TYPE_TUSB320, },
+=09{ .compatible =3D "ti,tusb320l", .data =3D (void *)TYPE_TUSB320L, },
 =09{ }
 };
 MODULE_DEVICE_TABLE(of, tusb320_extcon_dt_match);
--=20
2.32.0