On Sat, Oct 12, 2024 at 11:05:36PM +0530, Vinod Koul wrote:
> On 10-10-24, 17:08, Xu Yang wrote:
> > The i.MX95 USB3 phy has a Type-C Assist block (TCA). This block consists
> > two functional blocks (XBar assist and VBus assist) and one system
> > access interface using APB.
> >
> > The primary functionality of XBar assist is:
> > - switching lane for flip
> > - moving unused lanes into lower power states.
> >
> > This info can be get from:
> > i.MX95 RM Chapter 163.3.8 Type-C assist (TCA) block.
> >
> > This will add support for TCA block to achieve lane switching and tca
> > lower power functionality.
> >
> > Signed-off-by: Xu Yang <xu.yang_2@xxxxxxx>
> > Reviewed-by: Jun Li <jun.li@xxxxxxx>
> >
> > ---
> > Changes in v2:
> > - return the value of imx95_usb_phy_get_tca()
> > Changes in v3:
> > - no changes
> > Changes in v4:
> > - remove compatible check for imx95
> > - check whether tca register region exist or not, yes means has tca,
> > otherwise skip tca setup
> > Changes in v5:
> > - no changes
> > Changes in v6:
> > - no changes
> > Changes in v7:
> > - fix sparse warnings in imx95_usb_phy_get_tca()
> > ---
> > drivers/phy/freescale/Kconfig | 1 +
> > drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 243 +++++++++++++++++++++
> > 2 files changed, 244 insertions(+)
> >
> > diff --git a/drivers/phy/freescale/Kconfig b/drivers/phy/freescale/Kconfig
> > index dcd9acff6d01..81f53564ee15 100644
> > --- a/drivers/phy/freescale/Kconfig
> > +++ b/drivers/phy/freescale/Kconfig
> > @@ -5,6 +5,7 @@ if (ARCH_MXC && ARM64) || COMPILE_TEST
> > config PHY_FSL_IMX8MQ_USB
> > tristate "Freescale i.MX8M USB3 PHY"
> > depends on OF && HAS_IOMEM
> > + depends on TYPEC || TYPEC=n
> > select GENERIC_PHY
> > default ARCH_MXC && ARM64
> >
> > diff --git a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
> > index adc6394626ce..661191276b27 100644
> > --- a/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
> > +++ b/drivers/phy/freescale/phy-fsl-imx8mq-usb.c
> > @@ -10,6 +10,7 @@
> > #include <linux/phy/phy.h>
> > #include <linux/platform_device.h>
> > #include <linux/regulator/consumer.h>
> > +#include <linux/usb/typec_mux.h>
> >
> > #define PHY_CTRL0 0x0
> > #define PHY_CTRL0_REF_SSP_EN BIT(2)
> > @@ -50,11 +51,66 @@
> >
> > #define PHY_TUNE_DEFAULT 0xffffffff
> >
> > +#define TCA_CLK_RST 0x00
> > +#define TCA_CLK_RST_SW BIT(9)
> > +#define TCA_CLK_RST_REF_CLK_EN BIT(1)
> > +#define TCA_CLK_RST_SUSPEND_CLK_EN BIT(0)
> > +
> > +#define TCA_INTR_EN 0x04
> > +#define TCA_INTR_STS 0x08
> > +
> > +#define TCA_GCFG 0x10
> > +#define TCA_GCFG_ROLE_HSTDEV BIT(4)
> > +#define TCA_GCFG_OP_MODE GENMASK(1, 0)
> > +#define TCA_GCFG_OP_MODE_SYSMODE 0
> > +#define TCA_GCFG_OP_MODE_SYNCMODE 1
> > +
> > +#define TCA_TCPC 0x14
> > +#define TCA_TCPC_VALID BIT(4)
> > +#define TCA_TCPC_LOW_POWER_EN BIT(3)
> > +#define TCA_TCPC_ORIENTATION_NORMAL BIT(2)
> > +#define TCA_TCPC_MUX_CONTRL GENMASK(1, 0)
> > +#define TCA_TCPC_MUX_CONTRL_NO_CONN 0
> > +#define TCA_TCPC_MUX_CONTRL_USB_CONN 1
> > +
> > +#define TCA_SYSMODE_CFG 0x18
> > +#define TCA_SYSMODE_TCPC_DISABLE BIT(3)
> > +#define TCA_SYSMODE_TCPC_FLIP BIT(2)
> > +
> > +#define TCA_CTRLSYNCMODE_CFG0 0x20
> > +#define TCA_CTRLSYNCMODE_CFG1 0x20
> > +
> > +#define TCA_PSTATE 0x30
> > +#define TCA_PSTATE_CM_STS BIT(4)
> > +#define TCA_PSTATE_TX_STS BIT(3)
> > +#define TCA_PSTATE_RX_PLL_STS BIT(2)
> > +#define TCA_PSTATE_PIPE0_POWER_DOWN GENMASK(1, 0)
> > +
> > +#define TCA_GEN_STATUS 0x34
> > +#define TCA_GEN_DEV_POR BIT(12)
> > +#define TCA_GEN_REF_CLK_SEL BIT(8)
> > +#define TCA_GEN_TYPEC_FLIP_INVERT BIT(4)
> > +#define TCA_GEN_PHY_TYPEC_DISABLE BIT(3)
> > +#define TCA_GEN_PHY_TYPEC_FLIP BIT(2)
> > +
> > +#define TCA_VBUS_CTRL 0x40
> > +#define TCA_VBUS_STATUS 0x44
> > +
> > +#define TCA_INFO 0xFC
>
> lowercase please
Okay.
>
> > +
> > +struct tca_blk {
> > + struct typec_switch_dev *sw;
> > + void __iomem *base;
> > + struct mutex mutex;
> > + enum typec_orientation orientation;
> > +};
> > +
> > struct imx8mq_usb_phy {
> > struct phy *phy;
> > struct clk *clk;
> > void __iomem *base;
> > struct regulator *vbus;
> > + struct tca_blk *tca;
> > u32 pcs_tx_swing_full;
> > u32 pcs_tx_deemph_3p5db;
> > u32 tx_vref_tune;
> > @@ -64,6 +120,175 @@ struct imx8mq_usb_phy {
> > u32 comp_dis_tune;
> > };
> >
> > +
> > +static void tca_blk_orientation_set(struct tca_blk *tca,
> > + enum typec_orientation orientation);
> > +
> > +#ifdef CONFIG_TYPEC
> > +
> > +static int tca_blk_typec_switch_set(struct typec_switch_dev *sw,
> > + enum typec_orientation orientation)
> > +{
> > + struct imx8mq_usb_phy *imx_phy = typec_switch_get_drvdata(sw);
> > + struct tca_blk *tca = imx_phy->tca;
> > + int ret;
> > +
> > + if (tca->orientation == orientation)
> > + return 0;
> > +
> > + ret = clk_prepare_enable(imx_phy->clk);
> > + if (ret)
> > + return ret;
> > +
> > + tca_blk_orientation_set(tca, orientation);
> > + clk_disable_unprepare(imx_phy->clk);
> > +
> > + return 0;
> > +}
> > +
> > +static struct typec_switch_dev *tca_blk_get_typec_switch(struct platform_device *pdev,
> > + struct imx8mq_usb_phy *imx_phy)
> > +{
> > + struct device *dev = &pdev->dev;
> > + struct typec_switch_dev *sw;
> > + struct typec_switch_desc sw_desc = { };
> > +
> > + sw_desc.drvdata = imx_phy;
> > + sw_desc.fwnode = dev->fwnode;
> > + sw_desc.set = tca_blk_typec_switch_set;
> > + sw_desc.name = NULL;
> > +
> > + sw = typec_switch_register(dev, &sw_desc);
> > + if (IS_ERR(sw)) {
> > + dev_err(dev, "Error register tca orientation switch: %ld",
> > + PTR_ERR(sw));
> > + return NULL;
> > + }
> > +
> > + return sw;
> > +}
> > +
> > +static void tca_blk_put_typec_switch(struct typec_switch_dev *sw)
> > +{
> > + typec_switch_unregister(sw);
> > +}
>
> Why to put a wrapper over an API, call this instead?
1. We add a warpper tca_blk_get_typec_switch() to get typec switch device,
when it's not needed, we can call tca_blk_put_typec_switch(). So the
function name tca_blk_get/put_*() could be paired and clear enough.
2. We don't always call typec_switch_unregister(). It depends. This phy
driver can be used without typec switch in Type-C module, so we need
call typec_switch_unregister() when use typec switch and needn't call
it when not use typec switch (see below).
>
> > +
> > +#else
> > +
> > +static struct typec_switch_dev *tca_blk_get_typec_switch(struct platform_device *pdev,
> > + struct imx8mq_usb_phy *imx_phy)
> > +{
> > + return NULL;
> > +}
> > +
> > +static void tca_blk_put_typec_switch(struct typec_switch_dev *sw) {}
tca_blk_put_typec_switch() do nothing when not use typec switch.
> > +
> > +#endif /* CONFIG_TYPEC */
Thanks,
Xu Yang
