[PATCH 1/3] clocksource/drivers/imx-gpt: Drop unused function mxc_timer_init()

[PATCH 1/3] clocksource/drivers/imx-gpt: Drop unused function mxc_timer_init()

[Uwe Kleine-König]

The last caller is gone since v5.10-rc1~28.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 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

[PATCH 2/3] clk: imx: Drop inclustion of unused header <soc/imx/timer.h>

[Uwe Kleine-König]

The clk drivers use none of the symbols defined in <soc/imx/timer.h>.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/clk/imx/clk-imx1.c  | 1 -
 drivers/clk/imx/clk-imx27.c | 1 -
 drivers/clk/imx/clk-imx31.c | 1 -
 drivers/clk/imx/clk-imx35.c | 1 -
 4 files changed, 4 deletions(-)

diff --git a/drivers/clk/imx/clk-imx1.c b/drivers/clk/imx/clk-imx1.c
index 22fc7491ba00..f6ea7e5052d5 100644
--- a/drivers/clk/imx/clk-imx1.c
+++ b/drivers/clk/imx/clk-imx1.c
@@ -10,7 +10,6 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <dt-bindings/clock/imx1-clock.h>
-#include <soc/imx/timer.h>
 #include <asm/irq.h>
 
 #include "clk.h"
diff --git a/drivers/clk/imx/clk-imx27.c b/drivers/clk/imx/clk-imx27.c
index 5d177125728d..99618ded0939 100644
--- a/drivers/clk/imx/clk-imx27.c
+++ b/drivers/clk/imx/clk-imx27.c
@@ -8,7 +8,6 @@
 #include <linux/of_address.h>
 #include <dt-bindings/clock/imx27-clock.h>
 #include <soc/imx/revision.h>
-#include <soc/imx/timer.h>
 #include <asm/irq.h>
 
 #include "clk.h"
diff --git a/drivers/clk/imx/clk-imx31.c b/drivers/clk/imx/clk-imx31.c
index c44e18c6f63f..4c8d9ff0b2ad 100644
--- a/drivers/clk/imx/clk-imx31.c
+++ b/drivers/clk/imx/clk-imx31.c
@@ -11,7 +11,6 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <soc/imx/revision.h>
-#include <soc/imx/timer.h>
 #include <asm/irq.h>
 
 #include "clk.h"
diff --git a/drivers/clk/imx/clk-imx35.c b/drivers/clk/imx/clk-imx35.c
index 7dcbaea3fea3..3b6fdb4e0be7 100644
--- a/drivers/clk/imx/clk-imx35.c
+++ b/drivers/clk/imx/clk-imx35.c
@@ -10,7 +10,6 @@
 #include <linux/of.h>
 #include <linux/err.h>
 #include <soc/imx/revision.h>
-#include <soc/imx/timer.h>
 #include <asm/irq.h>
 
 #include "clk.h"
-- 
2.39.2

[PATCH 3/3] clocksource/drivers/imx-gpt: Fold <soc/imx/timer.h> into its only user

[Uwe Kleine-König]

Only the imx-gpt timer driver makes use of enum imx_gpt_type that is
otherwise unused. Move its definition into the timer-imx-gpt driver.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/clocksource/timer-imx-gpt.c |  7 ++++++-
 include/soc/imx/timer.h             | 16 ----------------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 include/soc/imx/timer.h

diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 83cefff2bec1..28ab4f1a7c71 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -16,7 +16,6 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
-#include <soc/imx/timer.h>
 
 /*
  * There are 4 versions of the timer hardware on Freescale MXC hardware.
@@ -25,6 +24,12 @@
  *  - MX25, MX31, MX35, MX37, MX51, MX6Q(rev1.0)
  *  - MX6DL, MX6SX, MX6Q(rev1.1+)
  */
+enum imx_gpt_type {
+	GPT_TYPE_IMX1,		/* i.MX1 */
+	GPT_TYPE_IMX21,		/* i.MX21/27 */
+	GPT_TYPE_IMX31,		/* i.MX31/35/25/37/51/6Q */
+	GPT_TYPE_IMX6DL,	/* i.MX6DL/SX/SL */
+};
 
 /* defines common for all i.MX */
 #define MXC_TCTL		0x00
diff --git a/include/soc/imx/timer.h b/include/soc/imx/timer.h
deleted file mode 100644
index 25f29c6bbd0b..000000000000
--- a/include/soc/imx/timer.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright 2015 Linaro Ltd.
- */
-
-#ifndef __SOC_IMX_TIMER_H__
-#define __SOC_IMX_TIMER_H__
-
-enum imx_gpt_type {
-	GPT_TYPE_IMX1,		/* i.MX1 */
-	GPT_TYPE_IMX21,		/* i.MX21/27 */
-	GPT_TYPE_IMX31,		/* i.MX31/35/25/37/51/6Q */
-	GPT_TYPE_IMX6DL,	/* i.MX6DL/SX/SL */
-};
-
-#endif  /* __SOC_IMX_TIMER_H__ */
-- 
2.39.2

Re: [PATCH 1/3] clocksource/drivers/imx-gpt: Drop unused function mxc_timer_init()

[Fabio Estevam]

Hi Uwe,

On Tue, Mar 28, 2023 at 7:06 AM Uwe Kleine-König
<u.kleine-koenig@pengutronix.de> wrote:
>
> The last caller is gone since v5.10-rc1~28.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

I have already submitted this change:
https://lore.kernel.org/linux-arm-kernel/20230307124313.708255-1-festevam@denx.de/

Re: [PATCH 2/3] clk: imx: Drop inclustion of unused header <soc/imx/timer.h>

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 299 bytes --]

Hello,

when reading my own patch in my MUA I noticed a typo in the subject:

$Subject ~= s/inclustion/inclusion/

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH 1/3] clocksource/drivers/imx-gpt: Drop unused function mxc_timer_init()

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 750 bytes --]

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
> <u.kleine-koenig@pengutronix.de> wrote:
> >
> > The last caller is gone since v5.10-rc1~28.
> >
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> I have already submitted this change:
> https://lore.kernel.org/linux-arm-kernel/20230307124313.708255-1-festevam@denx.de/

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/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH 1/3] clocksource/drivers/imx-gpt: Drop unused function mxc_timer_init()

[Uwe Kleine-König]

[-- Attachment #1: Type: text/plain, Size: 1033 bytes --]

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
> > <u.kleine-koenig@pengutronix.de> wrote:
> > >
> > > The last caller is gone since v5.10-rc1~28.
> > >
> > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > 
> > I have already submitted this change:
> > https://lore.kernel.org/linux-arm-kernel/20230307124313.708255-1-festevam@denx.de/
> 
> 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 20230328103136.xafgjdkvdwnn7pwi@pengutronix.de
does the right thing.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH 1/3] clocksource/drivers/imx-gpt: Drop unused function mxc_timer_init()

[Daniel Lezcano]

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
>>> <u.kleine-koenig@pengutronix.de> wrote:
>>>>
>>>> The last caller is gone since v5.10-rc1~28.
>>>>
>>>> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
>>>
>>> I have already submitted this change:
>>> https://lore.kernel.org/linux-arm-kernel/20230307124313.708255-1-festevam@denx.de/
>>
>> 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 20230328103136.xafgjdkvdwnn7pwi@pengutronix.de
> 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

[tip: timers/core] clk: imx: Drop inclusion of unused header <soc/imx/timer.h>

[tip-bot2 for Uwe Kleine-König]

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     011da162da2f915989a571b557867f7eea699000
Gitweb:        https://git.kernel.org/tip/011da162da2f915989a571b557867f7eea699000
Author:        Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
AuthorDate:    Tue, 28 Mar 2023 12:05:30 +02:00
Committer:     Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Fri, 23 Jun 2023 09:33:43 +02:00

clk: imx: Drop inclusion of unused header <soc/imx/timer.h>

The clk drivers use none of the symbols defined in <soc/imx/timer.h>.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20230328100531.879485-2-u.kleine-koenig@pengutronix.de
---
 drivers/clk/imx/clk-imx1.c  | 1 -
 drivers/clk/imx/clk-imx27.c | 1 -
 drivers/clk/imx/clk-imx31.c | 1 -
 drivers/clk/imx/clk-imx35.c | 1 -
 4 files changed, 4 deletions(-)

diff --git a/drivers/clk/imx/clk-imx1.c b/drivers/clk/imx/clk-imx1.c
index 22fc749..f6ea7e5 100644
--- a/drivers/clk/imx/clk-imx1.c
+++ b/drivers/clk/imx/clk-imx1.c
@@ -10,7 +10,6 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <dt-bindings/clock/imx1-clock.h>
-#include <soc/imx/timer.h>
 #include <asm/irq.h>
 
 #include "clk.h"
diff --git a/drivers/clk/imx/clk-imx27.c b/drivers/clk/imx/clk-imx27.c
index 5d17712..99618de 100644
--- a/drivers/clk/imx/clk-imx27.c
+++ b/drivers/clk/imx/clk-imx27.c
@@ -8,7 +8,6 @@
 #include <linux/of_address.h>
 #include <dt-bindings/clock/imx27-clock.h>
 #include <soc/imx/revision.h>
-#include <soc/imx/timer.h>
 #include <asm/irq.h>
 
 #include "clk.h"
diff --git a/drivers/clk/imx/clk-imx31.c b/drivers/clk/imx/clk-imx31.c
index c44e18c..4c8d9ff 100644
--- a/drivers/clk/imx/clk-imx31.c
+++ b/drivers/clk/imx/clk-imx31.c
@@ -11,7 +11,6 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <soc/imx/revision.h>
-#include <soc/imx/timer.h>
 #include <asm/irq.h>
 
 #include "clk.h"
diff --git a/drivers/clk/imx/clk-imx35.c b/drivers/clk/imx/clk-imx35.c
index 7dcbaea..3b6fdb4 100644
--- a/drivers/clk/imx/clk-imx35.c
+++ b/drivers/clk/imx/clk-imx35.c
@@ -10,7 +10,6 @@
 #include <linux/of.h>
 #include <linux/err.h>
 #include <soc/imx/revision.h>
-#include <soc/imx/timer.h>
 #include <asm/irq.h>
 
 #include "clk.h"

[tip: timers/core] clocksource/drivers/imx-gpt: Fold <soc/imx/timer.h> into its only user

[tip-bot2 for Uwe Kleine-König]

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     281bf6b94aec092096d788b56c106a8c9c2a432a
Gitweb:        https://git.kernel.org/tip/281bf6b94aec092096d788b56c106a8c9c2a432a
Author:        Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
AuthorDate:    Tue, 28 Mar 2023 12:05:31 +02:00
Committer:     Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Fri, 23 Jun 2023 09:33:43 +02:00

clocksource/drivers/imx-gpt: Fold <soc/imx/timer.h> into its only user

Only the imx-gpt timer driver makes use of enum imx_gpt_type that is
otherwise unused. Move its definition into the timer-imx-gpt driver.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20230328100531.879485-3-u.kleine-koenig@pengutronix.de
---
 drivers/clocksource/timer-imx-gpt.c |  7 ++++++-
 include/soc/imx/timer.h             | 16 ----------------
 2 files changed, 6 insertions(+), 17 deletions(-)
 delete mode 100644 include/soc/imx/timer.h

diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 83cefff..28ab4f1 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -16,7 +16,6 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
-#include <soc/imx/timer.h>
 
 /*
  * There are 4 versions of the timer hardware on Freescale MXC hardware.
@@ -25,6 +24,12 @@
  *  - MX25, MX31, MX35, MX37, MX51, MX6Q(rev1.0)
  *  - MX6DL, MX6SX, MX6Q(rev1.1+)
  */
+enum imx_gpt_type {
+	GPT_TYPE_IMX1,		/* i.MX1 */
+	GPT_TYPE_IMX21,		/* i.MX21/27 */
+	GPT_TYPE_IMX31,		/* i.MX31/35/25/37/51/6Q */
+	GPT_TYPE_IMX6DL,	/* i.MX6DL/SX/SL */
+};
 
 /* defines common for all i.MX */
 #define MXC_TCTL		0x00
diff --git a/include/soc/imx/timer.h b/include/soc/imx/timer.h
deleted file mode 100644
index 25f29c6..0000000
--- a/include/soc/imx/timer.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright 2015 Linaro Ltd.
- */
-
-#ifndef __SOC_IMX_TIMER_H__
-#define __SOC_IMX_TIMER_H__
-
-enum imx_gpt_type {
-	GPT_TYPE_IMX1,		/* i.MX1 */
-	GPT_TYPE_IMX21,		/* i.MX21/27 */
-	GPT_TYPE_IMX31,		/* i.MX31/35/25/37/51/6Q */
-	GPT_TYPE_IMX6DL,	/* i.MX6DL/SX/SL */
-};
-
-#endif  /* __SOC_IMX_TIMER_H__ */