Commit 1c3d1aa0 authored by Tom Rini's avatar Tom Rini
Browse files

Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell

- Fix "Assert PERST# signal when unloading driver" in a37xx PCI
  driver (Pali)
- Fix SPL on armada-xp-gp (add u-boot,dm-pre-reloc and alias) (myself)
parents e426e2d9 0eb0eb4a
// SPDX-License-Identifier: GPL-2.0+
/ {
soc {
internal-regs {
serial@12000 {
u-boot,dm-pre-reloc;
};
};
};
};
&spi0 {
u-boot,dm-pre-reloc;
spi-flash@0 {
u-boot,dm-pre-reloc;
};
};
...@@ -31,6 +31,10 @@ ...@@ -31,6 +31,10 @@
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
aliases {
spi0 = &spi0;
};
memory@0 { memory@0 {
device_type = "memory"; device_type = "memory";
/* /*
......
...@@ -649,9 +649,6 @@ static int pcie_advk_remove(struct udevice *dev) ...@@ -649,9 +649,6 @@ static int pcie_advk_remove(struct udevice *dev)
struct pcie_advk *pcie = dev_get_priv(dev); struct pcie_advk *pcie = dev_get_priv(dev);
u32 reg; u32 reg;
if (dm_gpio_is_valid(&pcie->reset_gpio))
dm_gpio_set_value(&pcie->reset_gpio, 1);
reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG); reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
reg &= ~LINK_TRAINING_EN; reg &= ~LINK_TRAINING_EN;
advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG); advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment