Patched in Tegra support.

5 files changed, 22 insertions, 59 deletions

diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 917d4fcfd9b..217aa1911dd 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -13,19 +13,12 @@
 struct tag;
 struct meminfo;
 struct sys_timer;
-struct pt_regs;
-struct smp_operations;
-#ifdef CONFIG_SMP
-#define smp_ops(ops) (&(ops))
-#else
-#define smp_ops(ops) (struct smp_operations *)NULL
-#endif
 
 struct machine_desc {
         unsigned int            nr;             /* architecture number  */
         const char              *name;          /* architecture name    */
-        unsigned long           atag_offset;    /* tagged list (relative) */
-        const char *const       *dt_compat;     /* array of device tree
+        unsigned long           boot_params;    /* tagged list          */
+        const char              **dt_compat;    /* array of device tree
                                                  * 'compatible' strings */
 
         unsigned int            nr_irqs;        /* number of IRQs */
@@ -37,12 +30,12 @@ struct machine_desc {
         unsigned int            video_start;    /* start of video RAM   */
         unsigned int            video_end;      /* end of video RAM     */
 
-        unsigned char           reserve_lp0 :1; /* never has lp0        */
-        unsigned char           reserve_lp1 :1; /* never has lp1        */
-        unsigned char           reserve_lp2 :1; /* never has lp2        */
-        char                    restart_mode;   /* default restart mode */
-        struct smp_operations   *smp;           /* SMP operations       */
-        void                    (*fixup)(struct tag *, char **,
+        unsigned int            reserve_lp0 :1; /* never has lp0        */
+        unsigned int            reserve_lp1 :1; /* never has lp1        */
+        unsigned int            reserve_lp2 :1; /* never has lp2        */
+        unsigned int            soft_reboot :1; /* soft reboot          */
+        void                    (*fixup)(struct machine_desc *,
+                                         struct tag *, char **,
                                          struct meminfo *);
         void                    (*reserve)(void);/* reserve mem blocks  */
         void                    (*map_io)(void);/* IO mapping function  */
@@ -50,11 +43,9 @@ struct machine_desc {
         void                    (*init_irq)(void);
         struct sys_timer        *timer;         /* system tick timer    */
         void                    (*init_machine)(void);
-        void                    (*init_late)(void);
 #ifdef CONFIG_MULTI_IRQ_HANDLER
         void                    (*handle_irq)(struct pt_regs *);
 #endif
-        void                    (*restart)(char, const char *);
 };
 
 /*
diff --git a/arch/arm/include/asm/mach/irq.h b/arch/arm/include/asm/mach/irq.h
index 15cb035309f..febe495d0c6 100644
--- a/arch/arm/include/asm/mach/irq.h
+++ b/arch/arm/include/asm/mach/irq.h
@@ -17,7 +17,7 @@ struct seq_file;
 /*
  * This is internal.  Do not use it.
  */
-extern void init_FIQ(int);
+extern void init_FIQ(void);
 extern int show_fiq_list(struct seq_file *, int);
 
 #ifdef CONFIG_MULTI_IRQ_HANDLER
diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
index 2fe141fcc8d..d2fedb5aeb1 100644
--- a/arch/arm/include/asm/mach/map.h
+++ b/arch/arm/include/asm/mach/map.h
@@ -9,9 +9,6 @@
  *
  *  Page table mapping constructs and function prototypes
  */
-#ifndef __ASM_MACH_MAP_H
-#define __ASM_MACH_MAP_H
-
 #include <asm/io.h>
 
 struct map_desc {
@@ -32,20 +29,9 @@ struct map_desc {
 #define MT_MEMORY_NONCACHED     11
 #define MT_MEMORY_DTCM          12
 #define MT_MEMORY_ITCM          13
-#define MT_MEMORY_SO            14
-#define MT_MEMORY_DMA_READY     15
 
 #ifdef CONFIG_MMU
 extern void iotable_init(struct map_desc *, int);
-extern void vm_reserve_area_early(unsigned long addr, unsigned long size,
-                                  void *caller);
-
-#ifdef CONFIG_DEBUG_LL
-extern void debug_ll_addr(unsigned long *paddr, unsigned long *vaddr);
-extern void debug_ll_io_init(void);
-#else
-static inline void debug_ll_io_init(void) {}
-#endif
 
 struct mem_type;
 extern const struct mem_type *get_mem_type(unsigned int type);
@@ -56,7 +42,4 @@ extern int ioremap_page(unsigned long virt, unsigned long phys,
                         const struct mem_type *mtype);
 #else
 #define iotable_init(map,num)   do { } while (0)
-#define vm_reserve_area_early(a,s,c)    do { } while (0)
-#endif
-
 #endif
diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
index db9fedb57f2..186efd4e05c 100644
--- a/arch/arm/include/asm/mach/pci.h
+++ b/arch/arm/include/asm/mach/pci.h
@@ -11,17 +11,14 @@
 #ifndef __ASM_MACH_PCI_H
 #define __ASM_MACH_PCI_H
 
-#include <linux/ioport.h>
-
 struct pci_sys_data;
-struct pci_ops;
 struct pci_bus;
 
 struct hw_pci {
 #ifdef CONFIG_PCI_DOMAINS
         int             domain;
 #endif
-        struct pci_ops  *ops;
+        struct list_head buses;
         int             nr_controllers;
         int             (*setup)(int nr, struct pci_sys_data *);
         struct pci_bus *(*scan)(int nr, struct pci_sys_data *);
@@ -43,49 +40,44 @@ struct pci_sys_data {
         u64             mem_offset;     /* bus->cpu memory mapping offset       */
         unsigned long   io_offset;      /* bus->cpu IO mapping offset           */
         struct pci_bus  *bus;           /* PCI bus                              */
-        struct list_head resources;     /* root bus resources (apertures)       */
-        struct resource io_res;
-        char            io_res_name[12];
+        struct resource *resource[3];   /* Primary PCI bus resources            */
                                         /* Bridge swizzling                     */
         u8              (*swizzle)(struct pci_dev *, u8 *);
                                         /* IRQ mapping                          */
         int             (*map_irq)(const struct pci_dev *, u8, u8);
+        struct hw_pci   *hw;
         void            *private_data;  /* platform controller private data     */
 };
 
 /*
- * Call this with your hw_pci struct to initialise the PCI system.
+ * This is the standard PCI-PCI bridge swizzling algorithm.
  */
-void pci_common_init(struct hw_pci *);
+#define pci_std_swizzle pci_common_swizzle
 
 /*
- * Setup early fixed I/O mapping.
+ * Call this with your hw_pci struct to initialise the PCI system.
  */
-#if defined(CONFIG_PCI)
-extern void pci_map_io_early(unsigned long pfn);
-#else
-static inline void pci_map_io_early(unsigned long pfn) {}
-#endif
+void pci_common_init(struct hw_pci *);
 
 /*
  * PCI controllers
  */
-extern struct pci_ops iop3xx_ops;
 extern int iop3xx_pci_setup(int nr, struct pci_sys_data *);
+extern struct pci_bus *iop3xx_pci_scan_bus(int nr, struct pci_sys_data *);
 extern void iop3xx_pci_preinit(void);
 extern void iop3xx_pci_preinit_cond(void);
 
-extern struct pci_ops dc21285_ops;
 extern int dc21285_setup(int nr, struct pci_sys_data *);
+extern struct pci_bus *dc21285_scan_bus(int nr, struct pci_sys_data *);
 extern void dc21285_preinit(void);
 extern void dc21285_postinit(void);
 
-extern struct pci_ops via82c505_ops;
 extern int via82c505_setup(int nr, struct pci_sys_data *);
+extern struct pci_bus *via82c505_scan_bus(int nr, struct pci_sys_data *);
 extern void via82c505_init(void *sysdata);
 
-extern struct pci_ops pci_v3_ops;
 extern int pci_v3_setup(int nr, struct pci_sys_data *);
+extern struct pci_bus *pci_v3_scan_bus(int nr, struct pci_sys_data *);
 extern void pci_v3_preinit(void);
 extern void pci_v3_postinit(void);
 
diff --git a/arch/arm/include/asm/mach/time.h b/arch/arm/include/asm/mach/time.h
index 6ca945f534a..d5adaae5ee2 100644
--- a/arch/arm/include/asm/mach/time.h
+++ b/arch/arm/include/asm/mach/time.h
@@ -10,6 +10,8 @@
 #ifndef __ASM_ARM_MACH_TIME_H
 #define __ASM_ARM_MACH_TIME_H
 
+#include <linux/sysdev.h>
+
 /*
  * This is our kernel timer structure.
  *
@@ -42,9 +44,4 @@ struct sys_timer {
 
 extern void timer_tick(void);
 
-struct timespec;
-typedef void (*clock_access_fn)(struct timespec *);
-extern int register_persistent_clock(clock_access_fn read_boot,
-                                     clock_access_fn read_persistent);
-
 #endif