* [PATCH v5 1/3] extcon: usbc-tusb320: Add support for mode setting and reset
2021-09-25 5:45 ` [PATCH v5 0/3] extcon: usbc-tusb320: Initial TUSB320L support Yassine Oudjana
@ 2021-09-25 5:45 ` Yassine Oudjana
2021-09-25 5:45 ` [PATCH v5 2/3] extcon: usbc-tusb320: Add support for TUSB320L Yassine Oudjana
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Yassine Oudjana @ 2021-09-25 5:45 UTC (permalink / raw)
To: MyungJoo Ham, Chanwoo Choi, Rob Herring
Cc: Yassine Oudjana, Michael Auchter, linux-kernel, devicetree
Reset the chip and set its mode to default (maintain mode set by PORT pin)
during probe to make sure it comes up in the default state.
Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
---
Changes since v3:
- Remove unused tusb_modes.
Changes since v2:
- Read state before setting default mode, then update it again after resetting.
- Remove mode tracing from irq handler
- Add a delay after reset to handle tSOFT_RESET
Changes since v1:
- Split first patch into two patches, one adding support for mode setting and reset on TUSB320,
and the other adding support for TUSB320L.
drivers/extcon/extcon-usbc-tusb320.c | 85 ++++++++++++++++++++++++++--
1 file changed, 81 insertions(+), 4 deletions(-)
diff --git a/drivers/extcon/extcon-usbc-tusb320.c b/drivers/extcon/extcon-usbc-tusb320.c
index 805af73b4152..1ed1dfe54206 100644
--- a/drivers/extcon/extcon-usbc-tusb320.c
+++ b/drivers/extcon/extcon-usbc-tusb320.c
@@ -19,15 +19,32 @@
#define TUSB320_REG9_ATTACHED_STATE_MASK 0x3
#define TUSB320_REG9_CABLE_DIRECTION BIT(5)
#define TUSB320_REG9_INTERRUPT_STATUS BIT(4)
-#define TUSB320_ATTACHED_STATE_NONE 0x0
-#define TUSB320_ATTACHED_STATE_DFP 0x1
-#define TUSB320_ATTACHED_STATE_UFP 0x2
-#define TUSB320_ATTACHED_STATE_ACC 0x3
+
+#define TUSB320_REGA 0xa
+#define TUSB320_REGA_I2C_SOFT_RESET BIT(3)
+#define TUSB320_REGA_MODE_SELECT_SHIFT 4
+#define TUSB320_REGA_MODE_SELECT_MASK 0x3
+
+enum tusb320_attached_state {
+ TUSB320_ATTACHED_STATE_NONE,
+ TUSB320_ATTACHED_STATE_DFP,
+ TUSB320_ATTACHED_STATE_UFP,
+ TUSB320_ATTACHED_STATE_ACC,
+};
+
+enum tusb320_mode {
+ TUSB320_MODE_PORT,
+ TUSB320_MODE_UFP,
+ TUSB320_MODE_DFP,
+ TUSB320_MODE_DRP,
+};
struct tusb320_priv {
struct device *dev;
struct regmap *regmap;
struct extcon_dev *edev;
+
+ enum tusb320_attached_state state;
};
static const char * const tusb_attached_states[] = {
@@ -62,6 +79,53 @@ static int tusb320_check_signature(struct tusb320_priv *priv)
return 0;
}
+static int tusb320_set_mode(struct tusb320_priv *priv, enum tusb320_mode mode)
+{
+ int ret;
+
+ /* Mode cannot be changed while cable is attached */
+ if (priv->state != TUSB320_ATTACHED_STATE_NONE)
+ return -EBUSY;
+
+ /* Write mode */
+ ret = regmap_write_bits(priv->regmap, TUSB320_REGA,
+ TUSB320_REGA_MODE_SELECT_MASK << TUSB320_REGA_MODE_SELECT_SHIFT,
+ mode << TUSB320_REGA_MODE_SELECT_SHIFT);
+ if (ret) {
+ dev_err(priv->dev, "failed to write mode: %d\n", ret);
+ return ret;
+ }
+
+ return 0;
+}
+
+static int tusb320_reset(struct tusb320_priv *priv)
+{
+ int ret;
+
+ /* Set mode to default (follow PORT pin) */
+ ret = tusb320_set_mode(priv, TUSB320_MODE_PORT);
+ if (ret && ret != -EBUSY) {
+ dev_err(priv->dev,
+ "failed to set mode to PORT: %d\n", ret);
+ return ret;
+ }
+
+ /* Perform soft reset */
+ ret = regmap_write_bits(priv->regmap, TUSB320_REGA,
+ TUSB320_REGA_I2C_SOFT_RESET, 1);
+ if (ret) {
+ dev_err(priv->dev,
+ "failed to write soft reset bit: %d\n", ret);
+ return ret;
+ }
+
+ /* Wait for chip to go through reset */
+ msleep(95);
+
+ return 0;
+}
+
static irqreturn_t tusb320_irq_handler(int irq, void *dev_id)
{
struct tusb320_priv *priv = dev_id;
@@ -96,6 +160,8 @@ static irqreturn_t tusb320_irq_handler(int irq, void *dev_id)
extcon_sync(priv->edev, EXTCON_USB);
extcon_sync(priv->edev, EXTCON_USB_HOST);
+ priv->state = state;
+
regmap_write(priv->regmap, TUSB320_REG9, reg);
return IRQ_HANDLED;
@@ -145,6 +211,17 @@ static int tusb320_extcon_probe(struct i2c_client *client,
/* update initial state */
tusb320_irq_handler(client->irq, priv);
+ /* Reset chip to its default state */
+ ret = tusb320_reset(priv);
+ if (ret)
+ dev_warn(priv->dev, "failed to reset chip: %d\n", ret);
+ else
+ /*
+ * State and polarity might change after a reset, so update
+ * them again and make sure the interrupt status bit is cleared.
+ */
+ tusb320_irq_handler(client->irq, priv);
+
ret = devm_request_threaded_irq(priv->dev, client->irq, NULL,
tusb320_irq_handler,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
--
2.33.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v5 2/3] extcon: usbc-tusb320: Add support for TUSB320L
2021-09-25 5:45 ` [PATCH v5 0/3] extcon: usbc-tusb320: Initial TUSB320L support Yassine Oudjana
2021-09-25 5:45 ` [PATCH v5 1/3] extcon: usbc-tusb320: Add support for mode setting and reset Yassine Oudjana
@ 2021-09-25 5:45 ` Yassine Oudjana
2021-09-25 5:46 ` [PATCH v5 3/3] dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string Yassine Oudjana
2021-09-30 3:36 ` [PATCH v5 0/3] extcon: usbc-tusb320: Initial TUSB320L support Chanwoo Choi
3 siblings, 0 replies; 5+ messages in thread
From: Yassine Oudjana @ 2021-09-25 5:45 UTC (permalink / raw)
To: MyungJoo Ham, Chanwoo Choi, Rob Herring
Cc: Yassine Oudjana, Michael Auchter, linux-kernel, devicetree
TUSB320L is a newer chip with additional features, and it has additional steps
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 during
probe and print it as info.
Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
---
Changes since v4:
- Use ops struct instead of type enum.
Changes since v3:
- Remove extra blank line.
Changes since v2:
- Use a separate mode setting function for each of TUSB320 and TUSB320L.
Changes since v1:
- Split first patch into two patches, one adding support for mode setting and reset on TUSB320,
and the other adding support for TUSB320L.
drivers/extcon/extcon-usbc-tusb320.c | 82 +++++++++++++++++++++++++++-
1 file changed, 79 insertions(+), 3 deletions(-)
diff --git a/drivers/extcon/extcon-usbc-tusb320.c b/drivers/extcon/extcon-usbc-tusb320.c
index 1ed1dfe54206..6ba3d89b106d 100644
--- a/drivers/extcon/extcon-usbc-tusb320.c
+++ b/drivers/extcon/extcon-usbc-tusb320.c
@@ -21,10 +21,13 @@
#define TUSB320_REG9_INTERRUPT_STATUS BIT(4)
#define TUSB320_REGA 0xa
+#define TUSB320L_REGA_DISABLE_TERM BIT(0)
#define TUSB320_REGA_I2C_SOFT_RESET BIT(3)
#define TUSB320_REGA_MODE_SELECT_SHIFT 4
#define TUSB320_REGA_MODE_SELECT_MASK 0x3
+#define TUSB320L_REGA0_REVISION 0xa0
+
enum tusb320_attached_state {
TUSB320_ATTACHED_STATE_NONE,
TUSB320_ATTACHED_STATE_DFP,
@@ -39,11 +42,18 @@ enum tusb320_mode {
TUSB320_MODE_DRP,
};
+struct tusb320_priv;
+
+struct tusb320_ops {
+ int (*set_mode)(struct tusb320_priv *priv, enum tusb320_mode mode);
+ int (*get_revision)(struct tusb320_priv *priv, unsigned int *revision);
+};
+
struct tusb320_priv {
struct device *dev;
struct regmap *regmap;
struct extcon_dev *edev;
-
+ struct tusb320_ops *ops;
enum tusb320_attached_state state;
};
@@ -99,12 +109,46 @@ static int tusb320_set_mode(struct tusb320_priv *priv, enum tusb320_mode mode)
return 0;
}
+static int tusb320l_set_mode(struct tusb320_priv *priv, enum tusb320_mode mode)
+{
+ int ret;
+
+ /* Disable CC state machine */
+ ret = regmap_write_bits(priv->regmap, TUSB320_REGA,
+ TUSB320L_REGA_DISABLE_TERM, 1);
+ if (ret) {
+ dev_err(priv->dev,
+ "failed to disable CC state machine: %d\n", ret);
+ return ret;
+ }
+
+ /* Write mode */
+ ret = regmap_write_bits(priv->regmap, TUSB320_REGA,
+ TUSB320_REGA_MODE_SELECT_MASK << TUSB320_REGA_MODE_SELECT_SHIFT,
+ mode << TUSB320_REGA_MODE_SELECT_SHIFT);
+ if (ret) {
+ dev_err(priv->dev, "failed to write mode: %d\n", ret);
+ goto err;
+ }
+
+ msleep(5);
+err:
+ /* Re-enable CC state machine */
+ ret = regmap_write_bits(priv->regmap, TUSB320_REGA,
+ TUSB320L_REGA_DISABLE_TERM, 0);
+ if (ret)
+ dev_err(priv->dev,
+ "failed to re-enable CC state machine: %d\n", ret);
+
+ return ret;
+}
+
static int tusb320_reset(struct tusb320_priv *priv)
{
int ret;
/* Set mode to default (follow PORT pin) */
- ret = tusb320_set_mode(priv, TUSB320_MODE_PORT);
+ ret = priv->ops->set_mode(priv, TUSB320_MODE_PORT);
if (ret && ret != -EBUSY) {
dev_err(priv->dev,
"failed to set mode to PORT: %d\n", ret);
@@ -126,6 +170,20 @@ static int tusb320_reset(struct tusb320_priv *priv)
return 0;
}
+static int tusb320l_get_revision(struct tusb320_priv *priv, unsigned int *revision)
+{
+ return regmap_read(priv->regmap, TUSB320L_REGA0_REVISION, revision);
+}
+
+static struct tusb320_ops tusb320_ops = {
+ .set_mode = tusb320_set_mode,
+};
+
+static struct tusb320_ops tusb320l_ops = {
+ .set_mode = tusb320l_set_mode,
+ .get_revision = tusb320l_get_revision,
+};
+
static irqreturn_t tusb320_irq_handler(int irq, void *dev_id)
{
struct tusb320_priv *priv = dev_id;
@@ -176,6 +234,8 @@ static int tusb320_extcon_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct tusb320_priv *priv;
+ const void *match_data;
+ unsigned int revision;
int ret;
priv = devm_kzalloc(&client->dev, sizeof(*priv), GFP_KERNEL);
@@ -191,12 +251,27 @@ static int tusb320_extcon_probe(struct i2c_client *client,
if (ret)
return ret;
+ match_data = device_get_match_data(&client->dev);
+ if (!match_data)
+ return -EINVAL;
+
+ priv->ops = (struct tusb320_ops*)match_data;
+
priv->edev = devm_extcon_dev_allocate(priv->dev, tusb320_extcon_cable);
if (IS_ERR(priv->edev)) {
dev_err(priv->dev, "failed to allocate extcon device\n");
return PTR_ERR(priv->edev);
}
+ if (priv->ops->get_revision) {
+ ret = priv->ops->get_revision(priv, &revision);
+ if (ret)
+ dev_warn(priv->dev,
+ "failed to read revision register: %d\n", ret);
+ else
+ dev_info(priv->dev, "chip revision %d\n", revision);
+ }
+
ret = devm_extcon_dev_register(priv->dev, priv->edev);
if (ret < 0) {
dev_err(priv->dev, "failed to register extcon device\n");
@@ -231,7 +306,8 @@ static int tusb320_extcon_probe(struct i2c_client *client,
}
static const struct of_device_id tusb320_extcon_dt_match[] = {
- { .compatible = "ti,tusb320", },
+ { .compatible = "ti,tusb320", .data = &tusb320_ops, },
+ { .compatible = "ti,tusb320l", .data = &tusb320l_ops, },
{ }
};
MODULE_DEVICE_TABLE(of, tusb320_extcon_dt_match);
--
2.33.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v5 3/3] dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string
2021-09-25 5:45 ` [PATCH v5 0/3] extcon: usbc-tusb320: Initial TUSB320L support Yassine Oudjana
2021-09-25 5:45 ` [PATCH v5 1/3] extcon: usbc-tusb320: Add support for mode setting and reset Yassine Oudjana
2021-09-25 5:45 ` [PATCH v5 2/3] extcon: usbc-tusb320: Add support for TUSB320L Yassine Oudjana
@ 2021-09-25 5:46 ` Yassine Oudjana
2021-09-30 3:36 ` [PATCH v5 0/3] extcon: usbc-tusb320: Initial TUSB320L support Chanwoo Choi
3 siblings, 0 replies; 5+ messages in thread
From: Yassine Oudjana @ 2021-09-25 5:46 UTC (permalink / raw)
To: MyungJoo Ham, Chanwoo Choi, Rob Herring
Cc: Yassine Oudjana, Michael Auchter, linux-kernel, devicetree, Rob Herring
Add a compatible string for TUSB320L.
Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
---
Changes since v1:
- Fix dt_binding_check warning:
../Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml:15:6: [warning] wrong indentation: expected 6 but found 5 (indentation)
.../devicetree/bindings/extcon/extcon-usbc-tusb320.yaml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml b/Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml
index 9875b4d5c356..71a9f2e5d0dc 100644
--- a/Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml
+++ b/Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml
@@ -11,7 +11,9 @@ maintainers:
properties:
compatible:
- const: ti,tusb320
+ enum:
+ - ti,tusb320
+ - ti,tusb320l
reg:
maxItems: 1
--
2.33.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v5 0/3] extcon: usbc-tusb320: Initial TUSB320L support
2021-09-25 5:45 ` [PATCH v5 0/3] extcon: usbc-tusb320: Initial TUSB320L support Yassine Oudjana
` (2 preceding siblings ...)
2021-09-25 5:46 ` [PATCH v5 3/3] dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string Yassine Oudjana
@ 2021-09-30 3:36 ` Chanwoo Choi
3 siblings, 0 replies; 5+ messages in thread
From: Chanwoo Choi @ 2021-09-30 3:36 UTC (permalink / raw)
To: Yassine Oudjana, MyungJoo Ham, Rob Herring
Cc: Michael Auchter, linux-kernel, devicetree
On 9/25/21 2:45 PM, Yassine Oudjana wrote:
> The TUSB320L is a newer chip with additional features. It is close enough to TUSB320 so it works
> to some extent out-of-the-box, but for some reason it can start in UFP mode which is not desirable.
>
> This series adds support for reset and mode setting for both chips, and does that while probing
> to ensure the chip starts with the default mode of following the PORT pin.
>
> Changes since v4:
> - Use ops struct instead of type enum.
> Changes since v3:
> - Remove unused tusb_modes.
> - Remove extra blank line.
> Changes since v2:
> - Read state before setting default mode, then update it again after resetting.
> - Remove mode tracing from irq handler
> - Add a delay after reset to handle tSOFT_RESET
> - Use a separate mode setting function for each of TUSB320 and TUSB320L.
> Changes since v1:
> - Split first patch into two patches, one adding support for mode setting and reset on TUSB320,
> and the other adding support for TUSB320L.
> - Fix dt_binding_check warning:
> ../Documentation/devicetree/bindings/extcon/extcon-usbc-tusb320.yaml:15:6: [warning] wrong indentation: expected 6 but found 5 (indentation)
>
> Yassine Oudjana (3):
> extcon: usbc-tusb320: Add support for mode setting and reset
> extcon: usbc-tusb320: Add support for TUSB320L
> dt-bindings: extcon: usbc-tusb320: Add TUSB320L compatible string
>
> .../bindings/extcon/extcon-usbc-tusb320.yaml | 4 +-
> drivers/extcon/extcon-usbc-tusb320.c | 163 +++++++++++++++++-
> 2 files changed, 161 insertions(+), 6 deletions(-)
>
Thanks for fixup. Applied them.
--
Best Regards,
Chanwoo Choi
Samsung Electronics
^ permalink raw reply [flat|nested] 5+ messages in thread