From: Arnd Bergmann <[email protected]>
After removing this header in the clocksource tree, the clk drivers no
longer build:
drivers/clk/imx/clk-imx1.c:13:10: fatal error: 'soc/imx/timer.h' file not found
drivers/clk/imx/clk-imx27.c:11:10: fatal error: 'soc/imx/timer.h' file not found
This patch was originally posted as part of a three-patch series, but only
patches 1 and 3 got applied.
Reported-by: Linux Kernel Functional Testing <[email protected]>
Fixes: 9e9d7570485d7 ("clocksource/drivers/imx-gpt: Fold <soc/imx/timer.h> into its only user")
Link: https://lore.kernel.org/all/[email protected]/
Signed-off-by: "Uwe Kleine-König" <[email protected]>
Signed-off-by: Arnd Bergmann <[email protected]>
---
I would suggest merging this through the clocksource tree as well, which
now has the third patch.
---
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 22fc7491ba008..f6ea7e5052d56 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 5d177125728df..99618ded09397 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 c44e18c6f63f7..4c8d9ff0b2ad5 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 7dcbaea3fea35..3b6fdb4e0be78 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
> Subject: [PATCH] clk: imx: Drop inclusion of unused header
> <soc/imx/timer.h>
>
> From: Arnd Bergmann <[email protected]>
>
> After removing this header in the clocksource tree, the clk drivers no longer
> build:
>
> drivers/clk/imx/clk-imx1.c:13:10: fatal error: 'soc/imx/timer.h' file not found
> drivers/clk/imx/clk-imx27.c:11:10: fatal error: 'soc/imx/timer.h' file not
> found
>
> This patch was originally posted as part of a three-patch series, but only
> patches 1 and 3 got applied.
>
> Reported-by: Linux Kernel Functional Testing <[email protected]>
> Fixes: 9e9d7570485d7 ("clocksource/drivers/imx-gpt: Fold <soc/imx/timer.h>
> into its only user")
> Link:
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.
> kernel.org%2Fall%2F20230328100531.879485-2-u.kleine-
> koenig%40pengutronix.de%2F&data=05%7C01%7Cpeng.fan%40nxp.com%7
> C0a6773bdefa4449eee7808db73ba4024%7C686ea1d3bc2b4c6fa92cd99c5c3
> 01635%7C0%7C0%7C638231016000018002%7CUnknown%7CTWFpbGZsb3d
> 8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%
> 3D%7C3000%7C%7C%7C&sdata=K5mxemLNLHcXR%2B5b1DwuZJH9X%2Fd%
> 2BTaZSQ7tZ8x8BqTk%3D&reserved=0
> Signed-off-by: "Uwe Kleine-K?nig" <[email protected]>
> Signed-off-by: Arnd Bergmann <[email protected]>
Acked-by: Peng Fan <[email protected]>
On Fri, Jun 23, 2023 at 09:19:19AM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> After removing this header in the clocksource tree, the clk drivers no
> longer build:
>
> drivers/clk/imx/clk-imx1.c:13:10: fatal error: 'soc/imx/timer.h' file not found
> drivers/clk/imx/clk-imx27.c:11:10: fatal error: 'soc/imx/timer.h' file not found
>
> This patch was originally posted as part of a three-patch series, but only
> patches 1 and 3 got applied.
>
> Reported-by: Linux Kernel Functional Testing <[email protected]>
> Fixes: 9e9d7570485d7 ("clocksource/drivers/imx-gpt: Fold <soc/imx/timer.h> into its only user")
> Link: https://lore.kernel.org/all/[email protected]/
> Signed-off-by: "Uwe Kleine-K?nig" <[email protected]>
> Signed-off-by: Arnd Bergmann <[email protected]>
A bit strange that this patch has author=Arnd but still my S-o-b. Either
it's "my" patch (then I'd like to have author=Uwe), or it's Arnd's then
I'm not in the submission path and my S-o-b is misleading.
The commit log of this patch is better as it mentions the fact that only
a part of my series was applied and that the 0day bot was in the loop.
So I suggest to make my Signed-off-by line a Co-developed-by one (and
drop the quotes around my name).
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |
Quoting Arnd Bergmann (2023-06-23 00:19:19)
> From: Arnd Bergmann <[email protected]>
>
> After removing this header in the clocksource tree, the clk drivers no
> longer build:
>
> drivers/clk/imx/clk-imx1.c:13:10: fatal error: 'soc/imx/timer.h' file not found
> drivers/clk/imx/clk-imx27.c:11:10: fatal error: 'soc/imx/timer.h' file not found
>
> This patch was originally posted as part of a three-patch series, but only
> patches 1 and 3 got applied.
>
> Reported-by: Linux Kernel Functional Testing <[email protected]>
> Fixes: 9e9d7570485d7 ("clocksource/drivers/imx-gpt: Fold <soc/imx/timer.h> into its only user")
> Link: https://lore.kernel.org/all/[email protected]/
> Signed-off-by: "Uwe Kleine-König" <[email protected]>
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
Acked-by: Stephen Boyd <[email protected]>
Hello,
On Mon, Jun 26, 2023 at 04:44:00PM -0700, Stephen Boyd wrote:
> Quoting Arnd Bergmann (2023-06-23 00:19:19)
> > From: Arnd Bergmann <[email protected]>
> >
> > After removing this header in the clocksource tree, the clk drivers no
> > longer build:
> >
> > drivers/clk/imx/clk-imx1.c:13:10: fatal error: 'soc/imx/timer.h' file not found
> > drivers/clk/imx/clk-imx27.c:11:10: fatal error: 'soc/imx/timer.h' file not found
> >
> > This patch was originally posted as part of a three-patch series, but only
> > patches 1 and 3 got applied.
> >
> > Reported-by: Linux Kernel Functional Testing <[email protected]>
> > Fixes: 9e9d7570485d7 ("clocksource/drivers/imx-gpt: Fold <soc/imx/timer.h> into its only user")
> > Link: https://lore.kernel.org/all/[email protected]/
> > Signed-off-by: "Uwe Kleine-K?nig" <[email protected]>
> > Signed-off-by: Arnd Bergmann <[email protected]>
> > ---
>
> Acked-by: Stephen Boyd <[email protected]>
Just for the record, the original patch is already in
https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
as 011da162da2f915989a571b557867f7eea699000.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |