diff mbox series

[SRU,H/raspi,1/5] clk: bcm2835: Pass DT node to rpi_firmware_get

Message ID 20211112120411.1541681-2-juergh@canonical.com
State New
Headers show
Series Unable to boot rpi2, rpi3, rpi3b+, rpi3a+, and cm3+ after upgrade to kernel 5.11.0-1022.23-raspi (LP: #1950064) | expand

Commit Message

Juerg Haefliger Nov. 12, 2021, 12:04 p.m. UTC 
From: Phil Elwell <phil@raspberrypi.com>

BugLink: https://bugs.launchpad.net/bugs/1950064

The fw_node pointer has already been retrieved, and using it allows
us to remove a downstream patch to the firmware driver.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
(cherry picked from commit 30de7231e51c1322daab32afde733bc1f536a700 linux-rpi)
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
---
 drivers/clk/bcm/clk-bcm2835.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c
index 20155bb28e3c..39fabced602a 100644
--- a/drivers/clk/bcm/clk-bcm2835.c
+++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -2345,7 +2345,7 @@  static int bcm2835_clk_probe(struct platform_device *pdev)
 
 	fw_node = of_parse_phandle(dev->of_node, "firmware", 0);
 	if (fw_node) {
-		struct rpi_firmware *fw = rpi_firmware_get(NULL);
+		struct rpi_firmware *fw = rpi_firmware_get(fw_node);
 		if (!fw)
 			return -EPROBE_DEFER;
 		cprman->fw = fw;