Merge git://git.denx.de/u-boot-marvell
- Move Armada XP / 38x PCIe driver to DM_PCI from me
- Move Armada XP / 38x LCD driver to DM_VIDEO from me
- Add uDPU board (Armada-3720) from Vladimir
[trini: Fix warning in pci-uclass.c by removing ret from
pci_uclass_child_post_bind as it no longer calls functions with
a return code to catch.]
Signed-off-by: Tom Rini <trini@konsulko.com>II
diff --git a/configs/kylin-rk3036_defconfig.rej b/configs/kylin-rk3036_defconfig.rej
deleted file mode 100644
index 5478e65..0000000
--- a/configs/kylin-rk3036_defconfig.rej
+++ /dev/null
@@ -1,10 +0,0 @@
---- configs/kylin-rk3036_defconfig
-+++ configs/kylin-rk3036_defconfig
-@@ -8,6 +8,7 @@ CONFIG_ROCKCHIP_RK3036=y
- CONFIG_TARGET_KYLIN_RK3036=y
- CONFIG_SPL_STACK_R_ADDR=0x80000
- CONFIG_DEFAULT_DEVICE_TREE="rk3036-sdk"
-+CONFIG_DEBUG_UART=y
- CONFIG_SPL_SYS_MALLOC_F_LEN=0x0
- # CONFIG_ANDROID_BOOT_IMAGE is not set
- # CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/puma-rk3399_defconfig.rej b/configs/puma-rk3399_defconfig.rej
deleted file mode 100644
index 78a1819..0000000
--- a/configs/puma-rk3399_defconfig.rej
+++ /dev/null
@@ -1,10 +0,0 @@
---- configs/puma-rk3399_defconfig
-+++ configs/puma-rk3399_defconfig
-@@ -74,7 +74,6 @@ CONFIG_ETH_DESIGNWARE=y
- CONFIG_GMAC_ROCKCHIP=y
- CONFIG_PINCTRL=y
- CONFIG_SPL_PINCTRL=y
--CONFIG_PINCTRL_ROCKCHIP_RK3399=y
- CONFIG_DM_PMIC=y
- CONFIG_DM_PMIC_FAN53555=y
- CONFIG_PMIC_RK8XX=y
diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 47f3cc9..824fa11 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -1026,7 +1026,6 @@
static int pci_uclass_child_post_bind(struct udevice *dev)
{
struct pci_child_platdata *pplat;
- int ret;
if (!dev_of_valid(dev))
return 0;
@@ -1038,8 +1037,6 @@
/* Extract the devfn from fdt_pci_addr */
pplat->devfn = pci_get_devfn(dev);
- if (ret < 0)
- return ret;
return 0;
}