diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-12 14:26:57 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-12 14:26:57 +0300 |
| commit | 47e9c70421d75336336097c1425028b40e4f0b54 (patch) | |
| tree | b8ee7f6b2c0e6bfe39511f64dec25fad3b28de0b /drivers/phy | |
| parent | 726561a9412abe50875b7791feab94f411d76199 (diff) | |
| parent | 555ee3949307648d6c40081b30e212af075ab8a8 (diff) | |
| download | u-boot-47e9c70421d75336336097c1425028b40e4f0b54.tar.xz | |
Merge tag 'ti-v2021.01-rc1' of https://gitlab.denx.de/u-boot/custodians/u-boot-ti
- Minor cleanup on K3 env variables
- Fix OSPI compatible for J721e
- Drop unused property in omap-usb2-phy
- Update Maintainer for am335x-guardian board.
Diffstat (limited to 'drivers/phy')
| -rw-r--r-- | drivers/phy/omap-usb2-phy.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/phy/omap-usb2-phy.c b/drivers/phy/omap-usb2-phy.c index adc454ddd4..a981cb2f8d 100644 --- a/drivers/phy/omap-usb2-phy.c +++ b/drivers/phy/omap-usb2-phy.c @@ -12,6 +12,7 @@ #include <errno.h> #include <generic-phy.h> #include <regmap.h> +#include <soc.h> #include <syscon.h> #include <linux/bitops.h> #include <linux/err.h> @@ -196,6 +197,11 @@ struct phy_ops omap_usb2_phy_ops = { .exit = omap_usb2_phy_exit, }; +static const struct soc_attr am65x_sr10_soc_devices[] = { + { .family = "AM65X", .revision = "SR1.0" }, + { /* sentinel */ } +}; + int omap_usb2_phy_probe(struct udevice *dev) { int rc; @@ -222,10 +228,9 @@ int omap_usb2_phy_probe(struct udevice *dev) * Disabling the USB2_PHY Charger Detect function will put D+ * into the normal state. * - * Using property "ti,dis-chg-det-quirk" in the DT usb2-phy node - * to enable this workaround for AM654x PG1.0. + * Enable this workaround for AM654x PG1.0. */ - if (dev_read_bool(dev, "ti,dis-chg-det-quirk")) + if (soc_device_match(am65x_sr10_soc_devices)) priv->flags |= OMAP_USB2_DISABLE_CHG_DET; regmap = syscon_regmap_lookup_by_phandle(dev, "syscon-phy-power"); |