Commit 5c3fddce authored by Andrew Victor's avatar Andrew Victor Committed by Russell King

[ARM] 3607/1: AT91RM9200 misc fixes

Patch from Andrew Victor

This final patch includes some general fixes.

1. Link in pm.o if CONFIG_PM is enabled.  [Should have been included in
patch 3605/1].
2. Use __raw_readl()/__raw_writel() when accessing System Peripheral
registers.
3. Removed some unnecessary includes
Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 907d6deb
...@@ -7,6 +7,8 @@ obj-m := ...@@ -7,6 +7,8 @@ obj-m :=
obj-n := obj-n :=
obj- := obj- :=
obj-$(CONFIG_PM) += pm.o
# Board-specific support # Board-specific support
obj-$(CONFIG_ARCH_AT91RM9200DK) += board-dk.o obj-$(CONFIG_ARCH_AT91RM9200DK) += board-dk.o
obj-$(CONFIG_MACH_AT91RM9200EK) += board-ek.o obj-$(CONFIG_MACH_AT91RM9200EK) += board-ek.o
...@@ -28,3 +30,8 @@ obj-$(CONFIG_LEDS) += $(led-y) ...@@ -28,3 +30,8 @@ obj-$(CONFIG_LEDS) += $(led-y)
# VGA support # VGA support
#obj-$(CONFIG_FB_S1D13XXX) += ics1523.o #obj-$(CONFIG_FB_S1D13XXX) += ics1523.o
ifeq ($(CONFIG_PM_DEBUG),y)
CFLAGS_pm.o += -DDEBUG
endif
...@@ -84,14 +84,14 @@ static inline unsigned int at91_sys_read(unsigned int reg_offset) ...@@ -84,14 +84,14 @@ static inline unsigned int at91_sys_read(unsigned int reg_offset)
{ {
void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS; void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
return readl(addr + reg_offset); return __raw_readl(addr + reg_offset);
} }
static inline void at91_sys_write(unsigned int reg_offset, unsigned long value) static inline void at91_sys_write(unsigned int reg_offset, unsigned long value)
{ {
void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS; void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;
writel(value, addr + reg_offset); __raw_writel(value, addr + reg_offset);
} }
#endif #endif
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#ifndef __ASM_ARCH_IO_H #ifndef __ASM_ARCH_IO_H
#define __ASM_ARCH_IO_H #define __ASM_ARCH_IO_H
#include <asm/arch/at91rm9200.h>
#include <asm/io.h> #include <asm/io.h>
#define IO_SPACE_LIMIT 0xFFFFFFFF #define IO_SPACE_LIMIT 0xFFFFFFFF
......
...@@ -37,8 +37,6 @@ ...@@ -37,8 +37,6 @@
* symbols in gpio.h for ones handled indirectly as GPIOs. * symbols in gpio.h for ones handled indirectly as GPIOs.
* We make provision for 4 banks of GPIO. * We make provision for 4 banks of GPIO.
*/ */
#include <asm/arch/gpio.h>
#define NR_IRQS (NR_AIC_IRQS + (4 * 32)) #define NR_IRQS (NR_AIC_IRQS + (4 * 32))
......
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