mirror of
https://github.com/torvalds/linux
synced 2024-09-22 03:55:39 +00:00
3169663ac5
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: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
53 lines
1.1 KiB
C
53 lines
1.1 KiB
C
/*
|
|
* arch/arm/mach-sa1100/include/mach/uncompress.h
|
|
*
|
|
* (C) 1999 Nicolas Pitre <nico@fluxnic.net>
|
|
*
|
|
* Reorganised to be machine independent.
|
|
*/
|
|
|
|
#include "hardware.h"
|
|
|
|
#define IOMEM(x) (x)
|
|
|
|
/*
|
|
* The following code assumes the serial port has already been
|
|
* initialized by the bootloader. We search for the first enabled
|
|
* port in the most probable order. If you didn't setup a port in
|
|
* your bootloader then nothing will appear (which might be desired).
|
|
*/
|
|
|
|
#define UART(x) (*(volatile unsigned long *)(serial_port + (x)))
|
|
|
|
static void putc(int c)
|
|
{
|
|
unsigned long serial_port;
|
|
|
|
do {
|
|
serial_port = _Ser3UTCR0;
|
|
if (UART(UTCR3) & UTCR3_TXE) break;
|
|
serial_port = _Ser1UTCR0;
|
|
if (UART(UTCR3) & UTCR3_TXE) break;
|
|
serial_port = _Ser2UTCR0;
|
|
if (UART(UTCR3) & UTCR3_TXE) break;
|
|
return;
|
|
} while (0);
|
|
|
|
/* wait for space in the UART's transmitter */
|
|
while (!(UART(UTSR1) & UTSR1_TNF))
|
|
barrier();
|
|
|
|
/* send the character out. */
|
|
UART(UTDR) = c;
|
|
}
|
|
|
|
static inline void flush(void)
|
|
{
|
|
}
|
|
|
|
/*
|
|
* Nothing to do for these
|
|
*/
|
|
#define arch_decomp_setup()
|
|
#define arch_decomp_wdog()
|