]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ARM] 3954/1: AT91: Update drivers for new headers
authorAndrew Victor <andrew@sanpeople.com>
Thu, 30 Nov 2006 16:16:43 +0000 (17:16 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 30 Nov 2006 22:51:40 +0000 (22:51 +0000)
This patch updates the drivers (and other files) which include the
hardware headers.  This fixes the breakage introduced in patches 3950/1
and 3951/1 (those patches were getting big).

The AVR32 architecture uses the same serial driver and had its own copy
of at91rm9200_pdc.h.  Renamed it to at91_pdc.h

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
17 files changed:
arch/arm/mach-at91rm9200/at91rm9200.c
arch/arm/mach-at91rm9200/at91rm9200_time.c
arch/arm/mach-at91rm9200/clock.c
arch/arm/mach-at91rm9200/gpio.c
arch/arm/mach-at91rm9200/pm.c
drivers/char/watchdog/at91rm9200_wdt.c
drivers/mmc/at91_mci.c
drivers/pcmcia/at91_cf.c
drivers/serial/atmel_serial.c
include/asm-arm/arch-at91rm9200/at91rm9200.h
include/asm-arm/arch-at91rm9200/debug-macro.S
include/asm-arm/arch-at91rm9200/entry-macro.S
include/asm-arm/arch-at91rm9200/hardware.h
include/asm-arm/arch-at91rm9200/irqs.h
include/asm-arm/arch-at91rm9200/system.h
include/asm-arm/arch-at91rm9200/uncompress.h
include/asm-avr32/arch-at32ap/at91_pdc.h [moved from include/asm-avr32/arch-at32ap/at91rm9200_pdc.h with 92% similarity]

index 0422593032fc8b24b8bbb0cb39efc2068e8fb5ed..0816a8d2e863a76d08fd8f34d888fc73adb405e3 100644 (file)
@@ -15,8 +15,9 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/arch/at91rm9200.h>
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91_st.h>
 
-#include <asm/hardware.h>
 #include "generic.h"
 #include "clock.h"
 
index 07c9cea8961d745742d83490802f2a4a05888120..8e9c049c8b7c3d6c8b30cec0ca9831e5795af6a9 100644 (file)
@@ -30,6 +30,8 @@
 #include <asm/io.h>
 #include <asm/mach/time.h>
 
+#include <asm/arch/at91_st.h>
+
 static unsigned long last_crtr;
 
 /*
index a43b061a7c852789d404f931658217a8a4fdd6e1..1e0000ceb343f33c5aecc792ae2608c804301a98 100644 (file)
@@ -28,6 +28,7 @@
 #include <asm/mach-types.h>
 
 #include <asm/hardware.h>
+#include <asm/arch/at91_pmc.h>
 
 #include "clock.h"
 
index 7467d644f0a3406c7ccc939d4f19e0f9ff8ab2aa..e76422761db38a646ad2954449937d8564734612 100644 (file)
@@ -19,6 +19,8 @@
 
 #include <asm/io.h>
 #include <asm/hardware.h>
+#include <asm/arch/at91_pio.h>
+#include <asm/arch/at91_pmc.h>
 #include <asm/arch/gpio.h>
 
 #include "generic.h"
index 5e3b6e306f1a3adea5baceccd5eed658c2087dd1..5b775fac1c6b56fac9aa97fe988daadcf2fc0462 100644 (file)
@@ -26,6 +26,8 @@
 #include <asm/mach/irq.h>
 #include <asm/mach-types.h>
 
+#include <asm/arch/at91_pmc.h>
+#include <asm/arch/at91rm9200_mc.h>
 #include <asm/arch/gpio.h>
 
 #include "generic.h"
index 4e7a1145e78fd472a70f9442e3a0c7bec461741d..cb86967e2c5f51ede04fd92b8cc553cb9475cbe8 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/watchdog.h>
 #include <asm/bitops.h>
 #include <asm/uaccess.h>
+#include <asm/arch/at91_st.h>
 
 
 #define WDT_DEFAULT_TIME       5       /* seconds */
index 494b23fb0a01930503c35e6e42336f65f06f7234..41761f7189a629f582f4be1549fbea80737dcfa3 100644 (file)
@@ -73,8 +73,8 @@
 #include <asm/mach/mmc.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>
-#include <asm/arch/at91rm9200_mci.h>
-#include <asm/arch/at91rm9200_pdc.h>
+#include <asm/arch/at91_mci.h>
+#include <asm/arch/at91_pdc.h>
 
 #define DRIVER_NAME "at91_mci"
 
index 3bcb7dc32995ce01391998d1f1e6d2a4e8162eea..6979667035129f177585f6853524ca1211f2b67d 100644 (file)
@@ -23,9 +23,9 @@
 #include <asm/io.h>
 #include <asm/sizes.h>
 
-#include <asm/arch/at91rm9200.h>
 #include <asm/arch/board.h>
 #include <asm/arch/gpio.h>
+#include <asm/arch/at91rm9200_mc.h>
 
 
 /*
index 877876e866e5e92c06a41e30b394a0c121ff3764..f930df042f9baede16cf45e4a77a71ff747d9b27 100644 (file)
@@ -36,9 +36,9 @@
 
 #include <asm/io.h>
 
-#include <asm/arch/at91rm9200_pdc.h>
 #include <asm/mach/serial_at91.h>
 #include <asm/arch/board.h>
+#include <asm/arch/at91_pdc.h>
 #ifdef CONFIG_ARM
 #include <asm/arch/system.h>
 #include <asm/arch/gpio.h>
index a5a86b1ff886d73aac3bbccb0a3a9e849cbba52e..4d51177efddde3cd1c372b39009b07f6d8f5db1f 100644 (file)
 #define AT91_BASE_SYS          0xfffff000
 
 
+/*
+ * System Peripherals (offset from AT91_BASE_SYS)
+ */
+#define AT91_AIC       (0xfffff000 - AT91_BASE_SYS)    /* Advanced Interrupt Controller */
+#define AT91_DBGU      (0xfffff200 - AT91_BASE_SYS)    /* Debug Unit */
+#define AT91_PIOA      (0xfffff400 - AT91_BASE_SYS)    /* PIO Controller A */
+#define AT91_PIOB      (0xfffff600 - AT91_BASE_SYS)    /* PIO Controller B */
+#define AT91_PIOC      (0xfffff800 - AT91_BASE_SYS)    /* PIO Controller C */
+#define AT91_PIOD      (0xfffffa00 - AT91_BASE_SYS)    /* PIO Controller D */
+#define AT91_PMC       (0xfffffc00 - AT91_BASE_SYS)    /* Power Management Controller */
+#define AT91_ST                (0xfffffd00 - AT91_BASE_SYS)    /* System Timer */
+#define AT91_RTC       (0xfffffe00 - AT91_BASE_SYS)    /* Real-Time Clock */
+#define AT91_MC                (0xffffff00 - AT91_BASE_SYS)    /* Memory Controllers */
+
+#define AT91_MATRIX    0       /* not supported */
+
 /*
  * Internal Memory.
  */
index f496b54c4c3e6bc57c0cfa8734f6f7f6bb126307..85cdadf26634af030e88334cfe2e88e9c776d843 100644 (file)
@@ -12,6 +12,7 @@
 */
 
 #include <asm/hardware.h>
+#include <asm/arch/at91_dbgu.h>
 
        .macro  addruart,rx
        mrc     p15, 0, \rx, c1, c0
index 61a326e9490903881e95974e347547c1719c0039..57248a796472215ba376cdf59763c19b92ec0fd8 100644 (file)
@@ -11,6 +11,7 @@
  */
 
 #include <asm/hardware.h>
+#include <asm/arch/at91_aic.h>
 
        .macro  disable_fiq
        .endm
index 9ca4cc9c0b2e707b4f155c9053bde7571ac981f8..d42e310584a9c24d6b3c18b8f9780bf50932ee0b 100644 (file)
 
 #include <asm/sizes.h>
 
+#if defined(CONFIG_ARCH_AT91RM9200)
 #include <asm/arch/at91rm9200.h>
-#include <asm/arch/at91rm9200_sys.h>
+#elif defined(CONFIG_ARCH_AT91SAM9260)
+#include <asm/arch/at91sam9260.h>
+#elif defined(CONFIG_ARCH_AT91SAM9261)
+#include <asm/arch/at91sam9261.h>
+#else
+#error "Unsupported AT91 processor"
+#endif
+
 
 /*
  * Remap the peripherals from address 0xFFFA0000 .. 0xFFFFFFFF
index 763cb96c418bac0f6bebc32dbb40c55f2cc1f8e9..c0679eaefaf2587013d2a280565dcce13754d7ae 100644 (file)
@@ -21,6 +21,8 @@
 #ifndef __ASM_ARCH_IRQS_H
 #define __ASM_ARCH_IRQS_H
 
+#include <asm/arch/at91_aic.h>
+
 #define NR_AIC_IRQS 32
 
 
index 92f36769b2a5e174eca36d74a2a8294423b5b614..053f2e09c1fc061d7bf4033cc0c51eb46ac3c41c 100644 (file)
@@ -22,6 +22,8 @@
 #define __ASM_ARCH_SYSTEM_H
 
 #include <asm/hardware.h>
+#include <asm/arch/at91_st.h>
+#include <asm/arch/at91_dbgu.h>
 
 static inline void arch_idle(void)
 {
index ec7811ab0a52805f97840aa50fe796ea81e6d4a1..34b4b93fa01523ad088fa9fbf699b80b7117cce0 100644 (file)
 #define __ASM_ARCH_UNCOMPRESS_H
 
 #include <asm/hardware.h>
+#include <asm/arch/at91_dbgu.h>
 
 /*
  * 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
+ * initialized by the bootloader.  If you didn't setup a port in
  * your bootloader then nothing will appear (which might be desired).
  *
  * This does not append a newline
similarity index 92%
rename from include/asm-avr32/arch-at32ap/at91rm9200_pdc.h
rename to include/asm-avr32/arch-at32ap/at91_pdc.h
index ce1150d4438d46de7fa3f9d3f7c0c08b80daeccb..79d6e02fa45e161958b64d7c51af5d3dd97d7819 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * include/asm-arm/arch-at91rm9200/at91rm9200_pdc.h
+ * include/asm-arm/arch-at91rm9200/at91_pdc.h
  *
  * Copyright (C) 2005 Ivan Kokshaysky
  * Copyright (C) SAN People
@@ -13,8 +13,8 @@
  * (at your option) any later version.
  */
 
-#ifndef AT91RM9200_PDC_H
-#define AT91RM9200_PDC_H
+#ifndef AT91_PDC_H
+#define AT91_PDC_H
 
 #define AT91_PDC_RPR           0x100   /* Receive Pointer Register */
 #define AT91_PDC_RCR           0x104   /* Receive Counter Register */