kernel: bump 5.4 to 5.4.48
[oweals/openwrt.git] / target / linux / bcm27xx / patches-5.4 / 950-0660-Revert-firmware-raspberrypi-register-clk-device.patch
1 From b2691aee386b18425a7b96cca05e3bcceb8678ae Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Fri, 17 Apr 2020 16:20:55 +0100
4 Subject: [PATCH] Revert "firmware: raspberrypi: register clk device"
5
6 This reverts commit 91f2cf4a6b2131016b1ae9c9500245f0572112c7.
7
8 Revert this because the clock driver won't probe without a DT node, and
9 creating it as a platform device won't give it one. Doing so avoids the
10 following error message:
11
12     raspberrypi-clk raspberrypi-clk: Missing firmware node
13
14 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
15 ---
16  drivers/firmware/raspberrypi.c | 10 ----------
17  1 file changed, 10 deletions(-)
18
19 --- a/drivers/firmware/raspberrypi.c
20 +++ b/drivers/firmware/raspberrypi.c
21 @@ -21,7 +21,6 @@
22  #define MBOX_CHAN_PROPERTY             8
23  
24  static struct platform_device *rpi_hwmon;
25 -static struct platform_device *rpi_clk;
26  
27  struct rpi_firmware {
28         struct mbox_client cl;
29 @@ -299,12 +298,6 @@ rpi_register_hwmon_driver(struct device
30         }
31  }
32  
33 -static void rpi_register_clk_driver(struct device *dev)
34 -{
35 -       rpi_clk = platform_device_register_data(dev, "raspberrypi-clk",
36 -                                               -1, NULL, 0);
37 -}
38 -
39  static int rpi_firmware_probe(struct platform_device *pdev)
40  {
41         struct device *dev = &pdev->dev;
42 @@ -334,7 +327,6 @@ static int rpi_firmware_probe(struct pla
43         rpi_firmware_print_firmware_revision(fw);
44         rpi_firmware_print_firmware_hash(fw);
45         rpi_register_hwmon_driver(dev, fw);
46 -       rpi_register_clk_driver(dev);
47  
48         return 0;
49  }
50 @@ -355,8 +347,6 @@ static int rpi_firmware_remove(struct pl
51  
52         platform_device_unregister(rpi_hwmon);
53         rpi_hwmon = NULL;
54 -       platform_device_unregister(rpi_clk);
55 -       rpi_clk = NULL;
56         mbox_free_channel(fw->chan);
57         g_pdev = NULL;
58