diff options
author | Stefan Wahren <stefan.wahren@i2se.com> | 2016-10-26 18:34:18 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-10-27 15:23:53 +0200 |
commit | bea845af8d877310bbbacd54e8252566019d5a5e (patch) | |
tree | e5c9e4a4aa27f23c52b161d8ef671ec4214b8d3a /drivers/staging/vc04_services | |
parent | staging: vchiq_arm: add MODULE_DESCRIPTION (diff) | |
download | linux-dev-bea845af8d877310bbbacd54e8252566019d5a5e.tar.xz linux-dev-bea845af8d877310bbbacd54e8252566019d5a5e.zip |
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: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vc04_services')
-rw-r--r-- | drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 119ca145dbc4..ce3ba37fbeb0 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -2794,12 +2794,11 @@ static int vchiq_probe(struct platform_device *pdev) void *ptr_err; 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) { dev_err(&pdev->dev, "Missing firmware node\n"); return -ENOENT; } -*/ + fw = rpi_firmware_get(fw_node); if (!fw) return -EPROBE_DEFER; |