Re: [PATCH v3 03/25] firmware: rpi: Only create clocks device if we don't have a node for it
From: Nicolas Saenz Julienne <hidden>
Date: 2020-06-04 17:50:46
Also in:
lkml
On Wed, 2020-05-27 at 17:44 +0200, Maxime Ripard wrote:
The firmware clocks driver was previously probed through a platform_device created by the firmware driver. Since we will now have a node for that clocks driver, we need to create the device only in the case where there's no node for it already. Signed-off-by: Maxime Ripard <redacted> ---
Reviewed-by: Nicolas Saenz Julienne <redacted> Regards, Nicolas
quoted hunk ↗ jump to hunk
drivers/firmware/raspberrypi.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)diff --git a/drivers/firmware/raspberrypi.c b/drivers/firmware/raspberrypi.c index ef8098856a47..b25901a77c09 100644 --- a/drivers/firmware/raspberrypi.c +++ b/drivers/firmware/raspberrypi.c@@ -208,6 +208,20 @@ rpi_register_hwmon_driver(struct device *dev, structrpi_firmware *fw) static void rpi_register_clk_driver(struct device *dev) { + struct device_node *firmware; + + /* + * Earlier DTs don't have a node for the firmware clocks but + * rely on us creating a platform device by hand. If we do + * have a node for the firmware clocks, just bail out here. + */ + firmware = of_get_compatible_child(dev->of_node, + "raspberrypi,firmware-clocks"); + if (firmware) { + of_node_put(firmware); + return; + } + rpi_clk = platform_device_register_data(dev, "raspberrypi-clk", -1, NULL, 0); }