* [PATCH] clocksource/drivers/ixp4xx: Drop boardfile probe path
@ 2022-04-06 20:55 Linus Walleij
2022-05-16 6:54 ` Linus Walleij
2022-05-27 8:36 ` [tip: timers/core] " tip-bot2 for Linus Walleij
0 siblings, 2 replies; 4+ messages in thread
From: Linus Walleij @ 2022-04-06 20:55 UTC (permalink / raw)
To: Daniel Lezcano, Thomas Gleixner; +Cc: linux-kernel, Linus Walleij
The boardfiles for IXP4xx have been deleted. Delete all the
quirks and code dealing with that boot path and rely solely on
device tree boot.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/clocksource/Kconfig | 2 +-
drivers/clocksource/timer-ixp4xx.c | 25 ----------------------
include/linux/platform_data/timer-ixp4xx.h | 11 ----------
3 files changed, 1 insertion(+), 37 deletions(-)
delete mode 100644 include/linux/platform_data/timer-ixp4xx.h
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 1589ae7d5abb..8182ff2d12fe 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -80,7 +80,7 @@ config IXP4XX_TIMER
bool "Intel XScale IXP4xx timer driver" if COMPILE_TEST
depends on HAS_IOMEM
select CLKSRC_MMIO
- select TIMER_OF if OF
+ select TIMER_OF
help
Enables support for the Intel XScale IXP4xx SoC timer.
diff --git a/drivers/clocksource/timer-ixp4xx.c b/drivers/clocksource/timer-ixp4xx.c
index cbb184953510..720ed70a2964 100644
--- a/drivers/clocksource/timer-ixp4xx.c
+++ b/drivers/clocksource/timer-ixp4xx.c
@@ -19,8 +19,6 @@
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/platform_device.h>
-/* Goes away with OF conversion */
-#include <linux/platform_data/timer-ixp4xx.h>
/*
* Constants to make it easy to access Timer Control/Status registers
@@ -263,28 +261,6 @@ static struct platform_driver ixp4xx_timer_driver = {
};
builtin_platform_driver(ixp4xx_timer_driver);
-/**
- * ixp4xx_timer_setup() - Timer setup function to be called from boardfiles
- * @timerbase: physical base of timer block
- * @timer_irq: Linux IRQ number for the timer
- * @timer_freq: Fixed frequency of the timer
- */
-void __init ixp4xx_timer_setup(resource_size_t timerbase,
- int timer_irq,
- unsigned int timer_freq)
-{
- void __iomem *base;
-
- base = ioremap(timerbase, 0x100);
- if (!base) {
- pr_crit("IXP4xx: can't remap timer\n");
- return;
- }
- ixp4xx_timer_register(base, timer_irq, timer_freq);
-}
-EXPORT_SYMBOL_GPL(ixp4xx_timer_setup);
-
-#ifdef CONFIG_OF
static __init int ixp4xx_of_timer_init(struct device_node *np)
{
void __iomem *base;
@@ -315,4 +291,3 @@ static __init int ixp4xx_of_timer_init(struct device_node *np)
return ret;
}
TIMER_OF_DECLARE(ixp4xx, "intel,ixp4xx-timer", ixp4xx_of_timer_init);
-#endif
diff --git a/include/linux/platform_data/timer-ixp4xx.h b/include/linux/platform_data/timer-ixp4xx.h
deleted file mode 100644
index ee92ae7edaed..000000000000
--- a/include/linux/platform_data/timer-ixp4xx.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __TIMER_IXP4XX_H
-#define __TIMER_IXP4XX_H
-
-#include <linux/ioport.h>
-
-void __init ixp4xx_timer_setup(resource_size_t timerbase,
- int timer_irq,
- unsigned int timer_freq);
-
-#endif
--
2.35.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] clocksource/drivers/ixp4xx: Drop boardfile probe path
2022-04-06 20:55 [PATCH] clocksource/drivers/ixp4xx: Drop boardfile probe path Linus Walleij
@ 2022-05-16 6:54 ` Linus Walleij
2022-05-16 9:04 ` Daniel Lezcano
2022-05-27 8:36 ` [tip: timers/core] " tip-bot2 for Linus Walleij
1 sibling, 1 reply; 4+ messages in thread
From: Linus Walleij @ 2022-05-16 6:54 UTC (permalink / raw)
To: Daniel Lezcano, Thomas Gleixner; +Cc: linux-kernel
On Wed, Apr 6, 2022 at 10:57 PM Linus Walleij <linus.walleij@linaro.org> wrote:
> The boardfiles for IXP4xx have been deleted. Delete all the
> quirks and code dealing with that boot path and rely solely on
> device tree boot.
>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Daniel/Thomas: can you pick up this patch for v5.19?
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] clocksource/drivers/ixp4xx: Drop boardfile probe path
2022-05-16 6:54 ` Linus Walleij
@ 2022-05-16 9:04 ` Daniel Lezcano
0 siblings, 0 replies; 4+ messages in thread
From: Daniel Lezcano @ 2022-05-16 9:04 UTC (permalink / raw)
To: Linus Walleij, Thomas Gleixner; +Cc: linux-kernel
On 16/05/2022 08:54, Linus Walleij wrote:
> On Wed, Apr 6, 2022 at 10:57 PM Linus Walleij <linus.walleij@linaro.org> wrote:
>
>> The boardfiles for IXP4xx have been deleted. Delete all the
>> quirks and code dealing with that boot path and rely solely on
>> device tree boot.
>>
>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>
> Daniel/Thomas: can you pick up this patch for v5.19?
Yes
--
<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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip: timers/core] clocksource/drivers/ixp4xx: Drop boardfile probe path
2022-04-06 20:55 [PATCH] clocksource/drivers/ixp4xx: Drop boardfile probe path Linus Walleij
2022-05-16 6:54 ` Linus Walleij
@ 2022-05-27 8:36 ` tip-bot2 for Linus Walleij
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot2 for Linus Walleij @ 2022-05-27 8:36 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Linus Walleij, Daniel Lezcano, x86, linux-kernel
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 41929c9f628b9990d33a200c54bb0c919e089aa8
Gitweb: https://git.kernel.org/tip/41929c9f628b9990d33a200c54bb0c919e089aa8
Author: Linus Walleij <linus.walleij@linaro.org>
AuthorDate: Wed, 06 Apr 2022 22:55:05 +02:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Wed, 18 May 2022 11:08:52 +02:00
clocksource/drivers/ixp4xx: Drop boardfile probe path
The boardfiles for IXP4xx have been deleted. Delete all the
quirks and code dealing with that boot path and rely solely on
device tree boot.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20220406205505.2332821-1-linus.walleij@linaro.org
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
drivers/clocksource/Kconfig | 2 +-
drivers/clocksource/timer-ixp4xx.c | 25 +---------------------
include/linux/platform_data/timer-ixp4xx.h | 11 +---------
3 files changed, 1 insertion(+), 37 deletions(-)
delete mode 100644 include/linux/platform_data/timer-ixp4xx.h
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 1589ae7..8182ff2 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -80,7 +80,7 @@ config IXP4XX_TIMER
bool "Intel XScale IXP4xx timer driver" if COMPILE_TEST
depends on HAS_IOMEM
select CLKSRC_MMIO
- select TIMER_OF if OF
+ select TIMER_OF
help
Enables support for the Intel XScale IXP4xx SoC timer.
diff --git a/drivers/clocksource/timer-ixp4xx.c b/drivers/clocksource/timer-ixp4xx.c
index cbb1849..720ed70 100644
--- a/drivers/clocksource/timer-ixp4xx.c
+++ b/drivers/clocksource/timer-ixp4xx.c
@@ -19,8 +19,6 @@
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/platform_device.h>
-/* Goes away with OF conversion */
-#include <linux/platform_data/timer-ixp4xx.h>
/*
* Constants to make it easy to access Timer Control/Status registers
@@ -263,28 +261,6 @@ static struct platform_driver ixp4xx_timer_driver = {
};
builtin_platform_driver(ixp4xx_timer_driver);
-/**
- * ixp4xx_timer_setup() - Timer setup function to be called from boardfiles
- * @timerbase: physical base of timer block
- * @timer_irq: Linux IRQ number for the timer
- * @timer_freq: Fixed frequency of the timer
- */
-void __init ixp4xx_timer_setup(resource_size_t timerbase,
- int timer_irq,
- unsigned int timer_freq)
-{
- void __iomem *base;
-
- base = ioremap(timerbase, 0x100);
- if (!base) {
- pr_crit("IXP4xx: can't remap timer\n");
- return;
- }
- ixp4xx_timer_register(base, timer_irq, timer_freq);
-}
-EXPORT_SYMBOL_GPL(ixp4xx_timer_setup);
-
-#ifdef CONFIG_OF
static __init int ixp4xx_of_timer_init(struct device_node *np)
{
void __iomem *base;
@@ -315,4 +291,3 @@ out_unmap:
return ret;
}
TIMER_OF_DECLARE(ixp4xx, "intel,ixp4xx-timer", ixp4xx_of_timer_init);
-#endif
diff --git a/include/linux/platform_data/timer-ixp4xx.h b/include/linux/platform_data/timer-ixp4xx.h
deleted file mode 100644
index ee92ae7..0000000
--- a/include/linux/platform_data/timer-ixp4xx.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __TIMER_IXP4XX_H
-#define __TIMER_IXP4XX_H
-
-#include <linux/ioport.h>
-
-void __init ixp4xx_timer_setup(resource_size_t timerbase,
- int timer_irq,
- unsigned int timer_freq);
-
-#endif
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-05-27 8:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-06 20:55 [PATCH] clocksource/drivers/ixp4xx: Drop boardfile probe path Linus Walleij
2022-05-16 6:54 ` Linus Walleij
2022-05-16 9:04 ` Daniel Lezcano
2022-05-27 8:36 ` [tip: timers/core] " tip-bot2 for Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).