| Message ID | 20201017153857.2494845-1-fparent@baylibre.com |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | [1/2] dt-bindings: timer: mtk-timer: add optional 13m and bus clock | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | success |
On Sat, Oct 17, 2020 at 05:38:57PM +0200, Fabien Parent wrote: > Some MediaTek SoC like MT8516 need to enable additional clocks > for the GPT timer. Enable them if present. > > Signed-off-by: Fabien Parent <fparent@baylibre.com> > --- > drivers/clocksource/timer-mediatek.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/clocksource/timer-mediatek.c b/drivers/clocksource/timer-mediatek.c > index 9318edcd8963..42e2d2090484 100644 > --- a/drivers/clocksource/timer-mediatek.c > +++ b/drivers/clocksource/timer-mediatek.c > @@ -9,6 +9,7 @@ > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > +#include <linux/clk.h> > #include <linux/clockchips.h> > #include <linux/clocksource.h> > #include <linux/interrupt.h> > @@ -278,8 +279,19 @@ static int __init mtk_syst_init(struct device_node *node) > > static int __init mtk_gpt_init(struct device_node *node) > { > + struct clk *clk_13m, *clk_bus; > int ret; > > + /* Optional clock*/ Then use the optional api variant. > + clk_13m = of_clk_get_by_name(node, "clk13m"); > + if (!IS_ERR(clk_13m)) And then you can drop this check (or handle it for any error other than clock is not present). > + clk_prepare_enable(clk_13m); > + > + /* Optional clock*/ > + clk_bus = of_clk_get_by_name(node, "bus"); > + if (!IS_ERR(clk_bus)) > + clk_prepare_enable(clk_bus); > + > to.clkevt.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT; > to.clkevt.set_state_shutdown = mtk_gpt_clkevt_shutdown; > to.clkevt.set_state_periodic = mtk_gpt_clkevt_set_periodic; > -- > 2.28.0 >
On Sat, 17 Oct 2020 17:38:56 +0200, Fabien Parent wrote: > The timer IP on MT8516 requires two clocks to be enabled. Add both > clocks. > > Signed-off-by: Fabien Parent <fparent@baylibre.com> > --- > .../devicetree/bindings/timer/mediatek,mtk-timer.txt | 5 +++++ > 1 file changed, 5 insertions(+) > Acked-by: Rob Herring <robh@kernel.org>
Hi Rob, On Mon, Oct 26, 2020 at 2:30 PM Rob Herring <robh@kernel.org> wrote: > > On Sat, Oct 17, 2020 at 05:38:57PM +0200, Fabien Parent wrote: > > Some MediaTek SoC like MT8516 need to enable additional clocks > > for the GPT timer. Enable them if present. > > > > Signed-off-by: Fabien Parent <fparent@baylibre.com> > > --- > > drivers/clocksource/timer-mediatek.c | 12 ++++++++++++ > > 1 file changed, 12 insertions(+) > > > > diff --git a/drivers/clocksource/timer-mediatek.c b/drivers/clocksource/timer-mediatek.c > > index 9318edcd8963..42e2d2090484 100644 > > --- a/drivers/clocksource/timer-mediatek.c > > +++ b/drivers/clocksource/timer-mediatek.c > > @@ -9,6 +9,7 @@ > > > > #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > > > +#include <linux/clk.h> > > #include <linux/clockchips.h> > > #include <linux/clocksource.h> > > #include <linux/interrupt.h> > > @@ -278,8 +279,19 @@ static int __init mtk_syst_init(struct device_node *node) > > > > static int __init mtk_gpt_init(struct device_node *node) > > { > > + struct clk *clk_13m, *clk_bus; > > int ret; > > > > + /* Optional clock*/ > > Then use the optional api variant. I looked for optional API variant but could only find these: * struct clk *devm_clk_get_optional(struct device *dev, const char *id); * struct clk *devm_clk_get_optional(struct device *dev, const char *id); These two require a "struct device" parameter but in the function mtk_gpt_init, we only have a "struct device_node" I didn't see any way to get a "struct device" from a "struct device_node". > > > + clk_13m = of_clk_get_by_name(node, "clk13m"); > > + if (!IS_ERR(clk_13m)) > > And then you can drop this check (or handle it for any error other than > clock is not present). > > > + clk_prepare_enable(clk_13m); > > + > > + /* Optional clock*/ > > + clk_bus = of_clk_get_by_name(node, "bus"); > > + if (!IS_ERR(clk_bus)) > > + clk_prepare_enable(clk_bus); > > + > > to.clkevt.features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT; > > to.clkevt.set_state_shutdown = mtk_gpt_clkevt_shutdown; > > to.clkevt.set_state_periodic = mtk_gpt_clkevt_set_periodic; > > -- > > 2.28.0 > >
diff --git a/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt b/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt index 690a9c0966ac..3f9bfd246f19 100644 --- a/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt +++ b/Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt @@ -29,6 +29,11 @@ Required properties: - reg: Should contain location and length for timer register. - clocks: Should contain system clock. +Optional properties: +- clock-names: May contain: + * "clk13m": 13MHz clock system clock + * "bus": Bus clock + Examples: timer@10008000 {
The timer IP on MT8516 requires two clocks to be enabled. Add both clocks. Signed-off-by: Fabien Parent <fparent@baylibre.com> --- .../devicetree/bindings/timer/mediatek,mtk-timer.txt | 5 +++++ 1 file changed, 5 insertions(+)