timer: Support clocks via phandle

Earlier timer driver needed a clock-frequency property in compatible device-tree nodes. Another way is to reference a clock via a phandle.

So now timer_pre_probe tries to get clock by reference through device tree. In case it is impossible to get clock device through the reference, clock-frequency property of the timer node is read to provide backward compatibility.

Signed-off-by Vlad Zakharov <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---
Changes v1..v2:
?- Use temporary variable when getting clock rate

?drivers/timer/timer-uclass.c | 17 ++++++++++++++--- ?1 file changed, 14 insertions(+), 3 deletions(-)

drivers/timer/timer-uclass.c +0 -0

index f8ddf93..a891a58 100644
@@ -8,6 +8,7 @@

?#include <dm.h>
?#include <dm/lists.h>
?#include <dm/device-internal.h>
+#include <clk.h>
?#include <errno.h>
?#include <timer.h>
?

drivers/timer/timer-uclass.c +13 -3

@@ -42,9 +43,19 @@ unsigned long notrace timer_get_rate(struct udevice *dev)
 ?static int timer_pre_probe(struct udevice *dev)
 ?{
 ?	struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
-
-	uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
-					?????"clock-frequency", 0);
+	struct clk *timer_clk;
+	int err;
+	ulong ret;
+
+	err = clk_get_by_index(dev, 0, timer_clk);
+	if (!err) {
+		ret = clk_get_rate(timer_clk);
+		if (IS_ERR_VALUE(ret))
+			return ret;
+		uc_priv->clock_rate = ret;
+	} else
+		uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob,
+				dev->of_offset,	"clock-frequency", 0);

?
? return 0;
?}

Hi Tom,

Quoted 47 lines · Vlad Zakharov

Earlier timer driver needed a clock-frequency property in compatible device-tree nodes. Another way is to reference a clock via a phandle.

So now timer_pre_probe tries to get clock by reference through device tree. In case it is impossible to get clock device through the reference, clock-frequency property of the timer node is read to provide backward compatibility.

Signed-off-by Vlad Zakharov <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---
Changes v1..v2:
?- Use temporary variable when getting clock rate

?drivers/timer/timer-uclass.c | 17 ++++++++++++++--- ?1 file changed, 14 insertions(+), 3 deletions(-)

drivers/timer/timer-uclass.c +0 -0

index f8ddf93..a891a58 100644
@@ -8,6 +8,7 @@

?#include <dm.h>
?#include <dm/lists.h>
?#include <dm/device-internal.h>
+#include <clk.h>
?#include <errno.h>
?#include <timer.h>
?

drivers/timer/timer-uclass.c +11 -3

@@ -42,9 +43,19 @@ unsigned long notrace timer_get_rate(struct udevice *dev)
 ?static int timer_pre_probe(struct udevice *dev)
 ?{
 ?	struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
-
-	uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
-					?????"clock-frequency", 0);
+	struct clk *timer_clk;
+	int err;
+	ulong ret;
+
+	err = clk_get_by_index(dev, 0, timer_clk);
+	if (!err) {
+		ret = clk_get_rate(timer_clk);
+		if (IS_ERR_VALUE(ret))
+			return ret;
+		uc_priv->clock_rate = ret;
+	} else

Quoted 5 lines

drivers/timer/timer-uclass.c +2 -0

+		uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob,
+				dev->of_offset,	"clock-frequency", 0);

?
? return 0;
?}

Could you please apply this patch if there's no any objections or comments on it? Thanks.

Quoted 52 lines · Vlad Zakharov

Hi Tom,

Quoted 48 lines · Vlad Zakharov

Earlier timer driver needed a clock-frequency property in compatible device-tree nodes. Another way is to reference a clock via a phandle.

So now timer_pre_probe tries to get clock by reference through device tree. In case it is impossible to get clock device through the reference, clock-frequency property of the timer node is read to provide backward compatibility.

Signed-off-by Vlad Zakharov <[email protected]>

Reviewed-by Simon Glass <[email protected]>

---
Changes v1..v2:
?- Use temporary variable when getting clock rate

?drivers/timer/timer-uclass.c | 17 ++++++++++++++--- ?1 file changed, 14 insertions(+), 3 deletions(-)

drivers/timer/timer-uclass.c +0 -0

index f8ddf93..a891a58 100644
@@ -8,6 +8,7 @@

?#include <dm.h>
?#include <dm/lists.h>
?#include <dm/device-internal.h>
+#include <clk.h>
?#include <errno.h>
?#include <timer.h>
?

drivers/timer/timer-uclass.c +11 -3

@@ -42,9 +43,19 @@ unsigned long notrace timer_get_rate(struct udevice *dev)
 ?static int timer_pre_probe(struct udevice *dev)
 ?{
 ?	struct timer_dev_priv *uc_priv = dev_get_uclass_priv(dev);
-
-	uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
-					?????"clock-frequency", 0);
+	struct clk *timer_clk;
+	int err;
+	ulong ret;
+
+	err = clk_get_by_index(dev, 0, timer_clk);
+	if (!err) {
+		ret = clk_get_rate(timer_clk);
+		if (IS_ERR_VALUE(ret))
+			return ret;
+		uc_priv->clock_rate = ret;
+	} else

Quoted 8 lines

Quoted 5 lines

drivers/timer/timer-uclass.c +2 -0

+		uc_priv->clock_rate = fdtdec_get_int(gd->fdt_blob,
+				dev->of_offset,	"clock-frequency", 0);

?
? return 0;
?}

Could you please apply this patch if there's no any objections or comments on it? Thanks.

Is this required for the other series???If not, I'd like to let it "bake" a bit longer, but if it's needed, I'm OK with it coming in via the arc tree now as well.??Thanks!

Earlier timer driver needed a clock-frequency property in compatible device-tree nodes. Another way is to reference a clock via a phandle.

So now timer_pre_probe tries to get clock by reference through device tree. In case it is impossible to get clock device through the reference, clock-frequency property of the timer node is read to provide backward compatibility.

Signed-off-by Vlad Zakharov <[email protected]>

Reviewed-by Simon Glass <[email protected]>