The last caller is gone since v5.10-rc1~28.
Signed-off-by: Uwe Kleine-König <[email protected]>
---
drivers/clocksource/timer-imx-gpt.c | 19 -------------------
include/soc/imx/timer.h | 7 -------
2 files changed, 26 deletions(-)
diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 8ad0bda42029..83cefff2bec1 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -414,25 +414,6 @@ static int __init _mxc_timer_init(struct imx_timer *imxtm)
return mxc_clockevent_init(imxtm);
}
-void __init mxc_timer_init(unsigned long pbase, int irq, enum imx_gpt_type type)
-{
- struct imx_timer *imxtm;
-
- imxtm = kzalloc(sizeof(*imxtm), GFP_KERNEL);
- BUG_ON(!imxtm);
-
- imxtm->clk_per = clk_get_sys("imx-gpt.0", "per");
- imxtm->clk_ipg = clk_get_sys("imx-gpt.0", "ipg");
-
- imxtm->base = ioremap(pbase, SZ_4K);
- BUG_ON(!imxtm->base);
-
- imxtm->type = type;
- imxtm->irq = irq;
-
- _mxc_timer_init(imxtm);
-}
-
static int __init mxc_timer_init_dt(struct device_node *np, enum imx_gpt_type type)
{
struct imx_timer *imxtm;
diff --git a/include/soc/imx/timer.h b/include/soc/imx/timer.h
index b888d5076b4d..25f29c6bbd0b 100644
--- a/include/soc/imx/timer.h
+++ b/include/soc/imx/timer.h
@@ -13,11 +13,4 @@ enum imx_gpt_type {
GPT_TYPE_IMX6DL, /* i.MX6DL/SX/SL */
};
-/*
- * This is a stop-gap solution for clock drivers like imx1/imx21 which call
- * mxc_timer_init() to initialize timer for non-DT boot. It can be removed
- * when these legacy non-DT support is converted or dropped.
- */
-void mxc_timer_init(unsigned long pbase, int irq, enum imx_gpt_type type);
-
#endif /* __SOC_IMX_TIMER_H__ */
base-commit: fe15c26ee26efa11741a7b632e9f23b01aca4cc6
prerequisite-patch-id: 016070a969cd4648b6a1dfffaa1bf334acc984ea
--
2.39.2
Hi Uwe,
On Tue, Mar 28, 2023 at 7:06 AM Uwe Kleine-König
<[email protected]> wrote:
>
> The last caller is gone since v5.10-rc1~28.
>
> Signed-off-by: Uwe Kleine-König <[email protected]>
I have already submitted this change:
https://lore.kernel.org/linux-arm-kernel/[email protected]/
On Tue, Mar 28, 2023 at 07:14:24AM -0300, Fabio Estevam wrote:
> Hi Uwe,
>
> On Tue, Mar 28, 2023 at 7:06 AM Uwe Kleine-König
> <[email protected]> wrote:
> >
> > The last caller is gone since v5.10-rc1~28.
> >
> > Signed-off-by: Uwe Kleine-König <[email protected]>
>
> I have already submitted this change:
> https://lore.kernel.org/linux-arm-kernel/[email protected]/
I don't care much which of them is included. Before patch #3 of my
series is applied, either of the two must be applied first.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
On Tue, Mar 28, 2023 at 12:31:36PM +0200, Uwe Kleine-König wrote:
> On Tue, Mar 28, 2023 at 07:14:24AM -0300, Fabio Estevam wrote:
> > Hi Uwe,
> >
> > On Tue, Mar 28, 2023 at 7:06 AM Uwe Kleine-König
> > <[email protected]> wrote:
> > >
> > > The last caller is gone since v5.10-rc1~28.
> > >
> > > Signed-off-by: Uwe Kleine-König <[email protected]>
> >
> > I have already submitted this change:
> > https://lore.kernel.org/linux-arm-kernel/[email protected]/
>
> I don't care much which of them is included. Before patch #3 of my
> series is applied, either of the two must be applied first.
OK, Fabio's patch got in. So now the way is clear for patches #2 and #3
of this series.
FTR: b4 am -l -P2,3 [email protected]
does the right thing.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |
On 30/05/2023 17:34, Uwe Kleine-König wrote:
> On Tue, Mar 28, 2023 at 12:31:36PM +0200, Uwe Kleine-König wrote:
>> On Tue, Mar 28, 2023 at 07:14:24AM -0300, Fabio Estevam wrote:
>>> Hi Uwe,
>>>
>>> On Tue, Mar 28, 2023 at 7:06 AM Uwe Kleine-König
>>> <[email protected]> wrote:
>>>>
>>>> The last caller is gone since v5.10-rc1~28.
>>>>
>>>> Signed-off-by: Uwe Kleine-König <[email protected]>
>>>
>>> I have already submitted this change:
>>> https://lore.kernel.org/linux-arm-kernel/[email protected]/
>>
>> I don't care much which of them is included. Before patch #3 of my
>> series is applied, either of the two must be applied first.
>
> OK, Fabio's patch got in. So now the way is clear for patches #2 and #3
> of this series.
>
> FTR: b4 am -l -P2,3 [email protected]
> does the right thing.
Applied patch #3
Thanks
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog