On Thu, Oct 24, 2024 at 10:54:17AM +0200, Romain Gantois wrote:
> The TUSB1046-DCI is a USB-C linear redriver crosspoint switch, which can
> mux SuperSpeed lanes from a Type-C connector to a USB3.0 data lane or up to
> 4 display port lanes.
>
> Add support for driving the TUSB1046 as a Type-C orientation switch and
> DisplayPort altmode multiplexer.
>
> Signed-off-by: Romain Gantois <romain.gantois@xxxxxxxxxxx>
> ---
> MAINTAINERS | 7 ++
> drivers/usb/typec/mux/Kconfig | 9 ++
> drivers/usb/typec/mux/Makefile | 1 +
> drivers/usb/typec/mux/tusb1046.c | 196 +++++++++++++++++++++++++++++++++++++++
> 4 files changed, 213 insertions(+)
>
> diff --git a/MAINTAINERS b/MAINTAINERS
> index c27f3190737f8b85779bde5489639c8b899f4fd8..c880588b63f27d628edeec09fa7d904eeabbde92 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -24142,6 +24142,13 @@ L: linux-usb@xxxxxxxxxxxxxxx
> S: Orphan
> F: drivers/usb/typec/tcpm/
>
> +USB TYPEC TUSB1046 MUX DRIVER
> +M: Romain Gantois <romain.gantois@xxxxxxxxxxx>
> +L: linux-usb@xxxxxxxxxxxxxxx
> +S: Maintained
> +F: Documentation/devicetree/bindings/usb/ti,tusb1046.yaml
> +F: drivers/usb/typec/mux/tusb1046.c
> +
> USB UHCI DRIVER
> M: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
> L: linux-usb@xxxxxxxxxxxxxxx
> diff --git a/drivers/usb/typec/mux/Kconfig b/drivers/usb/typec/mux/Kconfig
> index ce7db6ad30572a0a74890f5f11944fb3ff07f635..67381b4ef4f68f4a6e73f157365ee24d0ab7109a 100644
> --- a/drivers/usb/typec/mux/Kconfig
> +++ b/drivers/usb/typec/mux/Kconfig
> @@ -66,6 +66,15 @@ config TYPEC_MUX_PTN36502
> Say Y or M if your system has a NXP PTN36502 Type-C redriver chip
> found on some devices with a Type-C port.
>
> +config TYPEC_MUX_TUSB1046
> + tristate "TI TUSB1046 Type-C crosspoint switch driver"
> + depends on I2C
> + help
> + Driver for the Texas Instruments TUSB1046-DCI crosspoint switch.
> + Supports flipping USB-C SuperSpeed lanes to adapt to orientation
> + changes, as well as muxing DisplayPort and sideband signals to a
> + common Type-C connector.
> +
> config TYPEC_MUX_WCD939X_USBSS
> tristate "Qualcomm WCD939x USBSS Analog Audio Switch driver"
> depends on I2C
> diff --git a/drivers/usb/typec/mux/Makefile b/drivers/usb/typec/mux/Makefile
> index bb96f30267af05b33b9277dcf1cc0e1527d2dcdd..60879446da9365183567d3374a2fb7b5171fb3d7 100644
> --- a/drivers/usb/typec/mux/Makefile
> +++ b/drivers/usb/typec/mux/Makefile
> @@ -7,4 +7,5 @@ obj-$(CONFIG_TYPEC_MUX_INTEL_PMC) += intel_pmc_mux.o
> obj-$(CONFIG_TYPEC_MUX_IT5205) += it5205.o
> obj-$(CONFIG_TYPEC_MUX_NB7VPQ904M) += nb7vpq904m.o
> obj-$(CONFIG_TYPEC_MUX_PTN36502) += ptn36502.o
> +obj-$(CONFIG_TYPEC_MUX_TUSB1046) += tusb1046.o
> obj-$(CONFIG_TYPEC_MUX_WCD939X_USBSS) += wcd939x-usbss.o
> diff --git a/drivers/usb/typec/mux/tusb1046.c b/drivers/usb/typec/mux/tusb1046.c
> new file mode 100644
> index 0000000000000000000000000000000000000000..b4f45c217b59fe033551e8e6379ad2d33ebedbcb
> --- /dev/null
> +++ b/drivers/usb/typec/mux/tusb1046.c
> @@ -0,0 +1,196 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/*
> + * Driver for the TUSB1046-DCI USB Type-C crosspoint switch
> + *
> + * Copyright (C) 2024 Bootlin
> + */
> +
> +#include <linux/bits.h>
> +#include <linux/i2c.h>
> +#include <linux/usb/typec_mux.h>
> +#include <linux/usb/typec_dp.h>
> +#include <linux/usb/typec_altmode.h>
> +#include <linux/module.h>
> +#include <linux/mod_devicetable.h>
> +#include <linux/err.h>
> +#include <linux/of_device.h>
> +#include <linux/device.h>
> +#include <linux/mutex.h>
> +
> +#define TUSB1046_REG_GENERAL 0xa
> +
> +/* General register bits */
> +#define TUSB1046_GENERAL_FLIPSEL BIT(2)
> +#define TUSB1046_GENERAL_CTLSEL GENMASK(1, 0)
> +
> +/* Mux modes */
> +#define TUSB1046_CTLSEL_DISABLED 0x0
> +#define TUSB1046_CTLSEL_USB3 0x1
> +#define TUSB1046_CTLSEL_4LANE_DP 0x2
> +#define TUSB1046_CTLSEL_USB3_AND_2LANE_DP 0x3
> +
> +struct tusb1046_priv {
> + struct i2c_client *client;
> + struct typec_switch_dev *sw;
> + struct typec_mux_dev *mux;
> +
> + /* Lock General register during accesses */
> + struct mutex general_reg_lock;
> +};
> +
> +static int tusb1046_mux_set(struct typec_mux_dev *mux,
> + struct typec_mux_state *state)
> +{
> + struct tusb1046_priv *priv = typec_mux_get_drvdata(mux);
> + struct i2c_client *client = priv->client;
> + struct device *dev = &client->dev;
> + int mode, val, ret = 0;
> +
> + if (state->mode >= TYPEC_STATE_MODAL &&
> + state->alt->svid != USB_TYPEC_DP_SID)
> + return -EINVAL;
> +
> + dev_dbg(dev, "mux mode requested: %lu\n", state->mode);
> +
> + mutex_lock(&priv->general_reg_lock);
> +
> + val = i2c_smbus_read_byte_data(client, TUSB1046_REG_GENERAL);
> + if (val < 0) {
> + dev_err(dev, "failed to read ctlsel status, err %d\n", val);
> + ret = val;
> + goto out_unlock;
> + }
> +
> + switch (state->mode) {
> + case TYPEC_STATE_USB:
> + mode = TUSB1046_CTLSEL_USB3;
> + break;
> + case TYPEC_DP_STATE_C:
These are only valid if you have checked that altmode SVID is a
DisplayPort SVID.
> + case TYPEC_DP_STATE_E:
> + mode = TUSB1046_CTLSEL_4LANE_DP;
> + break;
> + case TYPEC_DP_STATE_D:
> + mode = TUSB1046_CTLSEL_USB3_AND_2LANE_DP;
> + break;
> + case TYPEC_STATE_SAFE:
> + default:
> + mode = TUSB1046_CTLSEL_DISABLED;
> + break;
> + }
> +
> + val &= ~TUSB1046_GENERAL_CTLSEL;
> + val |= mode;
> +
> + ret = i2c_smbus_write_byte_data(client, TUSB1046_REG_GENERAL, val);
> +
> +out_unlock:
> + mutex_unlock(&priv->general_reg_lock);
> + return ret;
> +}
> +
--
With best wishes
Dmitry
