* [PATCH v7 1/7] dt-bindings: usb: hd3ss3220 device tree binding document
2019-05-31 9:59 [PATCH v7 0/7] Add USB3.0 and TI HD3SS3220 driver support Biju Das
@ 2019-05-31 9:59 ` Biju Das
2019-06-11 21:55 ` Rob Herring
2019-05-31 9:59 ` [PATCH v7 2/7] dt-bindings: usb: renesas_usb3: Document usb role switch support Biju Das
` (2 subsequent siblings)
3 siblings, 1 reply; 16+ messages in thread
From: Biju Das @ 2019-05-31 9:59 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Sergei Shtylyov, Yoshihiro Shimoda,
Greg Kroah-Hartman
Cc: Biju Das, Heikki Krogerus, Felipe Balbi, linux-usb, devicetree,
Simon Horman, Geert Uytterhoeven, Chris Paterson,
Fabrizio Castro, linux-renesas-soc
Add device tree binding document for TI HD3SS3220 Type-C DRP port
controller driver.
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
v6-->V7
* Removed Rob's reviewed by tag, since there is a rework
* Incorporated Sergie and Shimoda-San's review comment
(https://patchwork.kernel.org/patch/10944629/)
V5-->V6
* No change.
V4-->V5
* No Change.
V3-->V4
* No Change.
V2-->V3
* Added Rob's Reviewed by tag.
V1-->V2
* Added connector node.
* updated the example with connector node.
---
.../devicetree/bindings/usb/ti,hd3ss3220.txt | 38 ++++++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 Documentation/devicetree/bindings/usb/ti,hd3ss3220.txt
diff --git a/Documentation/devicetree/bindings/usb/ti,hd3ss3220.txt b/Documentation/devicetree/bindings/usb/ti,hd3ss3220.txt
new file mode 100644
index 0000000..25780e9
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/ti,hd3ss3220.txt
@@ -0,0 +1,38 @@
+TI HD3SS3220 TypeC DRP Port Controller.
+
+Required properties:
+ - compatible: Must be "ti,hd3ss3220".
+ - reg: I2C slave address, must be 0x47 or 0x67 based on ADDR pin.
+ - interrupts: An interrupt specifier.
+
+Required sub-node:
+ - connector: The "usb-c-connector" attached to the hd3ss3220 chip. The
+ bindings of the connector node are specified in:
+
+ Documentation/devicetree/bindings/connector/usb-connector.txt
+
+Example:
+hd3ss3220@47 {
+ compatible = "ti,hd3ss3220";
+ reg = <0x47>;
+ interrupt-parent = <&gpio6>;
+ interrupts = <3 IRQ_TYPE_LEVEL_LOW>;
+
+ connector {
+ compatible = "usb-c-connector";
+ label = "USB-C";
+ data-role = "dual";
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@1 {
+ reg = <1>;
+ hd3ss3220_ep: endpoint {
+ remote-endpoint = <&usb3_role_switch>;
+ };
+ };
+ };
+ };
+};
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH v7 1/7] dt-bindings: usb: hd3ss3220 device tree binding document
2019-05-31 9:59 ` [PATCH v7 1/7] dt-bindings: usb: hd3ss3220 device tree binding document Biju Das
@ 2019-06-11 21:55 ` Rob Herring
0 siblings, 0 replies; 16+ messages in thread
From: Rob Herring @ 2019-06-11 21:55 UTC (permalink / raw)
To: Biju Das
Cc: Mark Rutland, Sergei Shtylyov, Yoshihiro Shimoda,
Greg Kroah-Hartman, Heikki Krogerus, Felipe Balbi,
Linux USB List, devicetree, Simon Horman, Geert Uytterhoeven,
Chris Paterson, Fabrizio Castro,
open list:MEDIA DRIVERS FOR RENESAS - FCP
On Fri, May 31, 2019 at 4:07 AM Biju Das <biju.das@bp.renesas.com> wrote:
>
> Add device tree binding document for TI HD3SS3220 Type-C DRP port
> controller driver.
>
> Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> ---
> v6-->V7
> * Removed Rob's reviewed by tag, since there is a rework
> * Incorporated Sergie and Shimoda-San's review comment
> (https://patchwork.kernel.org/patch/10944629/)
> V5-->V6
> * No change.
> V4-->V5
> * No Change.
> V3-->V4
> * No Change.
> V2-->V3
> * Added Rob's Reviewed by tag.
> V1-->V2
> * Added connector node.
> * updated the example with connector node.
> ---
> .../devicetree/bindings/usb/ti,hd3ss3220.txt | 38 ++++++++++++++++++++++
> 1 file changed, 38 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/usb/ti,hd3ss3220.txt
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v7 2/7] dt-bindings: usb: renesas_usb3: Document usb role switch support
2019-05-31 9:59 [PATCH v7 0/7] Add USB3.0 and TI HD3SS3220 driver support Biju Das
2019-05-31 9:59 ` [PATCH v7 1/7] dt-bindings: usb: hd3ss3220 device tree binding document Biju Das
@ 2019-05-31 9:59 ` Biju Das
2019-06-03 9:56 ` Yoshihiro Shimoda
2019-06-11 22:57 ` Rob Herring
2019-05-31 9:59 ` [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller Biju Das
2019-05-31 9:59 ` [PATCH v7 4/7] usb: gadget: udc: renesas_usb3: Enhance role switch support Biju Das
3 siblings, 2 replies; 16+ messages in thread
From: Biju Das @ 2019-05-31 9:59 UTC (permalink / raw)
To: Rob Herring, Mark Rutland, Yoshihiro Shimoda, Greg Kroah-Hartman
Cc: Biju Das, Heikki Krogerus, Felipe Balbi, linux-usb, devicetree,
Simon Horman, Geert Uytterhoeven, Chris Paterson,
Fabrizio Castro, linux-renesas-soc
Update the DT bindings documentation to support usb role switch
for USB Type-C connector using USB role switch class framework.
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
V6-->V7
* Incorporated shimoda-san's review comments.
(https://patchwork.kernel.org/patch/10944631/)
V5-->V6
* Updated description
* Added usb-role-switch-property
V4-->V5
* No Change
V3-->V4
* No Change
V2-->V3
* Added optional renesas,usb-role-switch property.
V1-->V2
* Added usb-role-switch-property
* Updated the example with usb-role-switch property.
---
.../devicetree/bindings/usb/renesas_usb3.txt | 23 ++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/Documentation/devicetree/bindings/usb/renesas_usb3.txt b/Documentation/devicetree/bindings/usb/renesas_usb3.txt
index 35039e7..5eecfbc 100644
--- a/Documentation/devicetree/bindings/usb/renesas_usb3.txt
+++ b/Documentation/devicetree/bindings/usb/renesas_usb3.txt
@@ -22,6 +22,12 @@ Required properties:
Optional properties:
- phys: phandle + phy specifier pair
- phy-names: must be "usb"
+ - usb-role-switch: support role switch. see usb/generic.txt
+
+Sub-nodes:
+- any connector to the data bus of this controller should be modelled using the
+ OF graph bindings specified in bindings/graph.txt, if the "usb-role-switch"
+ property is used.
Example of R-Car H3 ES1.x:
usb3_peri0: usb@ee020000 {
@@ -39,3 +45,20 @@ Example of R-Car H3 ES1.x:
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 327>;
};
+
+Example of RZ/G2E:
+ usb3_peri0: usb@ee020000 {
+ compatible = "renesas,r8a774c0-usb3-peri",
+ "renesas,rcar-gen3-usb3-peri";
+ reg = <0 0xee020000 0 0x400>;
+ interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&cpg CPG_MOD 328>;
+ companion = <&xhci0>;
+ usb-role-switch;
+
+ port {
+ usb3_role_switch: endpoint {
+ remote-endpoint = <&hd3ss3220_ep>;
+ };
+ };
+ };
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* RE: [PATCH v7 2/7] dt-bindings: usb: renesas_usb3: Document usb role switch support
2019-05-31 9:59 ` [PATCH v7 2/7] dt-bindings: usb: renesas_usb3: Document usb role switch support Biju Das
@ 2019-06-03 9:56 ` Yoshihiro Shimoda
2019-06-11 22:57 ` Rob Herring
1 sibling, 0 replies; 16+ messages in thread
From: Yoshihiro Shimoda @ 2019-06-03 9:56 UTC (permalink / raw)
To: Biju Das, Rob Herring, Mark Rutland, Greg Kroah-Hartman
Cc: Biju Das, Heikki Krogerus, Felipe Balbi, linux-usb, devicetree,
Simon Horman, Geert Uytterhoeven, Chris Paterson,
Fabrizio Castro, linux-renesas-soc
Hi Biju-san,
> From: Biju Das, Sent: Friday, May 31, 2019 7:00 PM
>
> Update the DT bindings documentation to support usb role switch
> for USB Type-C connector using USB role switch class framework.
>
> Signed-off-by: Biju Das <biju.das@bp.renesas.com>
Thank you for the patch!
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Best regards,
Yoshihiro Shimoda
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v7 2/7] dt-bindings: usb: renesas_usb3: Document usb role switch support
2019-05-31 9:59 ` [PATCH v7 2/7] dt-bindings: usb: renesas_usb3: Document usb role switch support Biju Das
2019-06-03 9:56 ` Yoshihiro Shimoda
@ 2019-06-11 22:57 ` Rob Herring
1 sibling, 0 replies; 16+ messages in thread
From: Rob Herring @ 2019-06-11 22:57 UTC (permalink / raw)
To: Biju Das
Cc: Mark Rutland, Yoshihiro Shimoda, Greg Kroah-Hartman, Biju Das,
Heikki Krogerus, Felipe Balbi, linux-usb, devicetree,
Simon Horman, Geert Uytterhoeven, Chris Paterson,
Fabrizio Castro, linux-renesas-soc
On Fri, 31 May 2019 10:59:55 +0100, Biju Das wrote:
> Update the DT bindings documentation to support usb role switch
> for USB Type-C connector using USB role switch class framework.
>
> Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> ---
> V6-->V7
> * Incorporated shimoda-san's review comments.
> (https://patchwork.kernel.org/patch/10944631/)
> V5-->V6
> * Updated description
> * Added usb-role-switch-property
> V4-->V5
> * No Change
> V3-->V4
> * No Change
> V2-->V3
> * Added optional renesas,usb-role-switch property.
> V1-->V2
> * Added usb-role-switch-property
> * Updated the example with usb-role-switch property.
> ---
> .../devicetree/bindings/usb/renesas_usb3.txt | 23 ++++++++++++++++++++++
> 1 file changed, 23 insertions(+)
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller
2019-05-31 9:59 [PATCH v7 0/7] Add USB3.0 and TI HD3SS3220 driver support Biju Das
2019-05-31 9:59 ` [PATCH v7 1/7] dt-bindings: usb: hd3ss3220 device tree binding document Biju Das
2019-05-31 9:59 ` [PATCH v7 2/7] dt-bindings: usb: renesas_usb3: Document usb role switch support Biju Das
@ 2019-05-31 9:59 ` Biju Das
2019-06-12 8:25 ` Heikki Krogerus
2019-06-18 6:47 ` Greg Kroah-Hartman
2019-05-31 9:59 ` [PATCH v7 4/7] usb: gadget: udc: renesas_usb3: Enhance role switch support Biju Das
3 siblings, 2 replies; 16+ messages in thread
From: Biju Das @ 2019-05-31 9:59 UTC (permalink / raw)
To: Heikki Krogerus, Matthias Brugger, Greg Kroah-Hartman, Rob Herring
Cc: Biju Das, Felipe Balbi, Chunfeng Yun, linux-usb, Simon Horman,
Yoshihiro Shimoda, Geert Uytterhoeven, Chris Paterson,
Fabrizio Castro, linux-renesas-soc
Driver for TI HD3SS3220 USB Type-C DRP port controller.
The driver currently registers the port and supports data role swapping.
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
V6-->V7
* Rebased on below patch
(https://patchwork.kernel.org/patch/10966313/)
* Removed Heikki's reviewed by tag,since there is a rework.
V5-->V6
* No change
V4-->V5
* Incorporated Heikki's review comment
(https://patchwork.kernel.org/patch/10902531/)
* Added Heikki's Reviewed-by tag
V3-->V4
* Incorporated Chunfeng Yun's review comment
* Used fwnode API's to get usb role switch handle.
V2-->V3
* Used the new api "usb_role_switch by node" for getting
remote endpoint associated with Type-C USB DRP port
controller devices.
V1-->V2
* Driver uses usb role class instead of extcon for dual role switch
and also handles connect/disconnect events.
---
drivers/usb/typec/Kconfig | 10 ++
drivers/usb/typec/Makefile | 1 +
drivers/usb/typec/hd3ss3220.c | 259 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 270 insertions(+)
create mode 100644 drivers/usb/typec/hd3ss3220.c
diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
index 89d9193..92a3717 100644
--- a/drivers/usb/typec/Kconfig
+++ b/drivers/usb/typec/Kconfig
@@ -50,6 +50,16 @@ source "drivers/usb/typec/tcpm/Kconfig"
source "drivers/usb/typec/ucsi/Kconfig"
+config TYPEC_HD3SS3220
+ tristate "TI HD3SS3220 Type-C DRP Port controller driver"
+ depends on I2C
+ help
+ Say Y or M here if your system has TI HD3SS3220 Type-C DRP Port
+ controller driver.
+
+ If you choose to build this driver as a dynamically linked module, the
+ module will be called hd3ss3220.ko.
+
config TYPEC_TPS6598X
tristate "TI TPS6598x USB Power Delivery controller driver"
depends on I2C
diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
index 6696b72..7753a5c3 100644
--- a/drivers/usb/typec/Makefile
+++ b/drivers/usb/typec/Makefile
@@ -4,5 +4,6 @@ typec-y := class.o mux.o bus.o
obj-$(CONFIG_TYPEC) += altmodes/
obj-$(CONFIG_TYPEC_TCPM) += tcpm/
obj-$(CONFIG_TYPEC_UCSI) += ucsi/
+obj-$(CONFIG_TYPEC_HD3SS3220) += hd3ss3220.o
obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o
obj-$(CONFIG_TYPEC) += mux/
diff --git a/drivers/usb/typec/hd3ss3220.c b/drivers/usb/typec/hd3ss3220.c
new file mode 100644
index 0000000..b8f247e
--- /dev/null
+++ b/drivers/usb/typec/hd3ss3220.c
@@ -0,0 +1,259 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * TI HD3SS3220 Type-C DRP Port Controller Driver
+ *
+ * Copyright (C) 2019 Renesas Electronics Corp.
+ */
+
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/usb/role.h>
+#include <linux/irqreturn.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/usb/typec.h>
+#include <linux/delay.h>
+
+#define HD3SS3220_REG_CN_STAT_CTRL 0x09
+#define HD3SS3220_REG_GEN_CTRL 0x0A
+#define HD3SS3220_REG_DEV_REV 0xA0
+
+/* Register HD3SS3220_REG_CN_STAT_CTRL*/
+#define HD3SS3220_REG_CN_STAT_CTRL_ATTACHED_STATE_MASK (BIT(7) | BIT(6))
+#define HD3SS3220_REG_CN_STAT_CTRL_AS_DFP BIT(6)
+#define HD3SS3220_REG_CN_STAT_CTRL_AS_UFP BIT(7)
+#define HD3SS3220_REG_CN_STAT_CTRL_TO_ACCESSORY (BIT(7) | BIT(6))
+#define HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS BIT(4)
+
+/* Register HD3SS3220_REG_GEN_CTRL*/
+#define HD3SS3220_REG_GEN_CTRL_SRC_PREF_MASK (BIT(2) | BIT(1))
+#define HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_DEFAULT 0x00
+#define HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_TRY_SNK BIT(1)
+#define HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_TRY_SRC (BIT(2) | BIT(1))
+
+struct hd3ss3220 {
+ struct device *dev;
+ struct regmap *regmap;
+ struct usb_role_switch *role_sw;
+ struct typec_port *port;
+ struct typec_capability typec_cap;
+};
+
+static int hd3ss3220_set_source_pref(struct hd3ss3220 *hd3ss3220, int src_pref)
+{
+ return regmap_update_bits(hd3ss3220->regmap, HD3SS3220_REG_GEN_CTRL,
+ HD3SS3220_REG_GEN_CTRL_SRC_PREF_MASK,
+ src_pref);
+}
+
+static enum usb_role hd3ss3220_get_attached_state(struct hd3ss3220 *hd3ss3220)
+{
+ unsigned int reg_val;
+ enum usb_role attached_state;
+ int ret;
+
+ ret = regmap_read(hd3ss3220->regmap, HD3SS3220_REG_CN_STAT_CTRL,
+ ®_val);
+ if (ret < 0)
+ return ret;
+
+ switch (reg_val & HD3SS3220_REG_CN_STAT_CTRL_ATTACHED_STATE_MASK) {
+ case HD3SS3220_REG_CN_STAT_CTRL_AS_DFP:
+ attached_state = USB_ROLE_HOST;
+ break;
+ case HD3SS3220_REG_CN_STAT_CTRL_AS_UFP:
+ attached_state = USB_ROLE_DEVICE;
+ break;
+ default:
+ attached_state = USB_ROLE_NONE;
+ break;
+ }
+
+ return attached_state;
+}
+
+static int hd3ss3220_dr_set(const struct typec_capability *cap,
+ enum typec_data_role role)
+{
+ struct hd3ss3220 *hd3ss3220 = container_of(cap, struct hd3ss3220,
+ typec_cap);
+ enum usb_role role_val;
+ int pref, ret = 0;
+
+ if (role == TYPEC_HOST) {
+ role_val = USB_ROLE_HOST;
+ pref = HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_TRY_SRC;
+ } else {
+ role_val = USB_ROLE_DEVICE;
+ pref = HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_TRY_SNK;
+ }
+
+ ret = hd3ss3220_set_source_pref(hd3ss3220, pref);
+ usleep_range(10, 100);
+
+ usb_role_switch_set_role(hd3ss3220->role_sw, role_val);
+ typec_set_data_role(hd3ss3220->port, role);
+
+ return ret;
+}
+
+static void hd3ss3220_set_role(struct hd3ss3220 *hd3ss3220)
+{
+ enum usb_role role_state = hd3ss3220_get_attached_state(hd3ss3220);
+
+ usb_role_switch_set_role(hd3ss3220->role_sw, role_state);
+ if (role_state == USB_ROLE_NONE)
+ hd3ss3220_set_source_pref(hd3ss3220,
+ HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_DEFAULT);
+
+ switch (role_state) {
+ case USB_ROLE_HOST:
+ typec_set_data_role(hd3ss3220->port, TYPEC_HOST);
+ break;
+ case USB_ROLE_DEVICE:
+ typec_set_data_role(hd3ss3220->port, TYPEC_DEVICE);
+ break;
+ default:
+ break;
+ }
+}
+
+irqreturn_t hd3ss3220_irq(struct hd3ss3220 *hd3ss3220)
+{
+ int err;
+
+ hd3ss3220_set_role(hd3ss3220);
+ err = regmap_update_bits_base(hd3ss3220->regmap,
+ HD3SS3220_REG_CN_STAT_CTRL,
+ HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS,
+ HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS,
+ NULL, false, true);
+ if (err < 0)
+ return IRQ_NONE;
+
+ return IRQ_HANDLED;
+}
+
+static irqreturn_t hd3ss3220_irq_handler(int irq, void *data)
+{
+ struct i2c_client *client = to_i2c_client(data);
+ struct hd3ss3220 *hd3ss3220 = i2c_get_clientdata(client);
+
+ return hd3ss3220_irq(hd3ss3220);
+}
+
+static const struct regmap_config config = {
+ .reg_bits = 8,
+ .val_bits = 8,
+ .max_register = 0x0A,
+};
+
+static int hd3ss3220_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+{
+ struct hd3ss3220 *hd3ss3220;
+ struct fwnode_handle *connector;
+ int ret;
+ unsigned int data;
+
+ hd3ss3220 = devm_kzalloc(&client->dev, sizeof(struct hd3ss3220),
+ GFP_KERNEL);
+ if (!hd3ss3220)
+ return -ENOMEM;
+
+ i2c_set_clientdata(client, hd3ss3220);
+
+ hd3ss3220->dev = &client->dev;
+ hd3ss3220->regmap = devm_regmap_init_i2c(client, &config);
+ if (IS_ERR(hd3ss3220->regmap))
+ return PTR_ERR(hd3ss3220->regmap);
+
+ hd3ss3220_set_source_pref(hd3ss3220,
+ HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_DEFAULT);
+ connector = device_get_named_child_node(hd3ss3220->dev, "connector");
+ if (IS_ERR(connector))
+ return PTR_ERR(connector);
+
+ hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector);
+ fwnode_handle_put(connector);
+ if (IS_ERR_OR_NULL(hd3ss3220->role_sw))
+ return PTR_ERR(hd3ss3220->role_sw);
+
+ hd3ss3220->typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
+ hd3ss3220->typec_cap.dr_set = hd3ss3220_dr_set;
+ hd3ss3220->typec_cap.type = TYPEC_PORT_DRP;
+ hd3ss3220->typec_cap.data = TYPEC_PORT_DRD;
+
+ hd3ss3220->port = typec_register_port(&client->dev,
+ &hd3ss3220->typec_cap);
+ if (IS_ERR(hd3ss3220->port))
+ return PTR_ERR(hd3ss3220->port);
+
+ hd3ss3220_set_role(hd3ss3220);
+ ret = regmap_read(hd3ss3220->regmap, HD3SS3220_REG_CN_STAT_CTRL, &data);
+ if (ret < 0)
+ goto error;
+
+ if (data & HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS) {
+ ret = regmap_write(hd3ss3220->regmap,
+ HD3SS3220_REG_CN_STAT_CTRL,
+ data | HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS);
+ if (ret < 0)
+ goto error;
+ }
+
+ if (client->irq > 0) {
+ ret = devm_request_threaded_irq(&client->dev, client->irq, NULL,
+ hd3ss3220_irq_handler,
+ IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+ "hd3ss3220", &client->dev);
+ if (ret)
+ goto error;
+ }
+
+ ret = i2c_smbus_read_byte_data(client, HD3SS3220_REG_DEV_REV);
+ if (ret < 0)
+ goto error;
+
+ dev_info(&client->dev, "probed revision=0x%x\n", ret);
+
+ return 0;
+error:
+ typec_unregister_port(hd3ss3220->port);
+ usb_role_switch_put(hd3ss3220->role_sw);
+
+ return ret;
+}
+
+static int hd3ss3220_remove(struct i2c_client *client)
+{
+ struct hd3ss3220 *hd3ss3220 = i2c_get_clientdata(client);
+
+ typec_unregister_port(hd3ss3220->port);
+ usb_role_switch_put(hd3ss3220->role_sw);
+
+ return 0;
+}
+
+static const struct of_device_id dev_ids[] = {
+ { .compatible = "ti,hd3ss3220"},
+ {}
+};
+MODULE_DEVICE_TABLE(of, dev_ids);
+
+static struct i2c_driver hd3ss3220_driver = {
+ .driver = {
+ .name = "hd3ss3220",
+ .of_match_table = of_match_ptr(dev_ids),
+ },
+ .probe = hd3ss3220_probe,
+ .remove = hd3ss3220_remove,
+};
+
+module_i2c_driver(hd3ss3220_driver);
+
+MODULE_AUTHOR("Biju Das <biju.das@bp.renesas.com>");
+MODULE_DESCRIPTION("TI HD3SS3220 DRP Port Controller Driver");
+MODULE_LICENSE("GPL");
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller
2019-05-31 9:59 ` [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller Biju Das
@ 2019-06-12 8:25 ` Heikki Krogerus
2019-06-12 8:42 ` Biju Das
2019-06-18 6:47 ` Greg Kroah-Hartman
1 sibling, 1 reply; 16+ messages in thread
From: Heikki Krogerus @ 2019-06-12 8:25 UTC (permalink / raw)
To: Biju Das
Cc: Matthias Brugger, Greg Kroah-Hartman, Rob Herring, Felipe Balbi,
Chunfeng Yun, linux-usb, Simon Horman, Yoshihiro Shimoda,
Geert Uytterhoeven, Chris Paterson, Fabrizio Castro,
linux-renesas-soc
On Fri, May 31, 2019 at 10:59:56AM +0100, Biju Das wrote:
> Driver for TI HD3SS3220 USB Type-C DRP port controller.
>
> The driver currently registers the port and supports data role swapping.
>
> Signed-off-by: Biju Das <biju.das@bp.renesas.com>
Acked-by; Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> V6-->V7
> * Rebased on below patch
> (https://patchwork.kernel.org/patch/10966313/)
> * Removed Heikki's reviewed by tag,since there is a rework.
> V5-->V6
> * No change
> V4-->V5
> * Incorporated Heikki's review comment
> (https://patchwork.kernel.org/patch/10902531/)
> * Added Heikki's Reviewed-by tag
> V3-->V4
> * Incorporated Chunfeng Yun's review comment
> * Used fwnode API's to get usb role switch handle.
>
> V2-->V3
> * Used the new api "usb_role_switch by node" for getting
> remote endpoint associated with Type-C USB DRP port
> controller devices.
> V1-->V2
> * Driver uses usb role class instead of extcon for dual role switch
> and also handles connect/disconnect events.
> ---
> drivers/usb/typec/Kconfig | 10 ++
> drivers/usb/typec/Makefile | 1 +
> drivers/usb/typec/hd3ss3220.c | 259 ++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 270 insertions(+)
> create mode 100644 drivers/usb/typec/hd3ss3220.c
>
> diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
> index 89d9193..92a3717 100644
> --- a/drivers/usb/typec/Kconfig
> +++ b/drivers/usb/typec/Kconfig
> @@ -50,6 +50,16 @@ source "drivers/usb/typec/tcpm/Kconfig"
>
> source "drivers/usb/typec/ucsi/Kconfig"
>
> +config TYPEC_HD3SS3220
> + tristate "TI HD3SS3220 Type-C DRP Port controller driver"
> + depends on I2C
> + help
> + Say Y or M here if your system has TI HD3SS3220 Type-C DRP Port
> + controller driver.
> +
> + If you choose to build this driver as a dynamically linked module, the
> + module will be called hd3ss3220.ko.
> +
> config TYPEC_TPS6598X
> tristate "TI TPS6598x USB Power Delivery controller driver"
> depends on I2C
> diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
> index 6696b72..7753a5c3 100644
> --- a/drivers/usb/typec/Makefile
> +++ b/drivers/usb/typec/Makefile
> @@ -4,5 +4,6 @@ typec-y := class.o mux.o bus.o
> obj-$(CONFIG_TYPEC) += altmodes/
> obj-$(CONFIG_TYPEC_TCPM) += tcpm/
> obj-$(CONFIG_TYPEC_UCSI) += ucsi/
> +obj-$(CONFIG_TYPEC_HD3SS3220) += hd3ss3220.o
> obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o
> obj-$(CONFIG_TYPEC) += mux/
> diff --git a/drivers/usb/typec/hd3ss3220.c b/drivers/usb/typec/hd3ss3220.c
> new file mode 100644
> index 0000000..b8f247e
> --- /dev/null
> +++ b/drivers/usb/typec/hd3ss3220.c
> @@ -0,0 +1,259 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * TI HD3SS3220 Type-C DRP Port Controller Driver
> + *
> + * Copyright (C) 2019 Renesas Electronics Corp.
> + */
> +
> +#include <linux/module.h>
> +#include <linux/i2c.h>
> +#include <linux/usb/role.h>
> +#include <linux/irqreturn.h>
> +#include <linux/interrupt.h>
> +#include <linux/module.h>
> +#include <linux/regmap.h>
> +#include <linux/slab.h>
> +#include <linux/usb/typec.h>
> +#include <linux/delay.h>
> +
> +#define HD3SS3220_REG_CN_STAT_CTRL 0x09
> +#define HD3SS3220_REG_GEN_CTRL 0x0A
> +#define HD3SS3220_REG_DEV_REV 0xA0
> +
> +/* Register HD3SS3220_REG_CN_STAT_CTRL*/
> +#define HD3SS3220_REG_CN_STAT_CTRL_ATTACHED_STATE_MASK (BIT(7) | BIT(6))
> +#define HD3SS3220_REG_CN_STAT_CTRL_AS_DFP BIT(6)
> +#define HD3SS3220_REG_CN_STAT_CTRL_AS_UFP BIT(7)
> +#define HD3SS3220_REG_CN_STAT_CTRL_TO_ACCESSORY (BIT(7) | BIT(6))
> +#define HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS BIT(4)
> +
> +/* Register HD3SS3220_REG_GEN_CTRL*/
> +#define HD3SS3220_REG_GEN_CTRL_SRC_PREF_MASK (BIT(2) | BIT(1))
> +#define HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_DEFAULT 0x00
> +#define HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_TRY_SNK BIT(1)
> +#define HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_TRY_SRC (BIT(2) | BIT(1))
> +
> +struct hd3ss3220 {
> + struct device *dev;
> + struct regmap *regmap;
> + struct usb_role_switch *role_sw;
> + struct typec_port *port;
> + struct typec_capability typec_cap;
> +};
> +
> +static int hd3ss3220_set_source_pref(struct hd3ss3220 *hd3ss3220, int src_pref)
> +{
> + return regmap_update_bits(hd3ss3220->regmap, HD3SS3220_REG_GEN_CTRL,
> + HD3SS3220_REG_GEN_CTRL_SRC_PREF_MASK,
> + src_pref);
> +}
> +
> +static enum usb_role hd3ss3220_get_attached_state(struct hd3ss3220 *hd3ss3220)
> +{
> + unsigned int reg_val;
> + enum usb_role attached_state;
> + int ret;
> +
> + ret = regmap_read(hd3ss3220->regmap, HD3SS3220_REG_CN_STAT_CTRL,
> + ®_val);
> + if (ret < 0)
> + return ret;
> +
> + switch (reg_val & HD3SS3220_REG_CN_STAT_CTRL_ATTACHED_STATE_MASK) {
> + case HD3SS3220_REG_CN_STAT_CTRL_AS_DFP:
> + attached_state = USB_ROLE_HOST;
> + break;
> + case HD3SS3220_REG_CN_STAT_CTRL_AS_UFP:
> + attached_state = USB_ROLE_DEVICE;
> + break;
> + default:
> + attached_state = USB_ROLE_NONE;
> + break;
> + }
> +
> + return attached_state;
> +}
> +
> +static int hd3ss3220_dr_set(const struct typec_capability *cap,
> + enum typec_data_role role)
> +{
> + struct hd3ss3220 *hd3ss3220 = container_of(cap, struct hd3ss3220,
> + typec_cap);
> + enum usb_role role_val;
> + int pref, ret = 0;
> +
> + if (role == TYPEC_HOST) {
> + role_val = USB_ROLE_HOST;
> + pref = HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_TRY_SRC;
> + } else {
> + role_val = USB_ROLE_DEVICE;
> + pref = HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_TRY_SNK;
> + }
> +
> + ret = hd3ss3220_set_source_pref(hd3ss3220, pref);
> + usleep_range(10, 100);
> +
> + usb_role_switch_set_role(hd3ss3220->role_sw, role_val);
> + typec_set_data_role(hd3ss3220->port, role);
> +
> + return ret;
> +}
> +
> +static void hd3ss3220_set_role(struct hd3ss3220 *hd3ss3220)
> +{
> + enum usb_role role_state = hd3ss3220_get_attached_state(hd3ss3220);
> +
> + usb_role_switch_set_role(hd3ss3220->role_sw, role_state);
> + if (role_state == USB_ROLE_NONE)
> + hd3ss3220_set_source_pref(hd3ss3220,
> + HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_DEFAULT);
> +
> + switch (role_state) {
> + case USB_ROLE_HOST:
> + typec_set_data_role(hd3ss3220->port, TYPEC_HOST);
> + break;
> + case USB_ROLE_DEVICE:
> + typec_set_data_role(hd3ss3220->port, TYPEC_DEVICE);
> + break;
> + default:
> + break;
> + }
> +}
> +
> +irqreturn_t hd3ss3220_irq(struct hd3ss3220 *hd3ss3220)
> +{
> + int err;
> +
> + hd3ss3220_set_role(hd3ss3220);
> + err = regmap_update_bits_base(hd3ss3220->regmap,
> + HD3SS3220_REG_CN_STAT_CTRL,
> + HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS,
> + HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS,
> + NULL, false, true);
> + if (err < 0)
> + return IRQ_NONE;
> +
> + return IRQ_HANDLED;
> +}
> +
> +static irqreturn_t hd3ss3220_irq_handler(int irq, void *data)
> +{
> + struct i2c_client *client = to_i2c_client(data);
> + struct hd3ss3220 *hd3ss3220 = i2c_get_clientdata(client);
> +
> + return hd3ss3220_irq(hd3ss3220);
> +}
> +
> +static const struct regmap_config config = {
> + .reg_bits = 8,
> + .val_bits = 8,
> + .max_register = 0x0A,
> +};
> +
> +static int hd3ss3220_probe(struct i2c_client *client,
> + const struct i2c_device_id *id)
> +{
> + struct hd3ss3220 *hd3ss3220;
> + struct fwnode_handle *connector;
> + int ret;
> + unsigned int data;
> +
> + hd3ss3220 = devm_kzalloc(&client->dev, sizeof(struct hd3ss3220),
> + GFP_KERNEL);
> + if (!hd3ss3220)
> + return -ENOMEM;
> +
> + i2c_set_clientdata(client, hd3ss3220);
> +
> + hd3ss3220->dev = &client->dev;
> + hd3ss3220->regmap = devm_regmap_init_i2c(client, &config);
> + if (IS_ERR(hd3ss3220->regmap))
> + return PTR_ERR(hd3ss3220->regmap);
> +
> + hd3ss3220_set_source_pref(hd3ss3220,
> + HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_DEFAULT);
> + connector = device_get_named_child_node(hd3ss3220->dev, "connector");
> + if (IS_ERR(connector))
> + return PTR_ERR(connector);
> +
> + hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector);
> + fwnode_handle_put(connector);
> + if (IS_ERR_OR_NULL(hd3ss3220->role_sw))
> + return PTR_ERR(hd3ss3220->role_sw);
> +
> + hd3ss3220->typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
> + hd3ss3220->typec_cap.dr_set = hd3ss3220_dr_set;
> + hd3ss3220->typec_cap.type = TYPEC_PORT_DRP;
> + hd3ss3220->typec_cap.data = TYPEC_PORT_DRD;
> +
> + hd3ss3220->port = typec_register_port(&client->dev,
> + &hd3ss3220->typec_cap);
> + if (IS_ERR(hd3ss3220->port))
> + return PTR_ERR(hd3ss3220->port);
> +
> + hd3ss3220_set_role(hd3ss3220);
> + ret = regmap_read(hd3ss3220->regmap, HD3SS3220_REG_CN_STAT_CTRL, &data);
> + if (ret < 0)
> + goto error;
> +
> + if (data & HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS) {
> + ret = regmap_write(hd3ss3220->regmap,
> + HD3SS3220_REG_CN_STAT_CTRL,
> + data | HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS);
> + if (ret < 0)
> + goto error;
> + }
> +
> + if (client->irq > 0) {
> + ret = devm_request_threaded_irq(&client->dev, client->irq, NULL,
> + hd3ss3220_irq_handler,
> + IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
> + "hd3ss3220", &client->dev);
> + if (ret)
> + goto error;
> + }
> +
> + ret = i2c_smbus_read_byte_data(client, HD3SS3220_REG_DEV_REV);
> + if (ret < 0)
> + goto error;
> +
> + dev_info(&client->dev, "probed revision=0x%x\n", ret);
> +
> + return 0;
> +error:
> + typec_unregister_port(hd3ss3220->port);
> + usb_role_switch_put(hd3ss3220->role_sw);
> +
> + return ret;
> +}
> +
> +static int hd3ss3220_remove(struct i2c_client *client)
> +{
> + struct hd3ss3220 *hd3ss3220 = i2c_get_clientdata(client);
> +
> + typec_unregister_port(hd3ss3220->port);
> + usb_role_switch_put(hd3ss3220->role_sw);
> +
> + return 0;
> +}
> +
> +static const struct of_device_id dev_ids[] = {
> + { .compatible = "ti,hd3ss3220"},
> + {}
> +};
> +MODULE_DEVICE_TABLE(of, dev_ids);
> +
> +static struct i2c_driver hd3ss3220_driver = {
> + .driver = {
> + .name = "hd3ss3220",
> + .of_match_table = of_match_ptr(dev_ids),
> + },
> + .probe = hd3ss3220_probe,
> + .remove = hd3ss3220_remove,
> +};
> +
> +module_i2c_driver(hd3ss3220_driver);
> +
> +MODULE_AUTHOR("Biju Das <biju.das@bp.renesas.com>");
> +MODULE_DESCRIPTION("TI HD3SS3220 DRP Port Controller Driver");
> +MODULE_LICENSE("GPL");
> --
> 2.7.4
thanks,
--
heikki
^ permalink raw reply [flat|nested] 16+ messages in thread* RE: [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller
2019-06-12 8:25 ` Heikki Krogerus
@ 2019-06-12 8:42 ` Biju Das
2019-06-12 9:42 ` Heikki Krogerus
0 siblings, 1 reply; 16+ messages in thread
From: Biju Das @ 2019-06-12 8:42 UTC (permalink / raw)
To: Heikki Krogerus
Cc: Matthias Brugger, Greg Kroah-Hartman, Rob Herring, Felipe Balbi,
Chunfeng Yun, linux-usb, Simon Horman, Yoshihiro Shimoda,
Geert Uytterhoeven, Chris Paterson, Fabrizio Castro,
linux-renesas-soc
Hi Heikki,
> Subject: Re: [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C
> DRP port controller
>
> On Fri, May 31, 2019 at 10:59:56AM +0100, Biju Das wrote:
> > Driver for TI HD3SS3220 USB Type-C DRP port controller.
> >
> > The driver currently registers the port and supports data role swapping.
> >
> > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
>
> Acked-by; Heikki Krogerus <heikki.krogerus@linux.intel.com>
Thanks. I believe there is a typo it should be ":" instead of ";" .
Regards,
Biju
> > ---
> > V6-->V7
> > * Rebased on below patch
> > (https://patchwork.kernel.org/patch/10966313/)
> > * Removed Heikki's reviewed by tag,since there is a rework.
> > V5-->V6
> > * No change
> > V4-->V5
> > * Incorporated Heikki's review comment
> > (https://patchwork.kernel.org/patch/10902531/)
> > * Added Heikki's Reviewed-by tag
> > V3-->V4
> > * Incorporated Chunfeng Yun's review comment
> > * Used fwnode API's to get usb role switch handle.
> >
> > V2-->V3
> > * Used the new api "usb_role_switch by node" for getting
> > remote endpoint associated with Type-C USB DRP port
> > controller devices.
> > V1-->V2
> > * Driver uses usb role class instead of extcon for dual role switch
> > and also handles connect/disconnect events.
> > ---
> > drivers/usb/typec/Kconfig | 10 ++
> > drivers/usb/typec/Makefile | 1 +
> > drivers/usb/typec/hd3ss3220.c | 259
> > ++++++++++++++++++++++++++++++++++++++++++
> > 3 files changed, 270 insertions(+)
> > create mode 100644 drivers/usb/typec/hd3ss3220.c
> >
> > diff --git a/drivers/usb/typec/Kconfig b/drivers/usb/typec/Kconfig
> > index 89d9193..92a3717 100644
> > --- a/drivers/usb/typec/Kconfig
> > +++ b/drivers/usb/typec/Kconfig
> > @@ -50,6 +50,16 @@ source "drivers/usb/typec/tcpm/Kconfig"
> >
> > source "drivers/usb/typec/ucsi/Kconfig"
> >
> > +config TYPEC_HD3SS3220
> > + tristate "TI HD3SS3220 Type-C DRP Port controller driver"
> > + depends on I2C
> > + help
> > + Say Y or M here if your system has TI HD3SS3220 Type-C DRP Port
> > + controller driver.
> > +
> > + If you choose to build this driver as a dynamically linked module, the
> > + module will be called hd3ss3220.ko.
> > +
> > config TYPEC_TPS6598X
> > tristate "TI TPS6598x USB Power Delivery controller driver"
> > depends on I2C
> > diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile
> > index 6696b72..7753a5c3 100644
> > --- a/drivers/usb/typec/Makefile
> > +++ b/drivers/usb/typec/Makefile
> > @@ -4,5 +4,6 @@ typec-y := class.o mux.o bus.o
> > obj-$(CONFIG_TYPEC) += altmodes/
> > obj-$(CONFIG_TYPEC_TCPM) += tcpm/
> > obj-$(CONFIG_TYPEC_UCSI) += ucsi/
> > +obj-$(CONFIG_TYPEC_HD3SS3220) += hd3ss3220.o
> > obj-$(CONFIG_TYPEC_TPS6598X) += tps6598x.o
> > obj-$(CONFIG_TYPEC) += mux/
> > diff --git a/drivers/usb/typec/hd3ss3220.c
> > b/drivers/usb/typec/hd3ss3220.c new file mode 100644 index
> > 0000000..b8f247e
> > --- /dev/null
> > +++ b/drivers/usb/typec/hd3ss3220.c
> > @@ -0,0 +1,259 @@
> > +// SPDX-License-Identifier: GPL-2.0+
> > +/*
> > + * TI HD3SS3220 Type-C DRP Port Controller Driver
> > + *
> > + * Copyright (C) 2019 Renesas Electronics Corp.
> > + */
> > +
> > +#include <linux/module.h>
> > +#include <linux/i2c.h>
> > +#include <linux/usb/role.h>
> > +#include <linux/irqreturn.h>
> > +#include <linux/interrupt.h>
> > +#include <linux/module.h>
> > +#include <linux/regmap.h>
> > +#include <linux/slab.h>
> > +#include <linux/usb/typec.h>
> > +#include <linux/delay.h>
> > +
> > +#define HD3SS3220_REG_CN_STAT_CTRL 0x09
> > +#define HD3SS3220_REG_GEN_CTRL 0x0A
> > +#define HD3SS3220_REG_DEV_REV 0xA0
> > +
> > +/* Register HD3SS3220_REG_CN_STAT_CTRL*/
> > +#define HD3SS3220_REG_CN_STAT_CTRL_ATTACHED_STATE_MASK
> (BIT(7) | BIT(6))
> > +#define HD3SS3220_REG_CN_STAT_CTRL_AS_DFP BIT(6)
> > +#define HD3SS3220_REG_CN_STAT_CTRL_AS_UFP BIT(7)
> > +#define HD3SS3220_REG_CN_STAT_CTRL_TO_ACCESSORY
> (BIT(7) | BIT(6))
> > +#define HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS BIT(4)
> > +
> > +/* Register HD3SS3220_REG_GEN_CTRL*/
> > +#define HD3SS3220_REG_GEN_CTRL_SRC_PREF_MASK
> (BIT(2) | BIT(1))
> > +#define HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_DEFAULT 0x00
> > +#define HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_TRY_SNK BIT(1)
> > +#define HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_TRY_SRC
> (BIT(2) | BIT(1))
> > +
> > +struct hd3ss3220 {
> > + struct device *dev;
> > + struct regmap *regmap;
> > + struct usb_role_switch *role_sw;
> > + struct typec_port *port;
> > + struct typec_capability typec_cap;
> > +};
> > +
> > +static int hd3ss3220_set_source_pref(struct hd3ss3220 *hd3ss3220, int
> > +src_pref) {
> > + return regmap_update_bits(hd3ss3220->regmap,
> HD3SS3220_REG_GEN_CTRL,
> > +
> HD3SS3220_REG_GEN_CTRL_SRC_PREF_MASK,
> > + src_pref);
> > +}
> > +
> > +static enum usb_role hd3ss3220_get_attached_state(struct hd3ss3220
> > +*hd3ss3220) {
> > + unsigned int reg_val;
> > + enum usb_role attached_state;
> > + int ret;
> > +
> > + ret = regmap_read(hd3ss3220->regmap,
> HD3SS3220_REG_CN_STAT_CTRL,
> > + ®_val);
> > + if (ret < 0)
> > + return ret;
> > +
> > + switch (reg_val &
> HD3SS3220_REG_CN_STAT_CTRL_ATTACHED_STATE_MASK) {
> > + case HD3SS3220_REG_CN_STAT_CTRL_AS_DFP:
> > + attached_state = USB_ROLE_HOST;
> > + break;
> > + case HD3SS3220_REG_CN_STAT_CTRL_AS_UFP:
> > + attached_state = USB_ROLE_DEVICE;
> > + break;
> > + default:
> > + attached_state = USB_ROLE_NONE;
> > + break;
> > + }
> > +
> > + return attached_state;
> > +}
> > +
> > +static int hd3ss3220_dr_set(const struct typec_capability *cap,
> > + enum typec_data_role role)
> > +{
> > + struct hd3ss3220 *hd3ss3220 = container_of(cap, struct hd3ss3220,
> > + typec_cap);
> > + enum usb_role role_val;
> > + int pref, ret = 0;
> > +
> > + if (role == TYPEC_HOST) {
> > + role_val = USB_ROLE_HOST;
> > + pref =
> HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_TRY_SRC;
> > + } else {
> > + role_val = USB_ROLE_DEVICE;
> > + pref =
> HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_TRY_SNK;
> > + }
> > +
> > + ret = hd3ss3220_set_source_pref(hd3ss3220, pref);
> > + usleep_range(10, 100);
> > +
> > + usb_role_switch_set_role(hd3ss3220->role_sw, role_val);
> > + typec_set_data_role(hd3ss3220->port, role);
> > +
> > + return ret;
> > +}
> > +
> > +static void hd3ss3220_set_role(struct hd3ss3220 *hd3ss3220) {
> > + enum usb_role role_state =
> hd3ss3220_get_attached_state(hd3ss3220);
> > +
> > + usb_role_switch_set_role(hd3ss3220->role_sw, role_state);
> > + if (role_state == USB_ROLE_NONE)
> > + hd3ss3220_set_source_pref(hd3ss3220,
> > +
> HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_DEFAULT);
> > +
> > + switch (role_state) {
> > + case USB_ROLE_HOST:
> > + typec_set_data_role(hd3ss3220->port, TYPEC_HOST);
> > + break;
> > + case USB_ROLE_DEVICE:
> > + typec_set_data_role(hd3ss3220->port, TYPEC_DEVICE);
> > + break;
> > + default:
> > + break;
> > + }
> > +}
> > +
> > +irqreturn_t hd3ss3220_irq(struct hd3ss3220 *hd3ss3220) {
> > + int err;
> > +
> > + hd3ss3220_set_role(hd3ss3220);
> > + err = regmap_update_bits_base(hd3ss3220->regmap,
> > + HD3SS3220_REG_CN_STAT_CTRL,
> > +
> HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS,
> > +
> HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS,
> > + NULL, false, true);
> > + if (err < 0)
> > + return IRQ_NONE;
> > +
> > + return IRQ_HANDLED;
> > +}
> > +
> > +static irqreturn_t hd3ss3220_irq_handler(int irq, void *data) {
> > + struct i2c_client *client = to_i2c_client(data);
> > + struct hd3ss3220 *hd3ss3220 = i2c_get_clientdata(client);
> > +
> > + return hd3ss3220_irq(hd3ss3220);
> > +}
> > +
> > +static const struct regmap_config config = {
> > + .reg_bits = 8,
> > + .val_bits = 8,
> > + .max_register = 0x0A,
> > +};
> > +
> > +static int hd3ss3220_probe(struct i2c_client *client,
> > + const struct i2c_device_id *id)
> > +{
> > + struct hd3ss3220 *hd3ss3220;
> > + struct fwnode_handle *connector;
> > + int ret;
> > + unsigned int data;
> > +
> > + hd3ss3220 = devm_kzalloc(&client->dev, sizeof(struct hd3ss3220),
> > + GFP_KERNEL);
> > + if (!hd3ss3220)
> > + return -ENOMEM;
> > +
> > + i2c_set_clientdata(client, hd3ss3220);
> > +
> > + hd3ss3220->dev = &client->dev;
> > + hd3ss3220->regmap = devm_regmap_init_i2c(client, &config);
> > + if (IS_ERR(hd3ss3220->regmap))
> > + return PTR_ERR(hd3ss3220->regmap);
> > +
> > + hd3ss3220_set_source_pref(hd3ss3220,
> > +
> HD3SS3220_REG_GEN_CTRL_SRC_PREF_DRP_DEFAULT);
> > + connector = device_get_named_child_node(hd3ss3220->dev,
> "connector");
> > + if (IS_ERR(connector))
> > + return PTR_ERR(connector);
> > +
> > + hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector);
> > + fwnode_handle_put(connector);
> > + if (IS_ERR_OR_NULL(hd3ss3220->role_sw))
> > + return PTR_ERR(hd3ss3220->role_sw);
> > +
> > + hd3ss3220->typec_cap.prefer_role = TYPEC_NO_PREFERRED_ROLE;
> > + hd3ss3220->typec_cap.dr_set = hd3ss3220_dr_set;
> > + hd3ss3220->typec_cap.type = TYPEC_PORT_DRP;
> > + hd3ss3220->typec_cap.data = TYPEC_PORT_DRD;
> > +
> > + hd3ss3220->port = typec_register_port(&client->dev,
> > + &hd3ss3220->typec_cap);
> > + if (IS_ERR(hd3ss3220->port))
> > + return PTR_ERR(hd3ss3220->port);
> > +
> > + hd3ss3220_set_role(hd3ss3220);
> > + ret = regmap_read(hd3ss3220->regmap,
> HD3SS3220_REG_CN_STAT_CTRL, &data);
> > + if (ret < 0)
> > + goto error;
> > +
> > + if (data & HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS) {
> > + ret = regmap_write(hd3ss3220->regmap,
> > + HD3SS3220_REG_CN_STAT_CTRL,
> > + data |
> HD3SS3220_REG_CN_STAT_CTRL_INT_STATUS);
> > + if (ret < 0)
> > + goto error;
> > + }
> > +
> > + if (client->irq > 0) {
> > + ret = devm_request_threaded_irq(&client->dev, client->irq,
> NULL,
> > + hd3ss3220_irq_handler,
> > + IRQF_TRIGGER_FALLING |
> IRQF_ONESHOT,
> > + "hd3ss3220", &client->dev);
> > + if (ret)
> > + goto error;
> > + }
> > +
> > + ret = i2c_smbus_read_byte_data(client, HD3SS3220_REG_DEV_REV);
> > + if (ret < 0)
> > + goto error;
> > +
> > + dev_info(&client->dev, "probed revision=0x%x\n", ret);
> > +
> > + return 0;
> > +error:
> > + typec_unregister_port(hd3ss3220->port);
> > + usb_role_switch_put(hd3ss3220->role_sw);
> > +
> > + return ret;
> > +}
> > +
> > +static int hd3ss3220_remove(struct i2c_client *client) {
> > + struct hd3ss3220 *hd3ss3220 = i2c_get_clientdata(client);
> > +
> > + typec_unregister_port(hd3ss3220->port);
> > + usb_role_switch_put(hd3ss3220->role_sw);
> > +
> > + return 0;
> > +}
> > +
> > +static const struct of_device_id dev_ids[] = {
> > + { .compatible = "ti,hd3ss3220"},
> > + {}
> > +};
> > +MODULE_DEVICE_TABLE(of, dev_ids);
> > +
> > +static struct i2c_driver hd3ss3220_driver = {
> > + .driver = {
> > + .name = "hd3ss3220",
> > + .of_match_table = of_match_ptr(dev_ids),
> > + },
> > + .probe = hd3ss3220_probe,
> > + .remove = hd3ss3220_remove,
> > +};
> > +
> > +module_i2c_driver(hd3ss3220_driver);
> > +
> > +MODULE_AUTHOR("Biju Das <biju.das@bp.renesas.com>");
> > +MODULE_DESCRIPTION("TI HD3SS3220 DRP Port Controller Driver");
> > +MODULE_LICENSE("GPL");
> > --
> > 2.7.4
>
> thanks,
>
> --
> heikki
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller
2019-06-12 8:42 ` Biju Das
@ 2019-06-12 9:42 ` Heikki Krogerus
0 siblings, 0 replies; 16+ messages in thread
From: Heikki Krogerus @ 2019-06-12 9:42 UTC (permalink / raw)
To: Biju Das
Cc: Matthias Brugger, Greg Kroah-Hartman, Rob Herring, Felipe Balbi,
Chunfeng Yun, linux-usb, Simon Horman, Yoshihiro Shimoda,
Geert Uytterhoeven, Chris Paterson, Fabrizio Castro,
linux-renesas-soc
On Wed, Jun 12, 2019 at 08:42:47AM +0000, Biju Das wrote:
> Hi Heikki,
>
> > Subject: Re: [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C
> > DRP port controller
> >
> > On Fri, May 31, 2019 at 10:59:56AM +0100, Biju Das wrote:
> > > Driver for TI HD3SS3220 USB Type-C DRP port controller.
> > >
> > > The driver currently registers the port and supports data role swapping.
> > >
> > > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> >
> > Acked-by; Heikki Krogerus <heikki.krogerus@linux.intel.com>
>
> Thanks. I believe there is a typo it should be ":" instead of ";" .
True :)
Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
--
heikki
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller
2019-05-31 9:59 ` [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller Biju Das
2019-06-12 8:25 ` Heikki Krogerus
@ 2019-06-18 6:47 ` Greg Kroah-Hartman
2019-06-18 6:57 ` Biju Das
1 sibling, 1 reply; 16+ messages in thread
From: Greg Kroah-Hartman @ 2019-06-18 6:47 UTC (permalink / raw)
To: Biju Das
Cc: Heikki Krogerus, Matthias Brugger, Rob Herring, Felipe Balbi,
Chunfeng Yun, linux-usb, Simon Horman, Yoshihiro Shimoda,
Geert Uytterhoeven, Chris Paterson, Fabrizio Castro,
linux-renesas-soc
On Fri, May 31, 2019 at 10:59:56AM +0100, Biju Das wrote:
> Driver for TI HD3SS3220 USB Type-C DRP port controller.
>
> The driver currently registers the port and supports data role swapping.
>
> Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
I tried to apply this, but get the following build error:
drivers/usb/typec/hd3ss3220.c: In function hd3ss3220_probe:
drivers/usb/typec/hd3ss3220.c:179:23: error: implicit declaration of function fwnode_usb_role_switch_get; did you mean usb_role_switch_get? [-Werror=implicit-function-declaration]
hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector);
^~~~~~~~~~~~~~~~~~~~~~~~~~
usb_role_switch_get
drivers/usb/typec/hd3ss3220.c:179:21: warning: assignment to struct usb_role_switch * from int makes pointer from integer without a cast [-Wint-conversion]
hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector);
^
You might want to fix that so the series can be applied :(
thanks,
greg k-h
^ permalink raw reply [flat|nested] 16+ messages in thread* RE: [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller
2019-06-18 6:47 ` Greg Kroah-Hartman
@ 2019-06-18 6:57 ` Biju Das
2019-06-18 7:03 ` Greg Kroah-Hartman
0 siblings, 1 reply; 16+ messages in thread
From: Biju Das @ 2019-06-18 6:57 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Heikki Krogerus, Matthias Brugger, Rob Herring, Felipe Balbi,
Chunfeng Yun, linux-usb, Simon Horman, Yoshihiro Shimoda,
Geert Uytterhoeven, Chris Paterson, Fabrizio Castro,
linux-renesas-soc
Hi Greg,
Thanks for the feedback.
> -----Original Message-----
> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Sent: Tuesday, June 18, 2019 7:48 AM
> To: Biju Das <biju.das@bp.renesas.com>
> Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>; Matthias Brugger
> <matthias.bgg@gmail.com>; Rob Herring <robh+dt@kernel.org>; Felipe Balbi
> <balbi@kernel.org>; Chunfeng Yun <chunfeng.yun@mediatek.com>; linux-
> usb@vger.kernel.org; Simon Horman <horms@verge.net.au>; Yoshihiro
> Shimoda <yoshihiro.shimoda.uh@renesas.com>; Geert Uytterhoeven
> <geert+renesas@glider.be>; Chris Paterson
> <Chris.Paterson2@renesas.com>; Fabrizio Castro
> <fabrizio.castro@bp.renesas.com>; linux-renesas-soc@vger.kernel.org
> Subject: Re: [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C
> DRP port controller
>
> On Fri, May 31, 2019 at 10:59:56AM +0100, Biju Das wrote:
> > Driver for TI HD3SS3220 USB Type-C DRP port controller.
> >
> > The driver currently registers the port and supports data role swapping.
> >
> > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > ---
>
> I tried to apply this, but get the following build error:
>
> drivers/usb/typec/hd3ss3220.c: In function hd3ss3220_probe:
> drivers/usb/typec/hd3ss3220.c:179:23: error: implicit declaration of function
> fwnode_usb_role_switch_get; did you mean usb_role_switch_get? [-
> Werror=implicit-function-declaration]
> hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~
> usb_role_switch_get
> drivers/usb/typec/hd3ss3220.c:179:21: warning: assignment to struct
> usb_role_switch * from int makes pointer from integer without a cast [-Wint-
> conversion]
> hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector);
> ^
>
> You might want to fix that so the series can be applied :(
This patch depend upon the below commit[1] which introduced the new API "fwnode_usb_role_switch_get()"
[1] https://patchwork.kernel.org/patch/10986227/ ("usb: roles: Add fwnode_usb_role_switch_get() function")
Patch [1] depend up on [2] ,[3] and the binding patch [4]
[2] https://patchwork.kernel.org/patch/10986233/ ( "device connection: Add fwnode_connection_find_match()")
[3] https://patchwork.kernel.org/patch/10986221/ ("usb: roles: Introduce stubs for the exiting functions in role.h")
Binding patch
[4] https://patchwork.kernel.org/patch/10986215/ ("dt-binding: usb: add usb-role-switch property")
Regards,
Biju
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller
2019-06-18 6:57 ` Biju Das
@ 2019-06-18 7:03 ` Greg Kroah-Hartman
2019-06-18 7:15 ` Biju Das
0 siblings, 1 reply; 16+ messages in thread
From: Greg Kroah-Hartman @ 2019-06-18 7:03 UTC (permalink / raw)
To: Biju Das
Cc: Heikki Krogerus, Matthias Brugger, Rob Herring, Felipe Balbi,
Chunfeng Yun, linux-usb, Simon Horman, Yoshihiro Shimoda,
Geert Uytterhoeven, Chris Paterson, Fabrizio Castro,
linux-renesas-soc
On Tue, Jun 18, 2019 at 06:57:31AM +0000, Biju Das wrote:
> Hi Greg,
>
> Thanks for the feedback.
>
> > -----Original Message-----
> > From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Sent: Tuesday, June 18, 2019 7:48 AM
> > To: Biju Das <biju.das@bp.renesas.com>
> > Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>; Matthias Brugger
> > <matthias.bgg@gmail.com>; Rob Herring <robh+dt@kernel.org>; Felipe Balbi
> > <balbi@kernel.org>; Chunfeng Yun <chunfeng.yun@mediatek.com>; linux-
> > usb@vger.kernel.org; Simon Horman <horms@verge.net.au>; Yoshihiro
> > Shimoda <yoshihiro.shimoda.uh@renesas.com>; Geert Uytterhoeven
> > <geert+renesas@glider.be>; Chris Paterson
> > <Chris.Paterson2@renesas.com>; Fabrizio Castro
> > <fabrizio.castro@bp.renesas.com>; linux-renesas-soc@vger.kernel.org
> > Subject: Re: [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C
> > DRP port controller
> >
> > On Fri, May 31, 2019 at 10:59:56AM +0100, Biju Das wrote:
> > > Driver for TI HD3SS3220 USB Type-C DRP port controller.
> > >
> > > The driver currently registers the port and supports data role swapping.
> > >
> > > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > > Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > > ---
> >
> > I tried to apply this, but get the following build error:
> >
> > drivers/usb/typec/hd3ss3220.c: In function hd3ss3220_probe:
> > drivers/usb/typec/hd3ss3220.c:179:23: error: implicit declaration of function
> > fwnode_usb_role_switch_get; did you mean usb_role_switch_get? [-
> > Werror=implicit-function-declaration]
> > hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector);
> > ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > usb_role_switch_get
> > drivers/usb/typec/hd3ss3220.c:179:21: warning: assignment to struct
> > usb_role_switch * from int makes pointer from integer without a cast [-Wint-
> > conversion]
> > hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector);
> > ^
> >
> > You might want to fix that so the series can be applied :(
>
> This patch depend upon the below commit[1] which introduced the new API "fwnode_usb_role_switch_get()"
>
> [1] https://patchwork.kernel.org/patch/10986227/ ("usb: roles: Add fwnode_usb_role_switch_get() function")
Ok, then I guess I will have to wait to merge this until that is
accepted.
Please resend when that happens.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 16+ messages in thread* RE: [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller
2019-06-18 7:03 ` Greg Kroah-Hartman
@ 2019-06-18 7:15 ` Biju Das
0 siblings, 0 replies; 16+ messages in thread
From: Biju Das @ 2019-06-18 7:15 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Heikki Krogerus, Matthias Brugger, Rob Herring, Felipe Balbi,
Chunfeng Yun, linux-usb, Simon Horman, Yoshihiro Shimoda,
Geert Uytterhoeven, Chris Paterson, Fabrizio Castro,
linux-renesas-soc
Hi Greg,
> Subject: Re: [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C
> DRP port controller
>
> > > Subject: Re: [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB
> > > Type-C DRP port controller
> > >
> > > On Fri, May 31, 2019 at 10:59:56AM +0100, Biju Das wrote:
> > > > Driver for TI HD3SS3220 USB Type-C DRP port controller.
> > > >
> > > > The driver currently registers the port and supports data role swapping.
> > > >
> > > > Signed-off-by: Biju Das <biju.das@bp.renesas.com>
> > > > Acked-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > > > ---
> > >
> > > I tried to apply this, but get the following build error:
> > >
> > > drivers/usb/typec/hd3ss3220.c: In function hd3ss3220_probe:
> > > drivers/usb/typec/hd3ss3220.c:179:23: error: implicit declaration of
> > > function fwnode_usb_role_switch_get; did you mean
> > > usb_role_switch_get? [- Werror=implicit-function-declaration]
> > > hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector);
> > > ^~~~~~~~~~~~~~~~~~~~~~~~~~
> > > usb_role_switch_get
> > > drivers/usb/typec/hd3ss3220.c:179:21: warning: assignment to struct
> > > usb_role_switch * from int makes pointer from integer without a cast
> > > [-Wint- conversion]
> > > hd3ss3220->role_sw = fwnode_usb_role_switch_get(connector);
> > > ^
> > >
> > > You might want to fix that so the series can be applied :(
> >
> > This patch depend upon the below commit[1] which introduced the new
> API "fwnode_usb_role_switch_get()"
> >
> > [1] https://patchwork.kernel.org/patch/10986227/ ("usb: roles: Add
> > fwnode_usb_role_switch_get() function")
>
> Ok, then I guess I will have to wait to merge this until that is accepted.
>
> Please resend when that happens.
OK. I will resend this patch after patch [1] get accepted.
Regards,
Biju
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH v7 4/7] usb: gadget: udc: renesas_usb3: Enhance role switch support
2019-05-31 9:59 [PATCH v7 0/7] Add USB3.0 and TI HD3SS3220 driver support Biju Das
` (2 preceding siblings ...)
2019-05-31 9:59 ` [PATCH v7 3/7] usb: typec: driver for TI HD3SS3220 USB Type-C DRP port controller Biju Das
@ 2019-05-31 9:59 ` Biju Das
2019-06-03 9:58 ` Yoshihiro Shimoda
3 siblings, 1 reply; 16+ messages in thread
From: Biju Das @ 2019-05-31 9:59 UTC (permalink / raw)
To: Felipe Balbi, Greg Kroah-Hartman, Yoshihiro Shimoda,
Chunfeng Yun, Rob Herring
Cc: Biju Das, Heikki Krogerus, Simon Horman, Fabrizio Castro,
Kees Cook, linux-usb, Simon Horman, Geert Uytterhoeven,
Chris Paterson, linux-renesas-soc
The RZ/G2E cat874 board has a type-c connector connected to hd3ss3220 usb
type-c drp port controller. Enhance role switch support to assign the role
requested by connector device using the usb role switch class framework.
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
V6-->V7
* Incorporated Shimoda-San and Chunfeng Yun's review comments
(https://patchwork.kernel.org/patch/10944643/)
V5-->V6
* Added graph api's to find the role supported by the connector.
V4-->V5
* Incorporated Shimoda-san's review comment
(https://patchwork.kernel.org/patch/10902537/)
V3-->V4
* No Change
V2-->V3
* Incorporated Shimoda-san's review comment
(https://patchwork.kernel.org/patch/10852507/)
* Used renesas,usb-role-switch property for differentiating USB
role switch associated with Type-C port controller driver.
V1-->V2
* Driver uses usb role clas for handling dual role switch and handling
connect/disconnect events instead of extcon.
---
drivers/usb/gadget/udc/renesas_usb3.c | 91 ++++++++++++++++++++++++++++++++---
1 file changed, 84 insertions(+), 7 deletions(-)
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
index 7dc2485..5a960fc 100644
--- a/drivers/usb/gadget/udc/renesas_usb3.c
+++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -351,6 +351,8 @@ struct renesas_usb3 {
int disabled_count;
struct usb_request *ep0_req;
+
+ enum usb_role connection_state;
u16 test_mode;
u8 ep0_buf[USB3_EP0_BUF_SIZE];
bool softconnect;
@@ -359,6 +361,7 @@ struct renesas_usb3 {
bool extcon_usb; /* check vbus and set EXTCON_USB */
bool forced_b_device;
bool start_to_connect;
+ bool role_sw_by_connector;
};
#define gadget_to_renesas_usb3(_gadget) \
@@ -699,8 +702,11 @@ static void usb3_mode_config(struct renesas_usb3 *usb3, bool host, bool a_dev)
unsigned long flags;
spin_lock_irqsave(&usb3->lock, flags);
- usb3_set_mode_by_role_sw(usb3, host);
- usb3_vbus_out(usb3, a_dev);
+ if (!usb3->role_sw_by_connector ||
+ usb3->connection_state != USB_ROLE_NONE) {
+ usb3_set_mode_by_role_sw(usb3, host);
+ usb3_vbus_out(usb3, a_dev);
+ }
/* for A-Peripheral or forced B-device mode */
if ((!host && a_dev) || usb3->start_to_connect)
usb3_connect(usb3);
@@ -716,7 +722,8 @@ static void usb3_check_id(struct renesas_usb3 *usb3)
{
usb3->extcon_host = usb3_is_a_device(usb3);
- if (usb3->extcon_host && !usb3->forced_b_device)
+ if ((!usb3->role_sw_by_connector && usb3->extcon_host &&
+ !usb3->forced_b_device) || usb3->connection_state == USB_ROLE_HOST)
usb3_mode_config(usb3, true, true);
else
usb3_mode_config(usb3, false, false);
@@ -2343,14 +2350,65 @@ static enum usb_role renesas_usb3_role_switch_get(struct device *dev)
return cur_role;
}
-static int renesas_usb3_role_switch_set(struct device *dev,
- enum usb_role role)
+static void handle_ext_role_switch_states(struct device *dev,
+ enum usb_role role)
+{
+ struct renesas_usb3 *usb3 = dev_get_drvdata(dev);
+ struct device *host = usb3->host_dev;
+ enum usb_role cur_role = renesas_usb3_role_switch_get(dev);
+
+ switch (role) {
+ case USB_ROLE_NONE:
+ usb3->connection_state = USB_ROLE_NONE;
+ if (usb3->driver)
+ usb3_disconnect(usb3);
+ usb3_vbus_out(usb3, false);
+ break;
+ case USB_ROLE_DEVICE:
+ if (usb3->connection_state == USB_ROLE_NONE) {
+ usb3->connection_state = USB_ROLE_DEVICE;
+ usb3_set_mode(usb3, false);
+ if (usb3->driver)
+ usb3_connect(usb3);
+ } else if (cur_role == USB_ROLE_HOST) {
+ device_release_driver(host);
+ usb3_set_mode(usb3, false);
+ if (usb3->driver)
+ usb3_connect(usb3);
+ }
+ usb3_vbus_out(usb3, false);
+ break;
+ case USB_ROLE_HOST:
+ if (usb3->connection_state == USB_ROLE_NONE) {
+ if (usb3->driver)
+ usb3_disconnect(usb3);
+
+ usb3->connection_state = USB_ROLE_HOST;
+ usb3_set_mode(usb3, true);
+ usb3_vbus_out(usb3, true);
+ if (device_attach(host) < 0)
+ dev_err(dev, "device_attach(host) failed\n");
+ } else if (cur_role == USB_ROLE_DEVICE) {
+ usb3_disconnect(usb3);
+ /* Must set the mode before device_attach of the host */
+ usb3_set_mode(usb3, true);
+ /* This device_attach() might sleep */
+ if (device_attach(host) < 0)
+ dev_err(dev, "device_attach(host) failed\n");
+ }
+ break;
+ default:
+ break;
+ }
+}
+
+static void handle_role_switch_states(struct device *dev,
+ enum usb_role role)
{
struct renesas_usb3 *usb3 = dev_get_drvdata(dev);
struct device *host = usb3->host_dev;
enum usb_role cur_role = renesas_usb3_role_switch_get(dev);
- pm_runtime_get_sync(dev);
if (cur_role == USB_ROLE_HOST && role == USB_ROLE_DEVICE) {
device_release_driver(host);
usb3_set_mode(usb3, false);
@@ -2361,6 +2419,20 @@ static int renesas_usb3_role_switch_set(struct device *dev,
if (device_attach(host) < 0)
dev_err(dev, "device_attach(host) failed\n");
}
+}
+
+static int renesas_usb3_role_switch_set(struct device *dev,
+ enum usb_role role)
+{
+ struct renesas_usb3 *usb3 = dev_get_drvdata(dev);
+
+ pm_runtime_get_sync(dev);
+
+ if (usb3->role_sw_by_connector)
+ handle_ext_role_switch_states(dev, role);
+ else
+ handle_role_switch_states(dev, role);
+
pm_runtime_put(dev);
return 0;
@@ -2650,7 +2722,7 @@ static const unsigned int renesas_usb3_cable[] = {
EXTCON_NONE,
};
-static const struct usb_role_switch_desc renesas_usb3_role_switch_desc = {
+static struct usb_role_switch_desc renesas_usb3_role_switch_desc = {
.set = renesas_usb3_role_switch_set,
.get = renesas_usb3_role_switch_get,
.allow_userspace_control = true,
@@ -2741,6 +2813,11 @@ static int renesas_usb3_probe(struct platform_device *pdev)
if (ret < 0)
goto err_dev_create;
+ if (device_property_read_bool(&pdev->dev, "usb-role-switch")) {
+ usb3->role_sw_by_connector = true;
+ renesas_usb3_role_switch_desc.fwnode = dev_fwnode(&pdev->dev);
+ }
+
INIT_WORK(&usb3->role_work, renesas_usb3_role_work);
usb3->role_sw = usb_role_switch_register(&pdev->dev,
&renesas_usb3_role_switch_desc);
--
2.7.4
^ permalink raw reply related [flat|nested] 16+ messages in thread* RE: [PATCH v7 4/7] usb: gadget: udc: renesas_usb3: Enhance role switch support
2019-05-31 9:59 ` [PATCH v7 4/7] usb: gadget: udc: renesas_usb3: Enhance role switch support Biju Das
@ 2019-06-03 9:58 ` Yoshihiro Shimoda
0 siblings, 0 replies; 16+ messages in thread
From: Yoshihiro Shimoda @ 2019-06-03 9:58 UTC (permalink / raw)
To: Biju Das, Felipe Balbi, Greg Kroah-Hartman, Chunfeng Yun, Rob Herring
Cc: Biju Das, Heikki Krogerus, Simon Horman, Fabrizio Castro,
Kees Cook, linux-usb, Simon Horman, Geert Uytterhoeven,
Chris Paterson, linux-renesas-soc
Hi Biju-san,
> From: Biju Das, Sent: Friday, May 31, 2019 7:00 PM
>
> The RZ/G2E cat874 board has a type-c connector connected to hd3ss3220 usb
> type-c drp port controller. Enhance role switch support to assign the role
> requested by connector device using the usb role switch class framework.
>
> Signed-off-by: Biju Das <biju.das@bp.renesas.com>
Thank you for the patch! I tested this patch on R-Car H3 Salvator-X and
it seems no regressions. So,
Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Best regards,
Yoshihiro Shimoda
^ permalink raw reply [flat|nested] 16+ messages in thread