Commit f48cc509 authored by Nicolas Saenz Julienne's avatar Nicolas Saenz Julienne Committed by Greg Kroah-Hartman
Browse files

Revert "PCI: brcmstb: Wait for Raspberry Pi's firmware when present" 



This reverts commit 44331189.

Now that the VL805 init routine is run through a reset controller driver
the device dependencies are being taken care of by the device core. No
need to do it manually here.

Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Acked-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: default avatarNicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200629161845.6021-10-nsaenzjulienne@suse.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b26057a

drivers/pci/controller/pcie-brcmstb.c

+0 −17
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
#include <linux/string.h>

#include <linux/types.h>



#include <soc/bcm2835/raspberrypi-firmware.h>



#include "../pci.h"



/* BRCM_PCIE_CAP_REGS - Offset for the mandatory capability config regs */
@@ -931,24 +929,9 @@ static int brcm_pcie_probe(struct platform_device *pdev) 
{

	struct device_node *np = pdev->dev.of_node, *msi_np;

	struct pci_host_bridge *bridge;

	struct device_node *fw_np;

	struct brcm_pcie *pcie;

	int ret;



	/*

	 * We have to wait for Raspberry Pi's firmware interface to be up as a

	 * PCI fixup, rpi_firmware_init_vl805(), depends on it. This driver's

	 * probe can race with the firmware interface's (see

	 * drivers/firmware/raspberrypi.c) and potentially break the PCI fixup.

	 */

	fw_np = of_find_compatible_node(NULL, NULL,

					"raspberrypi,bcm2835-firmware");

	if (fw_np && !rpi_firmware_get(fw_np)) {

		of_node_put(fw_np);

		return -EPROBE_DEFER;

	}

	of_node_put(fw_np);



	bridge = devm_pci_alloc_host_bridge(&pdev->dev, sizeof(*pcie));

	if (!bridge)

		return -ENOMEM;