Skip to content

Commit 41929c9

Browse files
linuswdlezcano
authored andcommitted
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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Daniel Lezcano <[email protected]>
1 parent b8b1ab1 commit 41929c9

File tree

3 files changed

+1
-37
lines changed

3 files changed

+1
-37
lines changed

drivers/clocksource/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ config IXP4XX_TIMER
8080
bool "Intel XScale IXP4xx timer driver" if COMPILE_TEST
8181
depends on HAS_IOMEM
8282
select CLKSRC_MMIO
83-
select TIMER_OF if OF
83+
select TIMER_OF
8484
help
8585
Enables support for the Intel XScale IXP4xx SoC timer.
8686

drivers/clocksource/timer-ixp4xx.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
#include <linux/of_address.h>
2020
#include <linux/of_irq.h>
2121
#include <linux/platform_device.h>
22-
/* Goes away with OF conversion */
23-
#include <linux/platform_data/timer-ixp4xx.h>
2422

2523
/*
2624
* Constants to make it easy to access Timer Control/Status registers
@@ -263,28 +261,6 @@ static struct platform_driver ixp4xx_timer_driver = {
263261
};
264262
builtin_platform_driver(ixp4xx_timer_driver);
265263

266-
/**
267-
* ixp4xx_timer_setup() - Timer setup function to be called from boardfiles
268-
* @timerbase: physical base of timer block
269-
* @timer_irq: Linux IRQ number for the timer
270-
* @timer_freq: Fixed frequency of the timer
271-
*/
272-
void __init ixp4xx_timer_setup(resource_size_t timerbase,
273-
int timer_irq,
274-
unsigned int timer_freq)
275-
{
276-
void __iomem *base;
277-
278-
base = ioremap(timerbase, 0x100);
279-
if (!base) {
280-
pr_crit("IXP4xx: can't remap timer\n");
281-
return;
282-
}
283-
ixp4xx_timer_register(base, timer_irq, timer_freq);
284-
}
285-
EXPORT_SYMBOL_GPL(ixp4xx_timer_setup);
286-
287-
#ifdef CONFIG_OF
288264
static __init int ixp4xx_of_timer_init(struct device_node *np)
289265
{
290266
void __iomem *base;
@@ -315,4 +291,3 @@ static __init int ixp4xx_of_timer_init(struct device_node *np)
315291
return ret;
316292
}
317293
TIMER_OF_DECLARE(ixp4xx, "intel,ixp4xx-timer", ixp4xx_of_timer_init);
318-
#endif

include/linux/platform_data/timer-ixp4xx.h

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)