On Tue, Feb 19, 2019 at 2:00 PM Heikki Krogerus
<heikki.krogerus@xxxxxxxxxxxxxxx> wrote:
>
> In ACPI, and now also in DT, the USB connectors usually have
> their own device nodes. In case of USB Type-C, those
> connector (port) nodes are child nodes of the controller or
> PHY device, in our case the fusb302. The software fwnodes
> allow us to create a similar child node for fusb302 that
> represents the connector also on Intel CHT.
>
> This makes it possible replace the fusb302 specific device
> properties which were deprecated with the common USB
> connector properties that tcpm.c is able to use directly.
>
This doesn't apply to our for-next branch.
> Signed-off-by: Heikki Krogerus <heikki.krogerus@xxxxxxxxxxxxxxx>
> ---
> drivers/platform/x86/intel_cht_int33fe.c | 48 ++++++++++++++++++++++--
> 1 file changed, 44 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/platform/x86/intel_cht_int33fe.c b/drivers/platform/x86/intel_cht_int33fe.c
> index 6fa3cced6f8e..4857a57cfff5 100644
> --- a/drivers/platform/x86/intel_cht_int33fe.c
> +++ b/drivers/platform/x86/intel_cht_int33fe.c
> @@ -24,6 +24,7 @@
> #include <linux/platform_device.h>
> #include <linux/regulator/consumer.h>
> #include <linux/slab.h>
> +#include <linux/usb/pd.h>
>
> #define EXPECTED_PTYPE 4
>
> @@ -31,6 +32,8 @@ struct cht_int33fe_data {
> struct i2c_client *max17047;
> struct i2c_client *fusb302;
> struct i2c_client *pi3usb30532;
> + struct fwnode_handle *port_node;
> + struct fwnode_handle *fusb302_node;
> /* Contain a list-head must be per device */
> struct device_connection connections[4];
> };
> @@ -80,9 +83,29 @@ static const struct property_entry max17047_props[] = {
>
> static const struct property_entry fusb302_props[] = {
> PROPERTY_ENTRY_STRING("linux,extcon-name", "cht_wcove_pwrsrc"),
> - PROPERTY_ENTRY_U32("fcs,max-sink-microvolt", 12000000),
> - PROPERTY_ENTRY_U32("fcs,max-sink-microamp", 3000000),
> - PROPERTY_ENTRY_U32("fcs,max-sink-microwatt", 36000000),
> + { }
> +};
> +
> +#define PDO_FIXED_FLAGS \
> + (PDO_FIXED_DUAL_ROLE | PDO_FIXED_DATA_SWAP | PDO_FIXED_USB_COMM)
> +
> +static const u32 src_pdo[] = {
> + PDO_FIXED(5000, 1500, PDO_FIXED_FLAGS),
> +};
> +
> +static const u32 snk_pdo[] = {
> + PDO_FIXED(5000, 400, PDO_FIXED_FLAGS),
> + PDO_VAR(5000, 12000, 3000),
> +};
> +
> +static const struct property_entry usb_connector_props[] = {
> + PROPERTY_ENTRY_STRING("name", "connector"),
> + PROPERTY_ENTRY_STRING("data-role", "dual"),
> + PROPERTY_ENTRY_STRING("power-role", "dual"),
> + PROPERTY_ENTRY_STRING("try-power-role", "sink"),
> + PROPERTY_ENTRY_U32_ARRAY("source-pdos", src_pdo),
> + PROPERTY_ENTRY_U32_ARRAY("sink-pdos", snk_pdo),
> + PROPERTY_ENTRY_U32("op-sink-microwatt", 36000000),
> { }
> };
>
> @@ -151,6 +174,19 @@ static int cht_int33fe_probe(struct platform_device *pdev)
> if (!data)
> return -ENOMEM;
>
> + /* Node for the FUSB302 controller */
> + data->fusb302_node = fwnode_create_software_node(fusb302_props, NULL);
> + if (IS_ERR(data->fusb302_node))
> + return PTR_ERR(data->fusb302_node);
> +
> + /* Node for the connector (FUSB302 is the parent) */
> + data->port_node = fwnode_create_software_node(usb_connector_props,
> + data->fusb302_node);
> + if (IS_ERR(data->port_node)) {
> + fwnode_remove_software_node(data->fusb302_node);
> + return PTR_ERR(data->port_node);
> + }
> +
> /* Work around BIOS bug, see comment on cht_int33fe_find_max17047 */
> max17047 = cht_int33fe_find_max17047();
> if (max17047) {
> @@ -187,7 +223,7 @@ static int cht_int33fe_probe(struct platform_device *pdev)
> memset(&board_info, 0, sizeof(board_info));
> strlcpy(board_info.type, "typec_fusb302", I2C_NAME_SIZE);
> board_info.dev_name = "fusb302";
> - board_info.properties = fusb302_props;
> + board_info.fwnode = data->fusb302_node;
> board_info.irq = fusb302_irq;
>
> data->fusb302 = i2c_acpi_new_device(dev, 2, &board_info);
> @@ -217,6 +253,8 @@ static int cht_int33fe_probe(struct platform_device *pdev)
> i2c_unregister_device(data->max17047);
>
> device_connections_remove(data->connections);
> + fwnode_remove_software_node(data->port_node);
> + fwnode_remove_software_node(data->fusb302_node);
>
> return ret;
> }
> @@ -230,6 +268,8 @@ static int cht_int33fe_remove(struct platform_device *pdev)
> i2c_unregister_device(data->max17047);
>
> device_connections_remove(data->connections);
> + fwnode_remove_software_node(data->port_node);
> + fwnode_remove_software_node(data->fusb302_node);
>
> return 0;
> }
> --
> 2.20.1
>
--
With Best Regards,
Andy Shevchenko
