diff options
| author | Tom Rini <trini@konsulko.com> | 2020-12-15 09:08:14 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-12-15 09:08:14 -0500 |
| commit | 56f02f0ae85da8bb2dca66c7816dbb1429f92072 (patch) | |
| tree | 03d5f3442dd9ddba2c62cd82a5d9f27b0497e220 | |
| parent | f40825e18e0a8560991072114b9b10b33fdad95b (diff) | |
| parent | 5ccd5d2cc98224108ae9fb09593a862c9caa5e80 (diff) | |
| download | u-boot-56f02f0ae85da8bb2dca66c7816dbb1429f92072.zip u-boot-56f02f0ae85da8bb2dca66c7816dbb1429f92072.tar.gz u-boot-56f02f0ae85da8bb2dca66c7816dbb1429f92072.tar.bz2 | |
Merge tag 'u-boot-amlogic-20201215' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- fix pinctrl BIAS setup which caused failure on some eMMC models
- fix dr-mode configuration in dwc3-meson-g12a glue driver
| -rw-r--r-- | drivers/pinctrl/meson/pinctrl-meson.c | 4 | ||||
| -rw-r--r-- | drivers/usb/dwc3/dwc3-meson-g12a.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index d4539b0..5065b62 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -216,13 +216,13 @@ static int meson_pinconf_bias_set(struct udevice *dev, unsigned int pin, } /* othewise, enable the bias and select level */ - clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), 1); + clrsetbits_le32(priv->reg_pullen + reg, BIT(bit), BIT(bit)); ret = meson_gpio_calc_reg_and_bit(dev, offset, REG_PULL, ®, &bit); if (ret) return ret; clrsetbits_le32(priv->reg_pull + reg, BIT(bit), - param == PIN_CONFIG_BIAS_PULL_UP); + (param == PIN_CONFIG_BIAS_PULL_UP ? BIT(bit) : 0)); return 0; } diff --git a/drivers/usb/dwc3/dwc3-meson-g12a.c b/drivers/usb/dwc3/dwc3-meson-g12a.c index 6567502..6f0bac2 100644 --- a/drivers/usb/dwc3/dwc3-meson-g12a.c +++ b/drivers/usb/dwc3/dwc3-meson-g12a.c @@ -269,9 +269,6 @@ int dwc3_meson_g12a_force_mode(struct udevice *dev, enum usb_dr_mode mode) if (!priv->phys[USB2_OTG_PHY].dev) return -EINVAL; - if (mode == priv->otg_mode) - return 0; - if (mode == USB_DR_MODE_HOST) debug("%s: switching to Host Mode\n", __func__); else |