Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bea845af authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman
Browse files

staging: vchiq_arm: Make DT firmware node mandatory 



In Linux Mainline there wasn't a chance to boot the RPi without DT.
So we can make the firmware node mandatory.

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8f8a3402

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -2794,12 +2794,11 @@ static int vchiq_probe(struct platform_device *pdev) 
	void *ptr_err;

	void *ptr_err;





	fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0);

	fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0);

/* Remove comment when booting without Device Tree is no longer supported

	if (!fw_node) {

	if (!fw_node) {

		dev_err(&pdev->dev, "Missing firmware node\n");

		dev_err(&pdev->dev, "Missing firmware node\n");

		return -ENOENT;

		return -ENOENT;

	}

	}

*/



	fw = rpi_firmware_get(fw_node);

	fw = rpi_firmware_get(fw_node);

	if (!fw)

	if (!fw)

		return -EPROBE_DEFER;

		return -EPROBE_DEFER;