diff options
| author | Tom Rini <trini@konsulko.com> | 2024-05-18 20:20:43 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-05-19 08:16:36 -0600 |
| commit | d678a59d2d719da9e807495b4b021501f2836ca5 (patch) | |
| tree | 313e5c32e3d02d3cf1904875b1655140973126e9 /drivers/pci | |
| parent | 3be9f399e911cfc437a37ac826441f1d96da1c9b (diff) | |
| download | u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.zip u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.gz u-boot-d678a59d2d719da9e807495b4b021501f2836ca5.tar.bz2 | |
Revert "Merge patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet""
When bringing in the series 'arm: dts: am62-beagleplay: Fix Beagleplay
Ethernet"' I failed to notice that b4 noticed it was based on next and
so took that as the base commit and merged that part of next to master.
This reverts commit c8ffd1356d42223cbb8c86280a083cc3c93e6426, reversing
changes made to 2ee6f3a5f7550de3599faef9704e166e5dcace35.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/pci')
46 files changed, 46 insertions, 10 deletions
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c index f5db4bd..af0e55c 100644 --- a/drivers/pci/pci-aardvark.c +++ b/drivers/pci/pci-aardvark.c @@ -25,6 +25,7 @@ * */ +#include <common.h> #include <dm.h> #include <pci.h> #include <asm/io.h> diff --git a/drivers/pci/pci-emul-uclass.c b/drivers/pci/pci-emul-uclass.c index 166ee9f..a0b8afb 100644 --- a/drivers/pci/pci-emul-uclass.c +++ b/drivers/pci/pci-emul-uclass.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <dm.h> #include <fdtdec.h> #include <log.h> diff --git a/drivers/pci/pci-rcar-gen2.c b/drivers/pci/pci-rcar-gen2.c index 12c31e7..b81eb35 100644 --- a/drivers/pci/pci-rcar-gen2.c +++ b/drivers/pci/pci-rcar-gen2.c @@ -5,7 +5,7 @@ * Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com> */ -#include <config.h> +#include <common.h> #include <asm/io.h> #include <clk.h> #include <dm.h> diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c index 7687824..1252ef7 100644 --- a/drivers/pci/pci-rcar-gen3.c +++ b/drivers/pci/pci-rcar-gen3.c @@ -15,6 +15,7 @@ * Author: Phil Edworthy <phil.edworthy@renesas.com> */ +#include <common.h> #include <asm/io.h> #include <clk.h> #include <dm.h> diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c index 6571e65..1a48256 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -6,6 +6,7 @@ #define LOG_CATEGORY UCLASS_PCI +#include <common.h> #include <dm.h> #include <errno.h> #include <init.h> diff --git a/drivers/pci/pci_auto.c b/drivers/pci/pci_auto.c index 90f8188..0123036 100644 --- a/drivers/pci/pci_auto.c +++ b/drivers/pci/pci_auto.c @@ -8,7 +8,7 @@ * Copyright (c) 2021 Maciej W. Rozycki <macro@orcam.me.uk> */ -#include <config.h> +#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/drivers/pci/pci_auto_common.c b/drivers/pci/pci_auto_common.c index cfa818e..2f4aff0 100644 --- a/drivers/pci/pci_auto_common.c +++ b/drivers/pci/pci_auto_common.c @@ -11,6 +11,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/drivers/pci/pci_common.c b/drivers/pci/pci_common.c index a57cf11..a182512 100644 --- a/drivers/pci/pci_common.c +++ b/drivers/pci/pci_common.c @@ -9,6 +9,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. */ +#include <common.h> #include <dm.h> #include <env.h> #include <errno.h> diff --git a/drivers/pci/pci_compat.c b/drivers/pci/pci_compat.c index 8233925..9dddca8 100644 --- a/drivers/pci/pci_compat.c +++ b/drivers/pci/pci_compat.c @@ -4,6 +4,7 @@ * * Copyright (C) 2014 Google, Inc */ +#include <common.h> #include <dm.h> #include <errno.h> #include <log.h> diff --git a/drivers/pci/pci_ftpci100.c b/drivers/pci/pci_ftpci100.c index 43275b3..a177544 100644 --- a/drivers/pci/pci_ftpci100.c +++ b/drivers/pci/pci_ftpci100.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later +#include <common.h> #include <pci.h> #include <dm.h> #include <asm/io.h> diff --git a/drivers/pci/pci_mpc85xx.c b/drivers/pci/pci_mpc85xx.c index c07feba..249cfe6 100644 --- a/drivers/pci/pci_mpc85xx.c +++ b/drivers/pci/pci_mpc85xx.c @@ -4,6 +4,7 @@ * Heiko Schocher, DENX Software Engineering, hs@denx.de. * */ +#include <common.h> #include <asm/bitops.h> #include <pci.h> #include <dm.h> diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c index 7781551..8355955 100644 --- a/drivers/pci/pci_mvebu.c +++ b/drivers/pci/pci_mvebu.c @@ -10,6 +10,7 @@ * Pali Rohár <pali@kernel.org> */ +#include <common.h> #include <dm.h> #include <log.h> #include <malloc.h> diff --git a/drivers/pci/pci_rom.c b/drivers/pci/pci_rom.c index 78e5de9..438583a 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -24,6 +24,7 @@ #define LOG_CATEGORY UCLASS_PCI +#include <common.h> #include <bios_emul.h> #include <bloblist.h> #include <bootstage.h> @@ -35,7 +36,6 @@ #include <pci.h> #include <pci_rom.h> #include <spl.h> -#include <time.h> #include <vesa.h> #include <video.h> #include <acpi/acpi_s3.h> diff --git a/drivers/pci/pci_sandbox.c b/drivers/pci/pci_sandbox.c index fed0850..ca44d00 100644 --- a/drivers/pci/pci_sandbox.c +++ b/drivers/pci/pci_sandbox.c @@ -4,6 +4,7 @@ * Written by Simon Glass <sjg@chromium.org> */ +#include <common.h> #include <dm.h> #include <fdtdec.h> #include <log.h> diff --git a/drivers/pci/pci_sh7751.c b/drivers/pci/pci_sh7751.c index 3cd01e9..c1be56c 100644 --- a/drivers/pci/pci_sh7751.c +++ b/drivers/pci/pci_sh7751.c @@ -5,7 +5,7 @@ * (C) 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org> */ -#include <config.h> +#include <common.h> #include <dm.h> #include <pci.h> #include <asm/processor.h> diff --git a/drivers/pci/pci_tegra.c b/drivers/pci/pci_tegra.c index bb8832c..d6374a5 100644 --- a/drivers/pci/pci_tegra.c +++ b/drivers/pci/pci_tegra.c @@ -11,6 +11,7 @@ #define pr_fmt(fmt) "tegra-pcie: " fmt +#include <common.h> #include <clk.h> #include <dm.h> #include <errno.h> diff --git a/drivers/pci/pci_x86.c b/drivers/pci/pci_x86.c index ab76166..8d03693 100644 --- a/drivers/pci/pci_x86.c +++ b/drivers/pci/pci_x86.c @@ -3,6 +3,7 @@ * Copyright (c) 2015 Google, Inc */ +#include <common.h> #include <dm.h> #include <pci.h> #include <asm/pci.h> diff --git a/drivers/pci/pcie_apple.c b/drivers/pci/pcie_apple.c index 6a8e715..21bafba 100644 --- a/drivers/pci/pcie_apple.c +++ b/drivers/pci/pcie_apple.c @@ -16,6 +16,7 @@ * Author: Marc Zyngier <maz@kernel.org> */ +#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <dm/devres.h> diff --git a/drivers/pci/pcie_brcmstb.c b/drivers/pci/pcie_brcmstb.c index f978c64..cd45f0b 100644 --- a/drivers/pci/pcie_brcmstb.c +++ b/drivers/pci/pcie_brcmstb.c @@ -12,6 +12,7 @@ * Copyright (C) 2020 Nicolas Saenz Julienne <nsaenzjulienne@suse.de> */ +#include <common.h> #include <errno.h> #include <dm.h> #include <dm/ofnode.h> diff --git a/drivers/pci/pcie_dw_common.c b/drivers/pci/pcie_dw_common.c index 0673e51..74fb6df 100644 --- a/drivers/pci/pcie_dw_common.c +++ b/drivers/pci/pcie_dw_common.c @@ -8,6 +8,7 @@ * Copyright (C) 2018 Texas Instruments, Inc */ +#include <common.h> #include <dm.h> #include <log.h> #include <pci.h> diff --git a/drivers/pci/pcie_dw_meson.c b/drivers/pci/pcie_dw_meson.c index bb78e78..f953797 100644 --- a/drivers/pci/pcie_dw_meson.c +++ b/drivers/pci/pcie_dw_meson.c @@ -9,6 +9,7 @@ * Copyright (c) 2021 Rockchip, Inc. */ +#include <common.h> #include <clk.h> #include <dm.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_dw_mvebu.c b/drivers/pci/pcie_dw_mvebu.c index 43b9191..c41f3f1 100644 --- a/drivers/pci/pcie_dw_mvebu.c +++ b/drivers/pci/pcie_dw_mvebu.c @@ -10,11 +10,10 @@ * - drivers/pci/pcie_xilinx.c */ -#include <config.h> +#include <common.h> #include <dm.h> #include <log.h> #include <pci.h> -#include <time.h> #include <asm/global_data.h> #include <asm/io.h> #include <asm-generic/gpio.h> diff --git a/drivers/pci/pcie_dw_rockchip.c b/drivers/pci/pcie_dw_rockchip.c index 1bad51f..bc4635f 100644 --- a/drivers/pci/pcie_dw_rockchip.c +++ b/drivers/pci/pcie_dw_rockchip.c @@ -5,6 +5,7 @@ * Copyright (c) 2021 Rockchip, Inc. */ +#include <common.h> #include <clk.h> #include <dm.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_dw_sifive.c b/drivers/pci/pcie_dw_sifive.c index 6285edf..fac3f18 100644 --- a/drivers/pci/pcie_dw_sifive.c +++ b/drivers/pci/pcie_dw_sifive.c @@ -14,6 +14,7 @@ #include <asm/io.h> #include <asm-generic/gpio.h> #include <clk.h> +#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_dw_ti.c b/drivers/pci/pcie_dw_ti.c index 78a5d03..4195a02 100644 --- a/drivers/pci/pcie_dw_ti.c +++ b/drivers/pci/pcie_dw_ti.c @@ -3,6 +3,7 @@ * Copyright (C) 2018 Texas Instruments, Inc */ +#include <common.h> #include <dm.h> #include <log.h> #include <pci.h> diff --git a/drivers/pci/pcie_ecam_generic.c b/drivers/pci/pcie_ecam_generic.c index 3cb2bbb..f5bc6e3 100644 --- a/drivers/pci/pcie_ecam_generic.c +++ b/drivers/pci/pcie_ecam_generic.c @@ -7,6 +7,7 @@ * Copyright (C) 2016 Imagination Technologies */ +#include <common.h> #include <dm.h> #include <pci.h> #include <linux/ioport.h> diff --git a/drivers/pci/pcie_ecam_synquacer.c b/drivers/pci/pcie_ecam_synquacer.c index fc855df..e3e2289 100644 --- a/drivers/pci/pcie_ecam_synquacer.c +++ b/drivers/pci/pcie_ecam_synquacer.c @@ -8,6 +8,7 @@ * Copyright (C) 2021 Linaro Ltd. */ +#include <common.h> #include <dm.h> #include <pci.h> #include <log.h> diff --git a/drivers/pci/pcie_fsl.c b/drivers/pci/pcie_fsl.c index 18af23c..ec917ee 100644 --- a/drivers/pci/pcie_fsl.c +++ b/drivers/pci/pcie_fsl.c @@ -6,7 +6,7 @@ * Author: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> */ -#include <config.h> +#include <common.h> #include <dm.h> #include <malloc.h> #include <mapmem.h> diff --git a/drivers/pci/pcie_fsl_fixup.c b/drivers/pci/pcie_fsl_fixup.c index 9187e7a..f4e2278 100644 --- a/drivers/pci/pcie_fsl_fixup.c +++ b/drivers/pci/pcie_fsl_fixup.c @@ -6,6 +6,7 @@ * Author: Hou Zhiqiang <Zhiqiang.Hou@nxp.com> */ +#include <common.h> #ifdef CONFIG_OF_BOARD_SETUP #include <dm.h> #include <fdt_support.h> diff --git a/drivers/pci/pcie_imx.c b/drivers/pci/pcie_imx.c index 11c4ccb..78f2c7d 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -17,6 +17,7 @@ * those too in order to have a single modern PCIe iMX driver. */ +#include <common.h> #include <init.h> #include <log.h> #include <malloc.h> diff --git a/drivers/pci/pcie_intel_fpga.c b/drivers/pci/pcie_intel_fpga.c index 959fd36..60195cf 100644 --- a/drivers/pci/pcie_intel_fpga.c +++ b/drivers/pci/pcie_intel_fpga.c @@ -6,6 +6,7 @@ * */ +#include <common.h> #include <dm.h> #include <pci.h> #include <asm/global_data.h> diff --git a/drivers/pci/pcie_iproc.c b/drivers/pci/pcie_iproc.c index 360ef1b..d6d3a9e 100644 --- a/drivers/pci/pcie_iproc.c +++ b/drivers/pci/pcie_iproc.c @@ -4,6 +4,7 @@ * */ +#include <common.h> #include <dm.h> #include <errno.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_layerscape.c b/drivers/pci/pcie_layerscape.c index 1be3309..3c7c4ca 100644 --- a/drivers/pci/pcie_layerscape.c +++ b/drivers/pci/pcie_layerscape.c @@ -5,6 +5,7 @@ * Layerscape PCIe driver */ +#include <common.h> #include <log.h> #include <asm/global_data.h> #include <asm/io.h> diff --git a/drivers/pci/pcie_layerscape_ep.c b/drivers/pci/pcie_layerscape_ep.c index 3520488..83f7eeb 100644 --- a/drivers/pci/pcie_layerscape_ep.c +++ b/drivers/pci/pcie_layerscape_ep.c @@ -4,7 +4,7 @@ * Layerscape PCIe EP driver */ -#include <config.h> +#include <common.h> #include <asm/arch/fsl_serdes.h> #include <dm.h> #include <asm/global_data.h> diff --git a/drivers/pci/pcie_layerscape_fixup.c b/drivers/pci/pcie_layerscape_fixup.c index ec4a7e7..c519835 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -5,6 +5,7 @@ * Layerscape PCIe driver */ +#include <common.h> #include <dm.h> #include <init.h> #include <log.h> diff --git a/drivers/pci/pcie_layerscape_fixup_common.c b/drivers/pci/pcie_layerscape_fixup_common.c index f37e37f..095874a 100644 --- a/drivers/pci/pcie_layerscape_fixup_common.c +++ b/drivers/pci/pcie_layerscape_fixup_common.c @@ -7,10 +7,10 @@ * */ +#include <common.h> #include <init.h> #include <asm/arch/clock.h> #include <asm/arch/soc.h> -#include <linux/errno.h> #include <linux/libfdt.h> #include <fdt_support.h> #include "pcie_layerscape_fixup_common.h" diff --git a/drivers/pci/pcie_layerscape_gen4.c b/drivers/pci/pcie_layerscape_gen4.c index 57dc91f..021c975 100644 --- a/drivers/pci/pcie_layerscape_gen4.c +++ b/drivers/pci/pcie_layerscape_gen4.c @@ -6,7 +6,7 @@ * Author: Hou Zhiqiang <Minder.Hou@gmail.com> */ -#include <config.h> +#include <common.h> #include <log.h> #include <asm/arch/fsl_serdes.h> #include <pci.h> diff --git a/drivers/pci/pcie_layerscape_gen4_fixup.c b/drivers/pci/pcie_layerscape_gen4_fixup.c index 60c4338..b2a45bf 100644 --- a/drivers/pci/pcie_layerscape_gen4_fixup.c +++ b/drivers/pci/pcie_layerscape_gen4_fixup.c @@ -7,6 +7,7 @@ * */ +#include <common.h> #include <dm.h> #include <log.h> #include <pci.h> diff --git a/drivers/pci/pcie_layerscape_rc.c b/drivers/pci/pcie_layerscape_rc.c index e7913d4..6a5bf88 100644 --- a/drivers/pci/pcie_layerscape_rc.c +++ b/drivers/pci/pcie_layerscape_rc.c @@ -4,6 +4,7 @@ * Layerscape PCIe driver */ +#include <common.h> #include <asm/arch/fsl_serdes.h> #include <pci.h> #include <asm/global_data.h> diff --git a/drivers/pci/pcie_mediatek.c b/drivers/pci/pcie_mediatek.c index 04d8cc2..f0f34b5 100644 --- a/drivers/pci/pcie_mediatek.c +++ b/drivers/pci/pcie_mediatek.c @@ -7,6 +7,7 @@ * Honghui Zhang <honghui.zhang@mediatek.com> */ +#include <common.h> #include <clk.h> #include <dm.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_phytium.c b/drivers/pci/pcie_phytium.c index 94de89b..3bd1f5c 100644 --- a/drivers/pci/pcie_phytium.c +++ b/drivers/pci/pcie_phytium.c @@ -7,6 +7,7 @@ * Copyright (C) 2019 */ +#include <common.h> #include <dm.h> #include <pci.h> #include <asm/global_data.h> diff --git a/drivers/pci/pcie_plda_common.c b/drivers/pci/pcie_plda_common.c index 622a5ce..cd74bb4 100644 --- a/drivers/pci/pcie_plda_common.c +++ b/drivers/pci/pcie_plda_common.c @@ -6,6 +6,7 @@ * */ +#include <common.h> #include <clk.h> #include <dm.h> #include <pci.h> diff --git a/drivers/pci/pcie_rockchip.c b/drivers/pci/pcie_rockchip.c index 19f9e58..624841e 100644 --- a/drivers/pci/pcie_rockchip.c +++ b/drivers/pci/pcie_rockchip.c @@ -11,6 +11,7 @@ * Bits taken from Linux Rockchip PCIe host controller. */ +#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_starfive_jh7110.c b/drivers/pci/pcie_starfive_jh7110.c index 569fbfd..903a544 100644 --- a/drivers/pci/pcie_starfive_jh7110.c +++ b/drivers/pci/pcie_starfive_jh7110.c @@ -7,6 +7,7 @@ * */ +#include <common.h> #include <clk.h> #include <dm.h> #include <pci.h> diff --git a/drivers/pci/pcie_uniphier.c b/drivers/pci/pcie_uniphier.c index d1170b5..f2edea9 100644 --- a/drivers/pci/pcie_uniphier.c +++ b/drivers/pci/pcie_uniphier.c @@ -5,6 +5,7 @@ */ #include <clk.h> +#include <common.h> #include <dm.h> #include <dm/device_compat.h> #include <generic-phy.h> diff --git a/drivers/pci/pcie_xilinx.c b/drivers/pci/pcie_xilinx.c index a674ab0..3db460b 100644 --- a/drivers/pci/pcie_xilinx.c +++ b/drivers/pci/pcie_xilinx.c @@ -5,6 +5,7 @@ * Copyright (C) 2016 Imagination Technologies */ +#include <common.h> #include <dm.h> #include <pci.h> #include <linux/bitops.h> |