Merge tag 'efi-2020-07-rc6' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / drivers / clk / clk_fixed_rate.c

diff --git a/drivers/clk/clk_fixed_rate.c b/drivers/clk/clk_fixed_rate.c
index 797e5379075da87e5dac71ed7d61106c8dd9fbff..2c20eddb0b5c6164f3d430cb2a8cca39eb4fe24e 100644 (file)
--- a/drivers/clk/clk_fixed_rate.c
+++ b/drivers/clk/clk_fixed_rate.c
@@ -1,38 +1,40 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016 Masahiro Yamada <yamada.masahiro@socionext.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <clk-uclass.h>
-#include <dm/device.h>
-
-DECLARE_GLOBAL_DATA_PTR;
-
-struct clk_fixed_rate {
-       unsigned long fixed_rate;
-};
-
-#define to_clk_fixed_rate(dev) ((struct clk_fixed_rate *)dev_get_platdata(dev))
+#include <dm.h>
+#include <linux/clk-provider.h>
 
 static ulong clk_fixed_rate_get_rate(struct clk *clk)
 {
-       if (clk->id != 0)
-               return -EINVAL;
-
        return to_clk_fixed_rate(clk->dev)->fixed_rate;
 }
 
+/* avoid clk_enable() return -ENOSYS */
+static int dummy_enable(struct clk *clk)
+{
+       return 0;
+}
+
 const struct clk_ops clk_fixed_rate_ops = {
        .get_rate = clk_fixed_rate_get_rate,
+       .enable = dummy_enable,
 };
 
 static int clk_fixed_rate_ofdata_to_platdata(struct udevice *dev)
 {
+       struct clk *clk = &to_clk_fixed_rate(dev)->clk;
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
        to_clk_fixed_rate(dev)->fixed_rate =
-                               fdtdec_get_int(gd->fdt_blob, dev->of_offset,
-                                              "clock-frequency", 0);
+               dev_read_u32_default(dev, "clock-frequency", 0);
+#endif
+       /* Make fixed rate clock accessible from higher level struct clk */
+       dev->uclass_priv = clk;
+       clk->dev = dev;
+       clk->enable_count = 0;
 
        return 0;
 }