[U-Boot] [PATCH v2 04/10] phy: Add a new driver for OMAP's USB2 PHYs

Jean-Jacques Hiblot jjhiblot at ti.com
Wed Mar 14 17:37:28 UTC 2018



On 14/03/2018 18:02, Patrice CHOTARD wrote:
> Hi Jean Jacques
>
> On 03/14/2018 05:18 PM, Jean-Jacques Hiblot wrote:
>> This drivers supports the USB2 PHY found on omap5 and dra7 SOCs.
>>
>> Signed-off-by: Jean-Jacques Hiblot <jjhiblot at ti.com>
>>
>> ---
>>
>> Changes in v2:
>> - omap-usb2-phy: Implement power_on and power_off callbacks
>>
>>    drivers/phy/Kconfig         |   8 ++
>>    drivers/phy/Makefile        |   1 +
>>    drivers/phy/omap-usb2-phy.c | 198 ++++++++++++++++++++++++++++++++++++++++++++
>>    3 files changed, 207 insertions(+)
>>    create mode 100644 drivers/phy/omap-usb2-phy.c
>>
>> diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
>> index 3b9a09c..dbf4e4d 100644
>> --- a/drivers/phy/Kconfig
>> +++ b/drivers/phy/Kconfig
>> @@ -85,4 +85,12 @@ config STI_USB_PHY
>>    	  used by USB2 and USB3 Host controllers available on
>>    	  STiH407 SoC families.
>>    
>> +config OMAP_USB2_PHY
>> +	bool "Support OMAP's USB2 PHY"
>> +	depends on PHY
>> +	depends on SYSCON
>> +	help
>> +	  Support for the OMAP's USB2 PHY.
>> +	  This PHY is found on OMAP devices supporting USB2.
>> +
>>    endmenu
>> diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile
>> index 668040b..86b77d8 100644
>> --- a/drivers/phy/Makefile
>> +++ b/drivers/phy/Makefile
>> @@ -10,3 +10,4 @@ obj-$(CONFIG_$(SPL_)NOP_PHY) += nop-phy.o
>>    obj-$(CONFIG_PHY_SANDBOX) += sandbox-phy.o
>>    obj-$(CONFIG_$(SPL_)PIPE3_PHY) += ti-pipe3-phy.o
>>    obj-$(CONFIG_STI_USB_PHY) += sti_usb_phy.o
>> +obj-$(CONFIG_OMAP_USB2_PHY) += omap-usb2-phy.o
>> diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c
>> new file mode 100644
>> index 0000000..9dcf7df
>> --- /dev/null
>> +++ b/drivers/phy/omap-usb2-phy.c
>> @@ -0,0 +1,198 @@
>> +/*
>> + * OMAP USB2 PHY driver
>> + *
>> + * Copyright (c) 2017
>> + * Jean-Jacques Hiblot <jjhiblot at ti.com>
>> + * based on dwc3-sti-glue
>> + *
>> + * SPDX-License-Identifier:	GPL-2.0+
>> + */
>> +
>> +#include <common.h>
>> +#include <asm/io.h>
>> +#include <dm.h>
>> +#include <errno.h>
>> +#include <generic-phy.h>
>> +#include <regmap.h>
>> +#include <syscon.h>
>> +
>> +#define OMAP_USB2_CALIBRATE_FALSE_DISCONNECT	BIT(0)
>> +
>> +#define OMAP_DEV_PHY_PD		BIT(0)
>> +#define OMAP_USB2_PHY_PD	BIT(28)
>> +
>> +#define USB2PHY_DISCON_BYP_LATCH	BIT(31)
>> +#define USB2PHY_ANA_CONFIG1		(0x4c)
>> +
>> +DECLARE_GLOBAL_DATA_PTR;
>> +
>> +struct omap_usb2_phy {
>> +	struct regmap *pwr_regmap;
>> +	ulong flags;
>> +	void *phy_base;
>> +	u32 pwr_reg_offset;
>> +};
>> +
>> +struct usb_phy_data {
>> +	const char *label;
>> +	u8 flags;
>> +	u32 mask;
>> +	u32 power_on;
>> +	u32 power_off;
>> +};
>> +
>> +static const struct usb_phy_data omap5_usb2_data = {
>> +	.label = "omap5_usb2",
>> +	.flags = 0,
>> +	.mask = OMAP_DEV_PHY_PD,
>> +	.power_off = OMAP_DEV_PHY_PD,
>> +};
>> +
>> +static const struct usb_phy_data dra7x_usb2_data = {
>> +	.label = "dra7x_usb2",
>> +	.flags = OMAP_USB2_CALIBRATE_FALSE_DISCONNECT,
>> +	.mask = OMAP_DEV_PHY_PD,
>> +	.power_off = OMAP_DEV_PHY_PD,
>> +};
>> +
>> +static const struct usb_phy_data dra7x_usb2_phy2_data = {
>> +	.label = "dra7x_usb2_phy2",
>> +	.flags = OMAP_USB2_CALIBRATE_FALSE_DISCONNECT,
>> +	.mask = OMAP_USB2_PHY_PD,
>> +	.power_off = OMAP_USB2_PHY_PD,
>> +};
>> +
>> +static const struct udevice_id omap_usb2_id_table[] = {
>> +	{
>> +		.compatible = "ti,omap5-usb2",
>> +		.data = (ulong)&omap5_usb2_data,
>> +	},
>> +	{
>> +		.compatible = "ti,dra7x-usb2",
>> +		.data = (ulong)&dra7x_usb2_data,
>> +	},
>> +	{
>> +		.compatible = "ti,dra7x-usb2-phy2",
>> +		.data = (ulong)&dra7x_usb2_phy2_data,
>> +	},
>> +	{},
>> +};
>> +
>> +static int omap_usb_phy_power(struct phy *usb_phy, bool on)
>> +{
>> +	struct udevice *dev = usb_phy->dev;
>> +	const struct usb_phy_data *data;
>> +	const struct omap_usb2_phy *phy = dev_get_priv(dev);
>> +	u32 val;
>> +	int rc;
>> +
>> +	data = (const struct usb_phy_data *)dev_get_driver_data(dev);
>> +	if (!data)
>> +		return -EINVAL;
>> +
>> +	rc = regmap_read(phy->pwr_regmap, phy->pwr_reg_offset, &val);
>> +	if (rc)
>> +		return rc;
>> +	val &= ~data->mask;
>> +	if (on)
>> +		val |= data->power_on;
>> +	else
>> +		val |= data->power_off;
>> +	rc = regmap_write(phy->pwr_regmap, phy->pwr_reg_offset, val);
>> +	if (rc)
>> +		return rc;
>> +
>> +	return 0;
>> +}
>> +
>> +static int omap_usb2_phy_init(struct phy *usb_phy)
>> +{
>> +	struct udevice *dev = usb_phy->dev;
>> +	struct omap_usb2_phy *priv = dev_get_priv(dev);
>> +	u32 val;
>> +
>> +	if (priv->flags & OMAP_USB2_CALIBRATE_FALSE_DISCONNECT) {
>> +		/*
>> +		 *
>> +		 * Reduce the sensitivity of internal PHY by enabling the
>> +		 * DISCON_BYP_LATCH of the USB2PHY_ANA_CONFIG1 register. This
>> +		 * resolves issues with certain devices which can otherwise
>> +		 * be prone to false disconnects.
>> +		 *
>> +		 */
>> +		val = readl(priv->phy_base + USB2PHY_ANA_CONFIG1);
>> +		val |= USB2PHY_DISCON_BYP_LATCH;
>> +		writel(val, priv->phy_base + USB2PHY_ANA_CONFIG1);
>> +	}
>> +
>> +	return 0;
>> +}
>> +
>> +static int omap_usb2_phy_power_on(struct phy *usb_phy)
>> +{
>> +	return omap_usb_phy_power(usb_phy, true);
>> +}
>> +
>> +static int omap_usb2_phy_power_off(struct phy *usb_phy)
>> +{
>> +	return omap_usb_phy_power(usb_phy, false);
>> +}
>> +
>> +static int omap_usb2_phy_exit(struct phy *usb_phy)
>> +{
>> +	return omap_usb_phy_power(usb_phy, false);
> Is it intentional to call omap_usb_phy_power() here ? as it is already
> called in omap_usb2_phy_power_off().
It is just to make sure that the power is off, even if the power_off() 
callback hadn't been called.
It is not really required, but it doesn't hurt.

JJ

>
>> +}
>> +
>> +struct phy_ops omap_usb2_phy_ops = {
>> +	.init = omap_usb2_phy_init,
>> +	.power_on = omap_usb2_phy_power_on,
>> +	.power_off = omap_usb2_phy_power_off,
>> +	.exit = omap_usb2_phy_exit,
>> +};
>> +
>> +int omap_usb2_phy_probe(struct udevice *dev)
>> +{
>> +	int rc;
>> +	struct regmap *regmap;
>> +	struct omap_usb2_phy *priv = dev_get_priv(dev);
>> +	const struct usb_phy_data *data;
>> +	u32 tmp[2];
>> +
>> +	data = (const struct usb_phy_data *)dev_get_driver_data(dev);
>> +	if (!data)
>> +		return -EINVAL;
>> +
>> +	if (data->flags & OMAP_USB2_CALIBRATE_FALSE_DISCONNECT) {
>> +		u32 base = dev_read_addr(dev);
>> +
>> +		if (base == FDT_ADDR_T_NONE)
>> +			return -EINVAL;
>> +		priv->phy_base = (void *)base;
>> +		priv->flags |= OMAP_USB2_CALIBRATE_FALSE_DISCONNECT;
>> +	}
>> +
>> +	regmap = syscon_regmap_lookup_by_phandle(dev, "syscon-phy-power");
>> +	if (IS_ERR(regmap)) {
>> +		printf("can't get regmap (err %ld)\n", PTR_ERR(regmap));
> dev_err() would be more appropriate
>
>> +		return PTR_ERR(regmap);
>> +	}
>> +	priv->pwr_regmap = regmap;
>> +
>> +	rc =  dev_read_u32_array(dev, "syscon-phy-power", tmp, 2);
>> +	if (rc) {
>> +		printf("couldn't get power reg. offset (err %d)\n", rc);
> ditto
>
>> +		return rc;
>> +	}
>> +	priv->pwr_reg_offset = tmp[1];
>> +
>> +	return 0;
>> +}
>> +
>> +U_BOOT_DRIVER(omap_usb2_phy) = {
>> +	.name = "omap_usb2_phy",
>> +	.id = UCLASS_PHY,
>> +	.of_match = omap_usb2_id_table,
>> +	.probe = omap_usb2_phy_probe,
>> +	.ops = &omap_usb2_phy_ops,
>> +	.priv_auto_alloc_size = sizeof(struct omap_usb2_phy),
>> +};



More information about the U-Boot mailing list