Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3169663a authored by Russell King's avatar Russell King
Browse files

ARM: sa11x0/pxa: convert OS timer registers to IOMEM 



Make the OS timer registers have IOMEM like properities so they can
be passed to readl_relaxed/writel_relaxed() et.al. rather than being
straight volatile dereferences.  Add linux/io.h includes where
required.

linux/io.h includes added to arch/arm/mach-sa1100/cpu-sa1100.c,
 arch/arm/mach-sa1100/jornada720_ssp.c, arch/arm/mach-sa1100/leds-lart.c
 drivers/input/touchscreen/jornada720_ts.c, drivers/pcmcia/sa1100_shannon.c
from Arnd.

This fixes these warnings:

arch/arm/mach-sa1100/time.c: In function 'sa1100_timer_init':
arch/arm/mach-sa1100/time.c:104: warning: passing argument 1 of 'clocksource_mmio_init' discards qualifiers from pointer target type
arch/arm/mach-pxa/time.c: In function 'pxa_timer_init':
arch/arm/mach-pxa/time.c:126: warning: passing argument 1 of 'clocksource_mmio_init' discards qualifiers from pointer target type

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bcccc50c

arch/arm/mach-pxa/include/mach/regs-ost.h

+11 −11
Original line number Diff line number Diff line
@@ -7,17 +7,17 @@ 
 * OS Timer & Match Registers

 */



#define OSMR0		__REG(0x40A00000)  /* */

#define OSMR1		__REG(0x40A00004)  /* */

#define OSMR2		__REG(0x40A00008)  /* */

#define OSMR3		__REG(0x40A0000C)  /* */

#define OSMR4		__REG(0x40A00080)  /* */

#define OSCR		__REG(0x40A00010)  /* OS Timer Counter Register */

#define OSCR4		__REG(0x40A00040)  /* OS Timer Counter Register */

#define OMCR4		__REG(0x40A000C0)  /* */

#define OSSR		__REG(0x40A00014)  /* OS Timer Status Register */

#define OWER		__REG(0x40A00018)  /* OS Timer Watchdog Enable Register */

#define OIER		__REG(0x40A0001C)  /* OS Timer Interrupt Enable Register */

#define OSMR0		io_p2v(0x40A00000)  /* */

#define OSMR1		io_p2v(0x40A00004)  /* */

#define OSMR2		io_p2v(0x40A00008)  /* */

#define OSMR3		io_p2v(0x40A0000C)  /* */

#define OSMR4		io_p2v(0x40A00080)  /* */

#define OSCR		io_p2v(0x40A00010)  /* OS Timer Counter Register */

#define OSCR4		io_p2v(0x40A00040)  /* OS Timer Counter Register */

#define OMCR4		io_p2v(0x40A000C0)  /* */

#define OSSR		io_p2v(0x40A00014)  /* OS Timer Status Register */

#define OWER		io_p2v(0x40A00018)  /* OS Timer Watchdog Enable Register */

#define OIER		io_p2v(0x40A0001C)  /* OS Timer Interrupt Enable Register */



#define OSSR_M3		(1 << 3)	/* Match status channel 3 */

#define OSSR_M2		(1 << 2)	/* Match status channel 2 */

arch/arm/mach-pxa/reset.c

+4 −3
Original line number Diff line number Diff line
@@ -77,9 +77,10 @@ static void do_gpio_reset(void) 
static void do_hw_reset(void)

{

	/* Initialize the watchdog and let it fire */

	OWER = OWER_WME;

	OSSR = OSSR_M3;

	OSMR3 = OSCR + 368640;	/* ... in 100 ms */

	writel_relaxed(OWER_WME, OWER);

	writel_relaxed(OSSR_M3, OSSR);

	/* ... in 100 ms */

	writel_relaxed(readl_relaxed(OSCR) + 368640, OSMR3);

}



void pxa_restart(char mode, const char *cmd)

arch/arm/mach-pxa/time.c

+26 −26
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 


static u32 notrace pxa_read_sched_clock(void)

{

	return OSCR;

	return readl_relaxed(OSCR);

}
@@ -47,8 +47,8 @@ pxa_ost0_interrupt(int irq, void *dev_id) 
	struct clock_event_device *c = dev_id;



	/* Disarm the compare/match, signal the event. */

	OIER &= ~OIER_E0;

	OSSR = OSSR_M0;

	writel_relaxed(readl_relaxed(OIER) & ~OIER_E0, OIER);

	writel_relaxed(OSSR_M0, OSSR);

	c->event_handler(c);



	return IRQ_HANDLED;
@@ -59,10 +59,10 @@ pxa_osmr0_set_next_event(unsigned long delta, struct clock_event_device *dev) 
{

	unsigned long next, oscr;



	OIER |= OIER_E0;

	next = OSCR + delta;

	OSMR0 = next;

	oscr = OSCR;

	writel_relaxed(readl_relaxed(OIER) | OIER_E0, OIER);

	next = readl_relaxed(OSCR) + delta;

	writel_relaxed(next, OSMR0);

	oscr = readl_relaxed(OSCR);



	return (signed)(next - oscr) <= MIN_OSCR_DELTA ? -ETIME : 0;

}
@@ -72,15 +72,15 @@ pxa_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *dev) 
{

	switch (mode) {

	case CLOCK_EVT_MODE_ONESHOT:

		OIER &= ~OIER_E0;

		OSSR = OSSR_M0;

		writel_relaxed(readl_relaxed(OIER) & ~OIER_E0, OIER);

		writel_relaxed(OSSR_M0, OSSR);

		break;



	case CLOCK_EVT_MODE_UNUSED:

	case CLOCK_EVT_MODE_SHUTDOWN:

		/* initializing, released, or preparing for suspend */

		OIER &= ~OIER_E0;

		OSSR = OSSR_M0;

		writel_relaxed(readl_relaxed(OIER) & ~OIER_E0, OIER);

		writel_relaxed(OSSR_M0, OSSR);

		break;



	case CLOCK_EVT_MODE_RESUME:
@@ -108,8 +108,8 @@ static void __init pxa_timer_init(void) 
{

	unsigned long clock_tick_rate = get_clock_tick_rate();



	OIER = 0;

	OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3;

	writel_relaxed(0, OIER);

	writel_relaxed(OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3, OSSR);



	setup_sched_clock(pxa_read_sched_clock, 32, clock_tick_rate);
@@ -122,7 +122,7 @@ static void __init pxa_timer_init(void) 


	setup_irq(IRQ_OST0, &pxa_ost0_irq);



	clocksource_mmio_init(&OSCR, "oscr0", clock_tick_rate, 200, 32,

	clocksource_mmio_init(OSCR, "oscr0", clock_tick_rate, 200, 32,

		clocksource_mmio_readl_up);

	clockevents_register_device(&ckevt_pxa_osmr0);

}
@@ -132,12 +132,12 @@ static unsigned long osmr[4], oier, oscr; 


static void pxa_timer_suspend(void)

{

	osmr[0] = OSMR0;

	osmr[1] = OSMR1;

	osmr[2] = OSMR2;

	osmr[3] = OSMR3;

	oier = OIER;

	oscr = OSCR;

	osmr[0] = readl_relaxed(OSMR0);

	osmr[1] = readl_relaxed(OSMR1);

	osmr[2] = readl_relaxed(OSMR2);

	osmr[3] = readl_relaxed(OSMR3);

	oier = readl_relaxed(OIER);

	oscr = readl_relaxed(OSCR);

}



static void pxa_timer_resume(void)
@@ -151,12 +151,12 @@ static void pxa_timer_resume(void) 
	if (osmr[0] - oscr < MIN_OSCR_DELTA)

		osmr[0] += MIN_OSCR_DELTA;



	OSMR0 = osmr[0];

	OSMR1 = osmr[1];

	OSMR2 = osmr[2];

	OSMR3 = osmr[3];

	OIER = oier;

	OSCR = oscr;

	writel_relaxed(osmr[0], OSMR0);

	writel_relaxed(osmr[1], OSMR1);

	writel_relaxed(osmr[2], OSMR2);

	writel_relaxed(osmr[3], OSMR3);

	writel_relaxed(oier, OIER);

	writel_relaxed(oscr, OSCR);

}

#else

#define pxa_timer_suspend NULL

arch/arm/mach-sa1100/assabet.c

+1 −1
Original line number Diff line number Diff line
@@ -362,7 +362,7 @@ static void __init assabet_init(void) 
static void __init map_sa1100_gpio_regs( void )

{

	unsigned long phys = __PREG(GPLR) & PMD_MASK;

	unsigned long virt = io_p2v(phys);

	unsigned long virt = (unsigned long)io_p2v(phys);

	int prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_DOMAIN(DOMAIN_IO);

	pmd_t *pmd;

arch/arm/mach-sa1100/cpu-sa1100.c

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ 
#include <linux/types.h>

#include <linux/init.h>

#include <linux/cpufreq.h>

#include <linux/io.h>



#include <asm/cputype.h>