leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix pinctrl BIAS setup which caused failure on some eMMC models

Browse Source 
- fix dr-mode configuration in dwc3-meson-g12a glue driver
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEPVPGJshWBf4d9CyLd9zb2sjISdEFAl/Ya8AACgkQd9zb2sjI
 SdFv9hAAgHwTsWk70CaCIbkx0Vzg+6bQXaACoziLZETC3KlM/+/jcOSEVZJ9J9dl
 DC1ztuxebRiCGq+wP+frSAJZjywvT4eOZCJvEk/xO+/BZnkccvrX6IFWzufCJCEn
 IIVCNWvDhwOqrRWf1MfDH7I0IgJbrd9UHceJ1COItBKE80oTrox/b8ZKXppV+F7S
 eExoFCzEpmf1AXUoHslZVipcD6jU/uMdrNOkqm5LnpMd9PGB/JawRuFw/YnXeyO5
 QNbgnOL3Z5u3hBLgDwax9bR4nrN++DRhzIlgRx3uD9k466h1W677k3IMJOPwUDlo
 n+v5D1mavO2N+fN73ornQ4yry/2WpPW6j7PKHJq5j5QmVggW4plB9e+lvZ68G8R1
 kPSb6eiFL+1k0+I6d+N+21YMO32jurvrxifQUOXuQlzAjNqKvLyyQZGP1iLTiHqy
 vz6nWbQCn9A7Ug0xawzrGA4qDc+7Ltg+HU/a1aemXDTMBynHDh0wgvJnAL1P0RVL
 LJLrPcnNzjNTclcxWd5p/6FooQbtlEYUHsk2QmwBdqZCDxSKbOvvLYIg5eHX4N+G
 5CCRF/GFcjGw8zxt8Y+9mtgWAUIXLmvzXCxCt9vGKJ2XgPjoqF8C0eutklQ/TtHf
 +RlJUoQaXM1zzmB1lNu0VyA9vGrRSoHf09G1EgQ8GedzOEPIv74=
 =yjve
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Tom Rini 2020-12-15 09:08:14 -05:00
commit 56f02f0ae8
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pinctrl/meson/pinctrl-meson.c
View File

@ -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, &reg, &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;
}

3
drivers/usb/dwc3/dwc3-meson-g12a.c
View File

@ -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