diff options
author | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-05-20 13:35:03 -0600 |
commit | 03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch) | |
tree | 57d5eac5f8efb015eb0415824512a29d5e20638e /drivers/pci | |
parent | d4781422d1268aa6deca3e49d2fb227e79c160b4 (diff) | |
download | u-boot-WIP/20May2024-next.zip u-boot-WIP/20May2024-next.tar.gz u-boot-WIP/20May2024-next.tar.bz2 |
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"WIP/20May2024-next
As part of bringing the master branch back in to next, we need to allow
for all of these changes to exist here.
Reported-by: Jonas Karlman <jonas@kwiboo.se>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/pci')
46 files changed, 10 insertions, 46 deletions
diff --git a/drivers/pci/pci-aardvark.c b/drivers/pci/pci-aardvark.c index af0e55c..f5db4bd 100644 --- a/drivers/pci/pci-aardvark.c +++ b/drivers/pci/pci-aardvark.c @@ -25,7 +25,6 @@ * */ -#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 a0b8afb..166ee9f 100644 --- a/drivers/pci/pci-emul-uclass.c +++ b/drivers/pci/pci-emul-uclass.c @@ -4,7 +4,6 @@ * 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 b81eb35..12c31e7 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 <common.h> +#include <config.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 1252ef7..7687824 100644 --- a/drivers/pci/pci-rcar-gen3.c +++ b/drivers/pci/pci-rcar-gen3.c @@ -15,7 +15,6 @@ * 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 1a48256..6571e65 100644 --- a/drivers/pci/pci-uclass.c +++ b/drivers/pci/pci-uclass.c @@ -6,7 +6,6 @@ #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 0123036..90f8188 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 <common.h> +#include <config.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 2f4aff0..cfa818e 100644 --- a/drivers/pci/pci_auto_common.c +++ b/drivers/pci/pci_auto_common.c @@ -11,7 +11,6 @@ * 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 a182512..a57cf11 100644 --- a/drivers/pci/pci_common.c +++ b/drivers/pci/pci_common.c @@ -9,7 +9,6 @@ * 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 9dddca8..8233925 100644 --- a/drivers/pci/pci_compat.c +++ b/drivers/pci/pci_compat.c @@ -4,7 +4,6 @@ * * 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 a177544..43275b3 100644 --- a/drivers/pci/pci_ftpci100.c +++ b/drivers/pci/pci_ftpci100.c @@ -1,6 +1,5 @@ // 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 249cfe6..c07feba 100644 --- a/drivers/pci/pci_mpc85xx.c +++ b/drivers/pci/pci_mpc85xx.c @@ -4,7 +4,6 @@ * 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 8355955..7781551 100644 --- a/drivers/pci/pci_mvebu.c +++ b/drivers/pci/pci_mvebu.c @@ -10,7 +10,6 @@ * 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 438583a..78e5de9 100644 --- a/drivers/pci/pci_rom.c +++ b/drivers/pci/pci_rom.c @@ -24,7 +24,6 @@ #define LOG_CATEGORY UCLASS_PCI -#include <common.h> #include <bios_emul.h> #include <bloblist.h> #include <bootstage.h> @@ -36,6 +35,7 @@ #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 ca44d00..fed0850 100644 --- a/drivers/pci/pci_sandbox.c +++ b/drivers/pci/pci_sandbox.c @@ -4,7 +4,6 @@ * 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 c1be56c..3cd01e9 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 <common.h> +#include <config.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 d6374a5..bb8832c 100644 --- a/drivers/pci/pci_tegra.c +++ b/drivers/pci/pci_tegra.c @@ -11,7 +11,6 @@ #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 8d03693..ab76166 100644 --- a/drivers/pci/pci_x86.c +++ b/drivers/pci/pci_x86.c @@ -3,7 +3,6 @@ * 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 21bafba..6a8e715 100644 --- a/drivers/pci/pcie_apple.c +++ b/drivers/pci/pcie_apple.c @@ -16,7 +16,6 @@ * 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 cd45f0b..f978c64 100644 --- a/drivers/pci/pcie_brcmstb.c +++ b/drivers/pci/pcie_brcmstb.c @@ -12,7 +12,6 @@ * 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 74fb6df..0673e51 100644 --- a/drivers/pci/pcie_dw_common.c +++ b/drivers/pci/pcie_dw_common.c @@ -8,7 +8,6 @@ * 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 f953797..bb78e78 100644 --- a/drivers/pci/pcie_dw_meson.c +++ b/drivers/pci/pcie_dw_meson.c @@ -9,7 +9,6 @@ * 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 c41f3f1..43b9191 100644 --- a/drivers/pci/pcie_dw_mvebu.c +++ b/drivers/pci/pcie_dw_mvebu.c @@ -10,10 +10,11 @@ * - drivers/pci/pcie_xilinx.c */ -#include <common.h> +#include <config.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 bc4635f..1bad51f 100644 --- a/drivers/pci/pcie_dw_rockchip.c +++ b/drivers/pci/pcie_dw_rockchip.c @@ -5,7 +5,6 @@ * 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 fac3f18..6285edf 100644 --- a/drivers/pci/pcie_dw_sifive.c +++ b/drivers/pci/pcie_dw_sifive.c @@ -14,7 +14,6 @@ #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 4195a02..78a5d03 100644 --- a/drivers/pci/pcie_dw_ti.c +++ b/drivers/pci/pcie_dw_ti.c @@ -3,7 +3,6 @@ * 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 f5bc6e3..3cb2bbb 100644 --- a/drivers/pci/pcie_ecam_generic.c +++ b/drivers/pci/pcie_ecam_generic.c @@ -7,7 +7,6 @@ * 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 e3e2289..fc855df 100644 --- a/drivers/pci/pcie_ecam_synquacer.c +++ b/drivers/pci/pcie_ecam_synquacer.c @@ -8,7 +8,6 @@ * 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 ec917ee..18af23c 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 <common.h> +#include <config.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 f4e2278..9187e7a 100644 --- a/drivers/pci/pcie_fsl_fixup.c +++ b/drivers/pci/pcie_fsl_fixup.c @@ -6,7 +6,6 @@ * 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 78f2c7d..11c4ccb 100644 --- a/drivers/pci/pcie_imx.c +++ b/drivers/pci/pcie_imx.c @@ -17,7 +17,6 @@ * 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 60195cf..959fd36 100644 --- a/drivers/pci/pcie_intel_fpga.c +++ b/drivers/pci/pcie_intel_fpga.c @@ -6,7 +6,6 @@ * */ -#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 d6d3a9e..360ef1b 100644 --- a/drivers/pci/pcie_iproc.c +++ b/drivers/pci/pcie_iproc.c @@ -4,7 +4,6 @@ * */ -#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 3c7c4ca..1be3309 100644 --- a/drivers/pci/pcie_layerscape.c +++ b/drivers/pci/pcie_layerscape.c @@ -5,7 +5,6 @@ * 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 83f7eeb..3520488 100644 --- a/drivers/pci/pcie_layerscape_ep.c +++ b/drivers/pci/pcie_layerscape_ep.c @@ -4,7 +4,7 @@ * Layerscape PCIe EP driver */ -#include <common.h> +#include <config.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 c519835..ec4a7e7 100644 --- a/drivers/pci/pcie_layerscape_fixup.c +++ b/drivers/pci/pcie_layerscape_fixup.c @@ -5,7 +5,6 @@ * 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 095874a..f37e37f 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 021c975..57dc91f 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 <common.h> +#include <config.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 b2a45bf..60c4338 100644 --- a/drivers/pci/pcie_layerscape_gen4_fixup.c +++ b/drivers/pci/pcie_layerscape_gen4_fixup.c @@ -7,7 +7,6 @@ * */ -#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 6a5bf88..e7913d4 100644 --- a/drivers/pci/pcie_layerscape_rc.c +++ b/drivers/pci/pcie_layerscape_rc.c @@ -4,7 +4,6 @@ * 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 f0f34b5..04d8cc2 100644 --- a/drivers/pci/pcie_mediatek.c +++ b/drivers/pci/pcie_mediatek.c @@ -7,7 +7,6 @@ * 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 3bd1f5c..94de89b 100644 --- a/drivers/pci/pcie_phytium.c +++ b/drivers/pci/pcie_phytium.c @@ -7,7 +7,6 @@ * 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 cd74bb4..622a5ce 100644 --- a/drivers/pci/pcie_plda_common.c +++ b/drivers/pci/pcie_plda_common.c @@ -6,7 +6,6 @@ * */ -#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 624841e..19f9e58 100644 --- a/drivers/pci/pcie_rockchip.c +++ b/drivers/pci/pcie_rockchip.c @@ -11,7 +11,6 @@ * 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 903a544..569fbfd 100644 --- a/drivers/pci/pcie_starfive_jh7110.c +++ b/drivers/pci/pcie_starfive_jh7110.c @@ -7,7 +7,6 @@ * */ -#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 f2edea9..d1170b5 100644 --- a/drivers/pci/pcie_uniphier.c +++ b/drivers/pci/pcie_uniphier.c @@ -5,7 +5,6 @@ */ #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 3db460b..a674ab0 100644 --- a/drivers/pci/pcie_xilinx.c +++ b/drivers/pci/pcie_xilinx.c @@ -5,7 +5,6 @@ * Copyright (C) 2016 Imagination Technologies */ -#include <common.h> #include <dm.h> #include <pci.h> #include <linux/bitops.h> |