On 21-08-20, 11:03, Roger Quadros wrote: > AM654x PG1.0 has a silicon bug that D+ is pulled high after POR, which > could cause enumeration failure with some USB hubs. Disabling the > USB2_PHY Charger Detect function will put D+ into the normal state. > > This addresses Silicon Errata: > i2075 - "USB2PHY: USB2PHY Charger Detect is Enabled by Default Without VBUS > Presence" > > Signed-off-by: Roger Quadros <rog...@ti.com> > Tested-by: Jan Kiszka <jan.kis...@siemens.com> > --- > Vinod/Kishon, > > As this is an errata fix, it should be targetted for 5.9-rc cycle. > Thanks. > > cheers, > -roger > > Changelog: > v5 > - don't use dt property to enable workaround. Use soc_device_match() instead. > > v4 > - fix example to fix dt_binding_check warnings > - '#phy-cells' -> "#phy-cells" > - Add 'oneOf' to compatible logic to allow just "ti,omap-usb2" as valid > > v3 > - Removed quotes from compatibles > - changed property to "ti,disable-charger-det" > > v2 > - Address Rob's comments on YAML schema. > > drivers/phy/ti/phy-omap-usb2.c | 70 +++++++++++++++++++++++++--------- > 1 file changed, 51 insertions(+), 19 deletions(-) > > diff --git a/drivers/phy/ti/phy-omap-usb2.c b/drivers/phy/ti/phy-omap-usb2.c > index cb2dd3230fa7..65d73142d4ec 100644 > --- a/drivers/phy/ti/phy-omap-usb2.c > +++ b/drivers/phy/ti/phy-omap-usb2.c > @@ -6,26 +6,31 @@ > * Author: Kishon Vijay Abraham I <kis...@ti.com> > */ > > -#include <linux/module.h> > -#include <linux/platform_device.h> > -#include <linux/slab.h> > -#include <linux/of.h> > -#include <linux/io.h> > -#include <linux/phy/omap_usb.h> > -#include <linux/usb/phy_companion.h> > #include <linux/clk.h> > -#include <linux/err.h> > -#include <linux/pm_runtime.h> > #include <linux/delay.h> > +#include <linux/err.h> > +#include <linux/io.h> > +#include <linux/mfd/syscon.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_platform.h> > #include <linux/phy/omap_control_phy.h> > +#include <linux/phy/omap_usb.h> > #include <linux/phy/phy.h> > -#include <linux/mfd/syscon.h> > +#include <linux/platform_device.h> > +#include <linux/pm_runtime.h> > #include <linux/regmap.h> > -#include <linux/of_platform.h> > +#include <linux/slab.h> > +#include <linux/sys_soc.h> > +#include <linux/usb/phy_companion.h>
Can we do reorder in a separate patch and not in a fixes patch > static int omap_usb2_probe(struct platform_device *pdev) > { > struct omap_usb *phy; > @@ -366,14 +399,14 @@ static int omap_usb2_probe(struct platform_device *pdev) > phy->mask = phy_data->mask; > phy->power_on = phy_data->power_on; > phy->power_off = phy_data->power_off; > + phy->flags = phy_data->flags; > > - if (phy_data->flags & OMAP_USB2_CALIBRATE_FALSE_DISCONNECT) { > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - phy->phy_base = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR(phy->phy_base)) > - return PTR_ERR(phy->phy_base); > - phy->flags |= OMAP_USB2_CALIBRATE_FALSE_DISCONNECT; > - } > + omap_usb2_init_errata(phy); > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + phy->phy_base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(phy->phy_base)) > + return PTR_ERR(phy->phy_base); > > phy->syscon_phy_power = syscon_regmap_lookup_by_phandle(node, > "syscon-phy-power"); > @@ -405,7 +438,6 @@ static int omap_usb2_probe(struct platform_device *pdev) > } > } > > - this does not belong to this patch, pls feel free to send a separate one for this -- ~Vinod