Commit 33154863 authored by Jan Kiszka's avatar Jan Kiszka Committed by Philippe Gerum

Revert "clocksource: omap/dmtimer: ipipe: add support for user-visible TSC"

This reverts commit d35c4950.

Belongs into the ARM tree.
Signed-off-by: Jan Kiszka's avatarJan Kiszka <jan.kiszka@siemens.com>
parent a518bf41
......@@ -395,18 +395,6 @@ int omap_dm_timer_get_irq(struct omap_dm_timer *timer)
}
EXPORT_SYMBOL_GPL(omap_dm_timer_get_irq);
#ifdef CONFIG_IPIPE
unsigned long omap_dm_timer_get_phys_counter_addr(struct omap_dm_timer *timer)
{
return timer->phys_base + (OMAP_TIMER_COUNTER_REG & 0xff);
}
unsigned long omap_dm_timer_get_virt_counter_addr(struct omap_dm_timer *timer)
{
return (unsigned long)timer->io_base + (OMAP_TIMER_COUNTER_REG & 0xff);
}
#endif /* CONFIG_IPIPE */
#if defined(CONFIG_ARCH_OMAP1)
#include <mach/hardware.h>
/**
......@@ -584,7 +572,7 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
EXPORT_SYMBOL_GPL(omap_dm_timer_set_source);
int omap_dm_timer_set_load(struct omap_dm_timer *timer, int autoreload,
unsigned int load)
unsigned int load)
{
u32 l;
......@@ -611,7 +599,7 @@ EXPORT_SYMBOL_GPL(omap_dm_timer_set_load);
/* Optimized set_load which removes costly spin wait in timer_start */
int omap_dm_timer_set_load_start(struct omap_dm_timer *timer, int autoreload,
unsigned int load)
unsigned int load)
{
u32 l;
......@@ -876,7 +864,6 @@ static int omap_dm_timer_probe(struct platform_device *pdev)
}
timer->fclk = ERR_PTR(-ENODEV);
timer->phys_base = mem->start;
timer->io_base = devm_ioremap_resource(dev, mem);
if (IS_ERR(timer->io_base))
return PTR_ERR(timer->io_base);
......
......@@ -104,7 +104,6 @@ struct omap_dm_timer {
int irq;
struct clk *fclk;
unsigned long phys_base;
void __iomem *io_base;
void __iomem *irq_stat; /* TISR/IRQSTATUS interrupt status */
void __iomem *irq_ena; /* irq enable */
......@@ -416,9 +415,4 @@ static inline void __omap_dm_timer_write_status(struct omap_dm_timer *timer,
writel_relaxed(value, timer->irq_stat);
}
static inline unsigned long __omap_dm_timer_read_status(struct omap_dm_timer *timer)
{
return __raw_readl(timer->irq_stat);
}
#endif /* __ASM_ARCH_DMTIMER_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment