Signed-off-by: Xiubo Li <li.xi...@freescale.com> --- Hi Daniel, Thomas
For now I just added _be() support using ioread{16,32}be. And i have a check of the clocksource drivers, didn't find anyone using LE mode on one BE SoC, so _le() APIs is not needed. For V2: - Using ioread{16,32}[be]() instead of readl_relaxed(). - Add clocksource_mmio_readX_Y_be() supports only. drivers/clocksource/mmio.c | 28 ++++++++++++++++++++++++---- include/linux/clocksource.h | 4 ++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/drivers/clocksource/mmio.c b/drivers/clocksource/mmio.c index 1593ade..d35a407 100644 --- a/drivers/clocksource/mmio.c +++ b/drivers/clocksource/mmio.c @@ -20,24 +20,44 @@ static inline struct clocksource_mmio *to_mmio_clksrc(struct clocksource *c) return container_of(c, struct clocksource_mmio, clksrc); } +cycle_t clocksource_mmio_readl_up_be(struct clocksource *c) +{ + return (cycle_t)ioread32be(to_mmio_clksrc(c)->reg); +} + cycle_t clocksource_mmio_readl_up(struct clocksource *c) { - return (cycle_t)readl_relaxed(to_mmio_clksrc(c)->reg); + return (cycle_t)ioread32(to_mmio_clksrc(c)->reg); +} + +cycle_t clocksource_mmio_readl_down_be(struct clocksource *c) +{ + return ~(cycle_t)ioread32be(to_mmio_clksrc(c)->reg) & c->mask; } cycle_t clocksource_mmio_readl_down(struct clocksource *c) { - return ~(cycle_t)readl_relaxed(to_mmio_clksrc(c)->reg) & c->mask; + return ~(cycle_t)ioread32(to_mmio_clksrc(c)->reg) & c->mask; +} + +cycle_t clocksource_mmio_readw_up_be(struct clocksource *c) +{ + return (cycle_t)ioread16be(to_mmio_clksrc(c)->reg); } cycle_t clocksource_mmio_readw_up(struct clocksource *c) { - return (cycle_t)readw_relaxed(to_mmio_clksrc(c)->reg); + return (cycle_t)ioread16(to_mmio_clksrc(c)->reg); +} + +cycle_t clocksource_mmio_readw_down_be(struct clocksource *c) +{ + return ~(cycle_t)ioread16be(to_mmio_clksrc(c)->reg) & c->mask; } cycle_t clocksource_mmio_readw_down(struct clocksource *c) { - return ~(cycle_t)readw_relaxed(to_mmio_clksrc(c)->reg) & c->mask; + return ~(cycle_t)ioread16(to_mmio_clksrc(c)->reg) & c->mask; } /** diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index 653f0e2..931a037 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h @@ -327,9 +327,13 @@ static inline void __clocksource_updatefreq_khz(struct clocksource *cs, u32 khz) extern int timekeeping_notify(struct clocksource *clock); +extern cycle_t clocksource_mmio_readl_up_be(struct clocksource *); extern cycle_t clocksource_mmio_readl_up(struct clocksource *); +extern cycle_t clocksource_mmio_readl_down_be(struct clocksource *); extern cycle_t clocksource_mmio_readl_down(struct clocksource *); +extern cycle_t clocksource_mmio_readw_up_be(struct clocksource *); extern cycle_t clocksource_mmio_readw_up(struct clocksource *); +extern cycle_t clocksource_mmio_readw_down_be(struct clocksource *); extern cycle_t clocksource_mmio_readw_down(struct clocksource *); extern int clocksource_mmio_init(void __iomem *, const char *, -- 2.1.0.27.g96db324 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/