diff options
| author | Tom Rini <[email protected]> | 2021-10-07 09:02:22 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-10-07 09:02:22 -0400 |
| commit | 7a508a7245592ca44b3dc51c0293656dce60d658 (patch) | |
| tree | 640f0a3aadd7accd7467827a71af5abd0b0cdd07 /drivers | |
| parent | 11a69a9ef3f5eaccdca4dd89c7d8d91bd5b3b904 (diff) | |
| parent | 506fd30740081541d672ec2651cd23734899af76 (diff) | |
Merge tag 'u-boot-amlogic-20211007' of https://source.denx.de/u-boot/custodians/u-boot-amlogic
- Add new SoC ID for S905Y2 found in Radxa Zero
- pcie_dw_meson: fix usb fail when pci link fails to go up
- Sync Amlogic DT from Linux 5.14
- dwc3-meson-gxl: add AXG compatible
- dts: keep back HW order for MMC devices since change in Upstream Linux
- Cleanup local AXG DT USB nodes now everything is upstream
- distro_bootcmd: run pci enum for scsi_boot just like it is done for nvme_boot
- New Boards:
- Odroid-HC4: a variant of Odroid-C4 with 2 SATA ports (via PCIe-SATA bridge)
- Beelink GS-King X: A variant of the other Beelink board with 2 SATA ports (via USB3-SATA bridge)
- Banana Pi M5: another credit card SBC
- JetHub D1/H1: home automation controllers
- Radxa Zero: another RPi Zero sized SBC
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pci/pcie_dw_meson.c | 8 | ||||
| -rw-r--r-- | drivers/usb/dwc3/dwc3-meson-gxl.c | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/pci/pcie_dw_meson.c b/drivers/pci/pcie_dw_meson.c index 0525ecbea64..07da9fa5332 100644 --- a/drivers/pci/pcie_dw_meson.c +++ b/drivers/pci/pcie_dw_meson.c @@ -319,15 +319,9 @@ static int meson_pcie_init_port(struct udevice *dev) pcie_dw_setup_host(&priv->dw); - ret = meson_pcie_link_up(priv, LINK_SPEED_GEN_2); - if (ret < 0) - goto err_link_up; + meson_pcie_link_up(priv, LINK_SPEED_GEN_2); return 0; -err_link_up: - clk_disable(&priv->clk_port); - clk_disable(&priv->clk_general); - clk_disable(&priv->clk_pclk); err_deassert_bulk: reset_assert_bulk(&priv->rsts); err_power_off_phy: diff --git a/drivers/usb/dwc3/dwc3-meson-gxl.c b/drivers/usb/dwc3/dwc3-meson-gxl.c index 7c26290c15c..6c6d463203c 100644 --- a/drivers/usb/dwc3/dwc3-meson-gxl.c +++ b/drivers/usb/dwc3/dwc3-meson-gxl.c @@ -409,6 +409,7 @@ static int dwc3_meson_gxl_remove(struct udevice *dev) } static const struct udevice_id dwc3_meson_gxl_ids[] = { + { .compatible = "amlogic,meson-axg-usb-ctrl" }, { .compatible = "amlogic,meson-gxl-usb-ctrl" }, { .compatible = "amlogic,meson-gxm-usb-ctrl" }, { } |