44 files changed, 2519 insertions, 1826 deletions

diff --git a/include/asm-arm26/cache.h b/include/asm-arm26/cache.h
index f52ca1b808cd..8c3abcf728fe 100644
--- a/include/asm-arm26/cache.h
+++ b/include/asm-arm26/cache.h
@@ -4,7 +4,8 @@
 #ifndef __ASMARM_CACHE_H
 #define __ASMARM_CACHE_H
 
-#define        L1_CACHE_BYTES  32
+#define        L1_CACHE_SHIFT  5
+#define        L1_CACHE_BYTES  (1 << L1_CACHE_SHIFT)
 #define        L1_CACHE_ALIGN(x)       (((x)+(L1_CACHE_BYTES-1))&~(L1_CACHE_BYTES-1))
 #define        SMP_CACHE_BYTES L1_CACHE_BYTES
 
diff --git a/include/asm-arm26/thread_info.h b/include/asm-arm26/thread_info.h
index a65e58a0a767..9b367ebe515d 100644
--- a/include/asm-arm26/thread_info.h
+++ b/include/asm-arm26/thread_info.h
@@ -80,8 +80,7 @@ static inline struct thread_info *current_thread_info(void)
         return (struct thread_info *)(sp & ~0x1fff);
 }
 
-/* FIXME - PAGE_SIZE < 32K */
-#define THREAD_SIZE             (8*32768) // FIXME - this needs attention (see kernel/fork.c which gets a nice div by zero if this is lower than 8*32768
+#define THREAD_SIZE     PAGE_SIZE
 #define task_pt_regs(task) ((struct pt_regs *)(task_stack_page(task) + THREAD_SIZE - 8) - 1)
 
 extern struct thread_info *alloc_thread_info(struct task_struct *task);
diff --git a/include/asm-ia64/pal.h b/include/asm-ia64/pal.h
index e828377ad295..7708ec669a33 100644
--- a/include/asm-ia64/pal.h
+++ b/include/asm-ia64/pal.h
@@ -927,7 +927,7 @@ static inline s64
 ia64_pal_cache_flush (u64 cache_type, u64 invalidate, u64 *progress, u64 *vector)
 {
         struct ia64_pal_retval iprv;
-        PAL_CALL_IC_OFF(iprv, PAL_CACHE_FLUSH, cache_type, invalidate, *progress);
+        PAL_CALL(iprv, PAL_CACHE_FLUSH, cache_type, invalidate, *progress);
         if (vector)
                 *vector = iprv.v0;
         *progress = iprv.v1;
diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h
index 8c648bf72bbd..09b99029ac1a 100644
--- a/include/asm-ia64/processor.h
+++ b/include/asm-ia64/processor.h
@@ -25,8 +25,8 @@
  * Limits for PMC and PMD are set to less than maximum architected values
  * but should be sufficient for a while
  */
-#define IA64_NUM_PMC_REGS       32
-#define IA64_NUM_PMD_REGS       32
+#define IA64_NUM_PMC_REGS       64
+#define IA64_NUM_PMD_REGS       64
 
 #define DEFAULT_MAP_BASE        __IA64_UL_CONST(0x2000000000000000)
 #define DEFAULT_TASK_SIZE       __IA64_UL_CONST(0xa000000000000000)
diff --git a/include/asm-ia64/sn/intr.h b/include/asm-ia64/sn/intr.h
index e35074f526d9..a3431372c6e7 100644
--- a/include/asm-ia64/sn/intr.h
+++ b/include/asm-ia64/sn/intr.h
@@ -40,7 +40,7 @@ struct sn_irq_info {
         int             irq_cpuid;      /* kernel logical cpuid      */
         int             irq_irq;        /* the IRQ number */
         int             irq_int_bit;    /* Bridge interrupt pin */
-        uint64_t        irq_xtalkaddr;  /* xtalkaddr IRQ is sent to  */
+        u64     irq_xtalkaddr;  /* xtalkaddr IRQ is sent to  */
         int             irq_bridge_type;/* pciio asic type (pciio.h) */
         void           *irq_bridge;     /* bridge generating irq     */
         void           *irq_pciioinfo;  /* associated pciio_info_t   */
diff --git a/include/asm-ia64/sn/pcibr_provider.h b/include/asm-ia64/sn/pcibr_provider.h
index 2b42d9ece26b..9334078b089a 100644
--- a/include/asm-ia64/sn/pcibr_provider.h
+++ b/include/asm-ia64/sn/pcibr_provider.h
@@ -44,9 +44,9 @@
 #define PCI32_MAPPED_BASE               0x40000000
 #define PCI32_DIRECT_BASE               0x80000000
 
-#define IS_PCI32_MAPPED(x)              ((uint64_t)(x) < PCI32_DIRECT_BASE && \
-                                         (uint64_t)(x) >= PCI32_MAPPED_BASE)
-#define IS_PCI32_DIRECT(x)              ((uint64_t)(x) >= PCI32_MAPPED_BASE)
+#define IS_PCI32_MAPPED(x)              ((u64)(x) < PCI32_DIRECT_BASE && \
+                                         (u64)(x) >= PCI32_MAPPED_BASE)
+#define IS_PCI32_DIRECT(x)              ((u64)(x) >= PCI32_MAPPED_BASE)
 
 
 /*
@@ -63,7 +63,7 @@
         (IOPG(IOPGOFF(addr) + (size) - 1) == IOPG((size) - 1))
 
 #define MINIMAL_ATE_FLAG(addr, size) \
-        (MINIMAL_ATES_REQUIRED((uint64_t)addr, size) ? 1 : 0)
+        (MINIMAL_ATES_REQUIRED((u64)addr, size) ? 1 : 0)
 
 /* bit 29 of the pci address is the SWAP bit */
 #define ATE_SWAPSHIFT                   29
@@ -90,27 +90,27 @@
  * PMU resources.
  */
 struct ate_resource{
-        uint64_t *ate;
-        uint64_t num_ate;
-        uint64_t lowest_free_index;
+        u64 *ate;
+        u64 num_ate;
+        u64 lowest_free_index;
 };
 
 struct pcibus_info {
         struct pcibus_bussoft   pbi_buscommon;   /* common header */
-        uint32_t                pbi_moduleid;
+        u32                pbi_moduleid;
         short                   pbi_bridge_type;
         short                   pbi_bridge_mode;
 
         struct ate_resource     pbi_int_ate_resource;
-        uint64_t                pbi_int_ate_size;
+        u64                pbi_int_ate_size;
 
-        uint64_t                pbi_dir_xbase;
+        u64                pbi_dir_xbase;
         char                    pbi_hub_xid;
 
-        uint64_t                pbi_devreg[8];
+        u64                pbi_devreg[8];
 
-        uint32_t                pbi_valid_devices;
-        uint32_t                pbi_enabled_devices;
+        u32             pbi_valid_devices;
+        u32             pbi_enabled_devices;
 
         spinlock_t              pbi_lock;
 };
@@ -136,22 +136,22 @@ extern void pcibr_dma_unmap(struct pci_dev *, dma_addr_t, int);
 /*
  * prototypes for the bridge asic register access routines in pcibr_reg.c
  */
-extern void             pcireg_control_bit_clr(struct pcibus_info *, uint64_t);
-extern void             pcireg_control_bit_set(struct pcibus_info *, uint64_t);
-extern uint64_t         pcireg_tflush_get(struct pcibus_info *);
-extern uint64_t         pcireg_intr_status_get(struct pcibus_info *);
-extern void             pcireg_intr_enable_bit_clr(struct pcibus_info *, uint64_t);
-extern void             pcireg_intr_enable_bit_set(struct pcibus_info *, uint64_t);
-extern void             pcireg_intr_addr_addr_set(struct pcibus_info *, int, uint64_t);
+extern void             pcireg_control_bit_clr(struct pcibus_info *, u64);
+extern void             pcireg_control_bit_set(struct pcibus_info *, u64);
+extern u64         pcireg_tflush_get(struct pcibus_info *);
+extern u64         pcireg_intr_status_get(struct pcibus_info *);
+extern void             pcireg_intr_enable_bit_clr(struct pcibus_info *, u64);
+extern void             pcireg_intr_enable_bit_set(struct pcibus_info *, u64);
+extern void             pcireg_intr_addr_addr_set(struct pcibus_info *, int, u64);
 extern void             pcireg_force_intr_set(struct pcibus_info *, int);
-extern uint64_t         pcireg_wrb_flush_get(struct pcibus_info *, int);
-extern void             pcireg_int_ate_set(struct pcibus_info *, int, uint64_t);
-extern uint64_t *       pcireg_int_ate_addr(struct pcibus_info *, int);
+extern u64         pcireg_wrb_flush_get(struct pcibus_info *, int);
+extern void             pcireg_int_ate_set(struct pcibus_info *, int, u64);
+extern u64 *    pcireg_int_ate_addr(struct pcibus_info *, int);
 extern void             pcibr_force_interrupt(struct sn_irq_info *sn_irq_info);
 extern void             pcibr_change_devices_irq(struct sn_irq_info *sn_irq_info);
 extern int              pcibr_ate_alloc(struct pcibus_info *, int);
 extern void             pcibr_ate_free(struct pcibus_info *, int);
-extern void             ate_write(struct pcibus_info *, int, int, uint64_t);
+extern void             ate_write(struct pcibus_info *, int, int, u64);
 extern int sal_pcibr_slot_enable(struct pcibus_info *soft, int device,
                                  void *resp);
 extern int sal_pcibr_slot_disable(struct pcibus_info *soft, int device,
diff --git a/include/asm-ia64/sn/pcibus_provider_defs.h b/include/asm-ia64/sn/pcibus_provider_defs.h
index ad0e8e8ae53f..ce3f6c328241 100644
--- a/include/asm-ia64/sn/pcibus_provider_defs.h
+++ b/include/asm-ia64/sn/pcibus_provider_defs.h
@@ -29,13 +29,13 @@
  */
 
 struct pcibus_bussoft {
-        uint32_t                bs_asic_type;   /* chipset type */
-        uint32_t                bs_xid;         /* xwidget id */
-        uint32_t                bs_persist_busnum; /* Persistent Bus Number */
-        uint32_t                bs_persist_segment; /* Segment Number */
-        uint64_t                bs_legacy_io;   /* legacy io pio addr */
-        uint64_t                bs_legacy_mem;  /* legacy mem pio addr */
-        uint64_t                bs_base;        /* widget base */
+        u32             bs_asic_type;   /* chipset type */
+        u32             bs_xid;         /* xwidget id */
+        u32             bs_persist_busnum; /* Persistent Bus Number */
+        u32             bs_persist_segment; /* Segment Number */
+        u64             bs_legacy_io;   /* legacy io pio addr */
+        u64             bs_legacy_mem;  /* legacy mem pio addr */
+        u64             bs_base;        /* widget base */
         struct xwidget_info     *bs_xwidget_info;
 };
 
diff --git a/include/asm-ia64/sn/pcidev.h b/include/asm-ia64/sn/pcidev.h
index f65d222ca5e8..38cdffbc4c7b 100644
--- a/include/asm-ia64/sn/pcidev.h
+++ b/include/asm-ia64/sn/pcidev.h
@@ -55,8 +55,8 @@ struct sn_pci_controller {
 #define PCIIO_VENDOR_ID_NONE    (-1)
 
 struct pcidev_info {
-        uint64_t                pdi_pio_mapped_addr[7]; /* 6 BARs PLUS 1 ROM */
-        uint64_t                pdi_slot_host_handle;   /* Bus and devfn Host pci_dev */
+        u64             pdi_pio_mapped_addr[7]; /* 6 BARs PLUS 1 ROM */
+        u64             pdi_slot_host_handle;   /* Bus and devfn Host pci_dev */
 
         struct pcibus_bussoft   *pdi_pcibus_info;       /* Kernel common bus soft */
         struct pcidev_info      *pdi_host_pcidev_info;  /* Kernel Host pci_dev */
diff --git a/include/asm-ia64/sn/pic.h b/include/asm-ia64/sn/pic.h
index 0de82e6b0893..5f9da5fd6e56 100644
--- a/include/asm-ia64/sn/pic.h
+++ b/include/asm-ia64/sn/pic.h
@@ -74,120 +74,120 @@ struct pic {
     /* 0x000000-0x00FFFF -- Local Registers */
 
     /* 0x000000-0x000057 -- Standard Widget Configuration */
-    uint64_t            p_wid_id;                       /* 0x000000 */
-    uint64_t            p_wid_stat;                     /* 0x000008 */
-    uint64_t            p_wid_err_upper;                /* 0x000010 */
-    uint64_t            p_wid_err_lower;                /* 0x000018 */
+    u64         p_wid_id;                       /* 0x000000 */
+    u64         p_wid_stat;                     /* 0x000008 */
+    u64         p_wid_err_upper;                /* 0x000010 */
+    u64         p_wid_err_lower;                /* 0x000018 */
     #define p_wid_err p_wid_err_lower
-    uint64_t            p_wid_control;                  /* 0x000020 */
-    uint64_t            p_wid_req_timeout;              /* 0x000028 */
-    uint64_t            p_wid_int_upper;                /* 0x000030 */
-    uint64_t            p_wid_int_lower;                /* 0x000038 */
+    u64         p_wid_control;                  /* 0x000020 */
+    u64         p_wid_req_timeout;              /* 0x000028 */
+    u64         p_wid_int_upper;                /* 0x000030 */
+    u64         p_wid_int_lower;                /* 0x000038 */
     #define p_wid_int p_wid_int_lower
-    uint64_t            p_wid_err_cmdword;              /* 0x000040 */
-    uint64_t            p_wid_llp;                      /* 0x000048 */
-    uint64_t            p_wid_tflush;                   /* 0x000050 */
+    u64         p_wid_err_cmdword;              /* 0x000040 */
+    u64         p_wid_llp;                      /* 0x000048 */
+    u64         p_wid_tflush;                   /* 0x000050 */
 
     /* 0x000058-0x00007F -- Bridge-specific Widget Configuration */
-    uint64_t            p_wid_aux_err;                  /* 0x000058 */
-    uint64_t            p_wid_resp_upper;               /* 0x000060 */
-    uint64_t            p_wid_resp_lower;               /* 0x000068 */
+    u64         p_wid_aux_err;                  /* 0x000058 */
+    u64         p_wid_resp_upper;               /* 0x000060 */
+    u64         p_wid_resp_lower;               /* 0x000068 */
     #define p_wid_resp p_wid_resp_lower
-    uint64_t            p_wid_tst_pin_ctrl;             /* 0x000070 */
-    uint64_t            p_wid_addr_lkerr;               /* 0x000078 */
+    u64         p_wid_tst_pin_ctrl;             /* 0x000070 */
+    u64         p_wid_addr_lkerr;               /* 0x000078 */
 
     /* 0x000080-0x00008F -- PMU & MAP */
-    uint64_t            p_dir_map;                      /* 0x000080 */
-    uint64_t            _pad_000088;                    /* 0x000088 */
+    u64         p_dir_map;                      /* 0x000080 */
+    u64         _pad_000088;                    /* 0x000088 */
 
     /* 0x000090-0x00009F -- SSRAM */
-    uint64_t            p_map_fault;                    /* 0x000090 */
-    uint64_t            _pad_000098;                    /* 0x000098 */
+    u64         p_map_fault;                    /* 0x000090 */
+    u64         _pad_000098;                    /* 0x000098 */
 
     /* 0x0000A0-0x0000AF -- Arbitration */
-    uint64_t            p_arb;                          /* 0x0000A0 */
-    uint64_t            _pad_0000A8;                    /* 0x0000A8 */
+    u64         p_arb;                          /* 0x0000A0 */
+    u64         _pad_0000A8;                    /* 0x0000A8 */
 
     /* 0x0000B0-0x0000BF -- Number In A Can or ATE Parity Error */
-    uint64_t            p_ate_parity_err;               /* 0x0000B0 */
-    uint64_t            _pad_0000B8;                    /* 0x0000B8 */
+    u64         p_ate_parity_err;               /* 0x0000B0 */
+    u64         _pad_0000B8;                    /* 0x0000B8 */
 
     /* 0x0000C0-0x0000FF -- PCI/GIO */
-    uint64_t            p_bus_timeout;                  /* 0x0000C0 */
-    uint64_t            p_pci_cfg;                      /* 0x0000C8 */
-    uint64_t            p_pci_err_upper;                /* 0x0000D0 */
-    uint64_t            p_pci_err_lower;                /* 0x0000D8 */
+    u64         p_bus_timeout;                  /* 0x0000C0 */
+    u64         p_pci_cfg;                      /* 0x0000C8 */
+    u64         p_pci_err_upper;                /* 0x0000D0 */
+    u64         p_pci_err_lower;                /* 0x0000D8 */
     #define p_pci_err p_pci_err_lower
-    uint64_t            _pad_0000E0[4];                 /* 0x0000{E0..F8} */
+    u64         _pad_0000E0[4];                 /* 0x0000{E0..F8} */
 
     /* 0x000100-0x0001FF -- Interrupt */
-    uint64_t            p_int_status;                   /* 0x000100 */
-    uint64_t            p_int_enable;                   /* 0x000108 */
-    uint64_t            p_int_rst_stat;                 /* 0x000110 */
-    uint64_t            p_int_mode;                     /* 0x000118 */
-    uint64_t            p_int_device;                   /* 0x000120 */
-    uint64_t            p_int_host_err;                 /* 0x000128 */
-    uint64_t            p_int_addr[8];                  /* 0x0001{30,,,68} */
-    uint64_t            p_err_int_view;                 /* 0x000170 */
-    uint64_t            p_mult_int;                     /* 0x000178 */
-    uint64_t            p_force_always[8];              /* 0x0001{80,,,B8} */
-    uint64_t            p_force_pin[8];                 /* 0x0001{C0,,,F8} */
+    u64         p_int_status;                   /* 0x000100 */
+    u64         p_int_enable;                   /* 0x000108 */
+    u64         p_int_rst_stat;                 /* 0x000110 */
+    u64         p_int_mode;                     /* 0x000118 */
+    u64         p_int_device;                   /* 0x000120 */
+    u64         p_int_host_err;                 /* 0x000128 */
+    u64         p_int_addr[8];                  /* 0x0001{30,,,68} */
+    u64         p_err_int_view;                 /* 0x000170 */
+    u64         p_mult_int;                     /* 0x000178 */
+    u64         p_force_always[8];              /* 0x0001{80,,,B8} */
+    u64         p_force_pin[8];                 /* 0x0001{C0,,,F8} */
 
     /* 0x000200-0x000298 -- Device */
-    uint64_t            p_device[4];                    /* 0x0002{00,,,18} */
-    uint64_t            _pad_000220[4];                 /* 0x0002{20,,,38} */
-    uint64_t            p_wr_req_buf[4];                /* 0x0002{40,,,58} */
-    uint64_t            _pad_000260[4];                 /* 0x0002{60,,,78} */
-    uint64_t            p_rrb_map[2];                   /* 0x0002{80,,,88} */
+    u64         p_device[4];                    /* 0x0002{00,,,18} */
+    u64         _pad_000220[4];                 /* 0x0002{20,,,38} */
+    u64         p_wr_req_buf[4];                /* 0x0002{40,,,58} */
+    u64         _pad_000260[4];                 /* 0x0002{60,,,78} */
+    u64         p_rrb_map[2];                   /* 0x0002{80,,,88} */
     #define p_even_resp p_rrb_map[0]                    /* 0x000280 */
     #define p_odd_resp  p_rrb_map[1]                    /* 0x000288 */
-    uint64_t            p_resp_status;                  /* 0x000290 */
-    uint64_t            p_resp_clear;                   /* 0x000298 */
+    u64         p_resp_status;                  /* 0x000290 */
+    u64         p_resp_clear;                   /* 0x000298 */
 
-    uint64_t            _pad_0002A0[12];                /* 0x0002{A0..F8} */
+    u64         _pad_0002A0[12];                /* 0x0002{A0..F8} */
 
     /* 0x000300-0x0003F8 -- Buffer Address Match Registers */
     struct {
-        uint64_t        upper;                          /* 0x0003{00,,,F0} */
-        uint64_t        lower;                          /* 0x0003{08,,,F8} */
+        u64     upper;                          /* 0x0003{00,,,F0} */
+        u64     lower;                          /* 0x0003{08,,,F8} */
     } p_buf_addr_match[16];
 
     /* 0x000400-0x0005FF -- Performance Monitor Registers (even only) */
     struct {
-        uint64_t        flush_w_touch;                  /* 0x000{400,,,5C0} */
-        uint64_t        flush_wo_touch;                 /* 0x000{408,,,5C8} */
-        uint64_t        inflight;                       /* 0x000{410,,,5D0} */
-        uint64_t        prefetch;                       /* 0x000{418,,,5D8} */
-        uint64_t        total_pci_retry;                /* 0x000{420,,,5E0} */
-        uint64_t        max_pci_retry;                  /* 0x000{428,,,5E8} */
-        uint64_t        max_latency;                    /* 0x000{430,,,5F0} */
-        uint64_t        clear_all;                      /* 0x000{438,,,5F8} */
+        u64     flush_w_touch;                  /* 0x000{400,,,5C0} */
+        u64     flush_wo_touch;                 /* 0x000{408,,,5C8} */
+        u64     inflight;                       /* 0x000{410,,,5D0} */
+        u64     prefetch;                       /* 0x000{418,,,5D8} */
+        u64     total_pci_retry;                /* 0x000{420,,,5E0} */
+        u64     max_pci_retry;                  /* 0x000{428,,,5E8} */
+        u64     max_latency;                    /* 0x000{430,,,5F0} */
+        u64     clear_all;                      /* 0x000{438,,,5F8} */
     } p_buf_count[8];
 
 
     /* 0x000600-0x0009FF -- PCI/X registers */
-    uint64_t            p_pcix_bus_err_addr;            /* 0x000600 */
-    uint64_t            p_pcix_bus_err_attr;            /* 0x000608 */
-    uint64_t            p_pcix_bus_err_data;            /* 0x000610 */
-    uint64_t            p_pcix_pio_split_addr;          /* 0x000618 */
-    uint64_t            p_pcix_pio_split_attr;          /* 0x000620 */
-    uint64_t            p_pcix_dma_req_err_attr;        /* 0x000628 */
-    uint64_t            p_pcix_dma_req_err_addr;        /* 0x000630 */
-    uint64_t            p_pcix_timeout;                 /* 0x000638 */
+    u64         p_pcix_bus_err_addr;            /* 0x000600 */
+    u64         p_pcix_bus_err_attr;            /* 0x000608 */
+    u64         p_pcix_bus_err_data;            /* 0x000610 */
+    u64         p_pcix_pio_split_addr;          /* 0x000618 */
+    u64         p_pcix_pio_split_attr;          /* 0x000620 */
+    u64         p_pcix_dma_req_err_attr;        /* 0x000628 */
+    u64         p_pcix_dma_req_err_addr;        /* 0x000630 */
+    u64         p_pcix_timeout;                 /* 0x000638 */
 
-    uint64_t            _pad_000640[120];               /* 0x000{640,,,9F8} */
+    u64         _pad_000640[120];               /* 0x000{640,,,9F8} */
 
     /* 0x000A00-0x000BFF -- PCI/X Read&Write Buffer */
     struct {
-        uint64_t        p_buf_addr;                     /* 0x000{A00,,,AF0} */
-        uint64_t        p_buf_attr;                     /* 0X000{A08,,,AF8} */
+        u64     p_buf_addr;                     /* 0x000{A00,,,AF0} */
+        u64     p_buf_attr;                     /* 0X000{A08,,,AF8} */
     } p_pcix_read_buf_64[16];
 
     struct {
-        uint64_t        p_buf_addr;                     /* 0x000{B00,,,BE0} */
-        uint64_t        p_buf_attr;                     /* 0x000{B08,,,BE8} */
-        uint64_t        p_buf_valid;                    /* 0x000{B10,,,BF0} */
-        uint64_t        __pad1;                         /* 0x000{B18,,,BF8} */
+        u64     p_buf_addr;                     /* 0x000{B00,,,BE0} */
+        u64     p_buf_attr;                     /* 0x000{B08,,,BE8} */
+        u64     p_buf_valid;                    /* 0x000{B10,,,BF0} */
+        u64     __pad1;                         /* 0x000{B18,,,BF8} */
     } p_pcix_write_buf_64[8];
 
     /* End of Local Registers -- Start of Address Map space */
@@ -195,45 +195,45 @@ struct pic {
     char                _pad_000c00[0x010000 - 0x000c00];
 
     /* 0x010000-0x011fff -- Internal ATE RAM (Auto Parity Generation) */
-    uint64_t            p_int_ate_ram[1024];            /* 0x010000-0x011fff */
+    u64         p_int_ate_ram[1024];            /* 0x010000-0x011fff */
 
     /* 0x012000-0x013fff -- Internal ATE RAM (Manual Parity Generation) */
-    uint64_t            p_int_ate_ram_mp[1024];         /* 0x012000-0x013fff */
+    u64         p_int_ate_ram_mp[1024];         /* 0x012000-0x013fff */
 
     char                _pad_014000[0x18000 - 0x014000];
 
     /* 0x18000-0x197F8 -- PIC Write Request Ram */
-    uint64_t            p_wr_req_lower[256];            /* 0x18000 - 0x187F8 */
-    uint64_t            p_wr_req_upper[256];            /* 0x18800 - 0x18FF8 */
-    uint64_t            p_wr_req_parity[256];           /* 0x19000 - 0x197F8 */
+    u64         p_wr_req_lower[256];            /* 0x18000 - 0x187F8 */
+    u64         p_wr_req_upper[256];            /* 0x18800 - 0x18FF8 */
+    u64         p_wr_req_parity[256];           /* 0x19000 - 0x197F8 */
 
     char                _pad_019800[0x20000 - 0x019800];
 
     /* 0x020000-0x027FFF -- PCI Device Configuration Spaces */
     union {
-        uint8_t         c[0x1000 / 1];                  /* 0x02{0000,,,7FFF} */
-        uint16_t        s[0x1000 / 2];                  /* 0x02{0000,,,7FFF} */
-        uint32_t        l[0x1000 / 4];                  /* 0x02{0000,,,7FFF} */
-        uint64_t        d[0x1000 / 8];                  /* 0x02{0000,,,7FFF} */
+        u8              c[0x1000 / 1];                  /* 0x02{0000,,,7FFF} */
+        u16     s[0x1000 / 2];                  /* 0x02{0000,,,7FFF} */
+        u32     l[0x1000 / 4];                  /* 0x02{0000,,,7FFF} */
+        u64     d[0x1000 / 8];                  /* 0x02{0000,,,7FFF} */
         union {
-            uint8_t     c[0x100 / 1];
-            uint16_t    s[0x100 / 2];
-            uint32_t    l[0x100 / 4];
-            uint64_t    d[0x100 / 8];
+            u8  c[0x100 / 1];
+            u16 s[0x100 / 2];
+            u32 l[0x100 / 4];
+            u64 d[0x100 / 8];
         } f[8];
     } p_type0_cfg_dev[8];                               /* 0x02{0000,,,7FFF} */
 
     /* 0x028000-0x028FFF -- PCI Type 1 Configuration Space */
     union {
-        uint8_t         c[0x1000 / 1];                  /* 0x028000-0x029000 */
-        uint16_t        s[0x1000 / 2];                  /* 0x028000-0x029000 */
-        uint32_t        l[0x1000 / 4];                  /* 0x028000-0x029000 */
-        uint64_t        d[0x1000 / 8];                  /* 0x028000-0x029000 */
+        u8              c[0x1000 / 1];                  /* 0x028000-0x029000 */
+        u16     s[0x1000 / 2];                  /* 0x028000-0x029000 */
+        u32     l[0x1000 / 4];                  /* 0x028000-0x029000 */
+        u64     d[0x1000 / 8];                  /* 0x028000-0x029000 */
         union {
-            uint8_t     c[0x100 / 1];
-            uint16_t    s[0x100 / 2];
-            uint32_t    l[0x100 / 4];
-            uint64_t    d[0x100 / 8];
+            u8  c[0x100 / 1];
+            u16 s[0x100 / 2];
+            u32 l[0x100 / 4];
+            u64 d[0x100 / 8];
         } f[8];
     } p_type1_cfg;                                      /* 0x028000-0x029000 */
 
@@ -241,20 +241,20 @@ struct pic {
 
     /* 0x030000-0x030007 -- PCI Interrupt Acknowledge Cycle */
     union {
-        uint8_t         c[8 / 1];
-        uint16_t        s[8 / 2];
-        uint32_t        l[8 / 4];
-        uint64_t        d[8 / 8];
+        u8              c[8 / 1];
+        u16     s[8 / 2];
+        u32     l[8 / 4];
+        u64     d[8 / 8];
     } p_pci_iack;                                       /* 0x030000-0x030007 */
 
     char                _pad_030007[0x040000-0x030008];
 
     /* 0x040000-0x030007 -- PCIX Special Cycle */
     union {
-        uint8_t         c[8 / 1];
-        uint16_t        s[8 / 2];
-        uint32_t        l[8 / 4];
-        uint64_t        d[8 / 8];
+        u8              c[8 / 1];
+        u16     s[8 / 2];
+        u32     l[8 / 4];
+        u64     d[8 / 8];
     } p_pcix_cycle;                                     /* 0x040000-0x040007 */
 };
 
diff --git a/include/asm-ia64/sn/shubio.h b/include/asm-ia64/sn/shubio.h
index 831b72111fdc..22a6f18a5313 100644
--- a/include/asm-ia64/sn/shubio.h
+++ b/include/asm-ia64/sn/shubio.h
@@ -227,13 +227,13 @@
  ************************************************************************/
 
 typedef union ii_wid_u {
-        uint64_t ii_wid_regval;
+        u64 ii_wid_regval;
         struct {
-                uint64_t w_rsvd_1:1;
-                uint64_t w_mfg_num:11;
-                uint64_t w_part_num:16;
-                uint64_t w_rev_num:4;
-                uint64_t w_rsvd:32;
+                u64 w_rsvd_1:1;
+                u64 w_mfg_num:11;
+                u64 w_part_num:16;
+                u64 w_rev_num:4;
+                u64 w_rsvd:32;
         } ii_wid_fld_s;
 } ii_wid_u_t;
 
@@ -246,18 +246,18 @@ typedef union ii_wid_u {
  ************************************************************************/
 
 typedef union ii_wstat_u {
-        uint64_t ii_wstat_regval;
-        struct {
-                uint64_t w_pending:4;
-                uint64_t w_xt_crd_to:1;
-                uint64_t w_xt_tail_to:1;
-                uint64_t w_rsvd_3:3;
-                uint64_t w_tx_mx_rty:1;
-                uint64_t w_rsvd_2:6;
-                uint64_t w_llp_tx_cnt:8;
-                uint64_t w_rsvd_1:8;
-                uint64_t w_crazy:1;
-                uint64_t w_rsvd:31;
+        u64 ii_wstat_regval;
+        struct {
+                u64 w_pending:4;
+                u64 w_xt_crd_to:1;
+                u64 w_xt_tail_to:1;
+                u64 w_rsvd_3:3;
+                u64 w_tx_mx_rty:1;
+                u64 w_rsvd_2:6;
+                u64 w_llp_tx_cnt:8;
+                u64 w_rsvd_1:8;
+                u64 w_crazy:1;
+                u64 w_rsvd:31;
         } ii_wstat_fld_s;
 } ii_wstat_u_t;
 
@@ -269,16 +269,16 @@ typedef union ii_wstat_u {
  ************************************************************************/
 
 typedef union ii_wcr_u {
-        uint64_t ii_wcr_regval;
-        struct {
-                uint64_t w_wid:4;
-                uint64_t w_tag:1;
-                uint64_t w_rsvd_1:8;
-                uint64_t w_dst_crd:3;
-                uint64_t w_f_bad_pkt:1;
-                uint64_t w_dir_con:1;
-                uint64_t w_e_thresh:5;
-                uint64_t w_rsvd:41;
+        u64 ii_wcr_regval;
+        struct {
+                u64 w_wid:4;
+                u64 w_tag:1;
+                u64 w_rsvd_1:8;
+                u64 w_dst_crd:3;
+                u64 w_f_bad_pkt:1;
+                u64 w_dir_con:1;
+                u64 w_e_thresh:5;
+                u64 w_rsvd:41;
         } ii_wcr_fld_s;
 } ii_wcr_u_t;
 
@@ -310,9 +310,9 @@ typedef union ii_wcr_u {
  ************************************************************************/
 
 typedef union ii_ilapr_u {
-        uint64_t ii_ilapr_regval;
+        u64 ii_ilapr_regval;
         struct {
-                uint64_t i_region:64;
+                u64 i_region:64;
         } ii_ilapr_fld_s;
 } ii_ilapr_u_t;
 
@@ -330,9 +330,9 @@ typedef union ii_ilapr_u {
  ************************************************************************/
 
 typedef union ii_ilapo_u {
-        uint64_t ii_ilapo_regval;
+        u64 ii_ilapo_regval;
         struct {
-                uint64_t i_io_ovrride:64;
+                u64 i_io_ovrride:64;
         } ii_ilapo_fld_s;
 } ii_ilapo_u_t;
 
@@ -344,12 +344,12 @@ typedef union ii_ilapo_u {
  ************************************************************************/
 
 typedef union ii_iowa_u {
-        uint64_t ii_iowa_regval;
+        u64 ii_iowa_regval;
         struct {
-                uint64_t i_w0_oac:1;
-                uint64_t i_rsvd_1:7;
-                uint64_t i_wx_oac:8;
-                uint64_t i_rsvd:48;
+                u64 i_w0_oac:1;
+                u64 i_rsvd_1:7;
+                u64 i_wx_oac:8;
+                u64 i_rsvd:48;
         } ii_iowa_fld_s;
 } ii_iowa_u_t;
 
@@ -363,12 +363,12 @@ typedef union ii_iowa_u {
  ************************************************************************/
 
 typedef union ii_iiwa_u {
-        uint64_t ii_iiwa_regval;
+        u64 ii_iiwa_regval;
         struct {
-                uint64_t i_w0_iac:1;
-                uint64_t i_rsvd_1:7;
-                uint64_t i_wx_iac:8;
-                uint64_t i_rsvd:48;
+                u64 i_w0_iac:1;
+                u64 i_rsvd_1:7;
+                u64 i_wx_iac:8;
+                u64 i_rsvd:48;
         } ii_iiwa_fld_s;
 } ii_iiwa_u_t;
 
@@ -392,16 +392,16 @@ typedef union ii_iiwa_u {
  ************************************************************************/
 
 typedef union ii_iidem_u {
-        uint64_t ii_iidem_regval;
-        struct {
-                uint64_t i_w8_dxs:8;
-                uint64_t i_w9_dxs:8;
-                uint64_t i_wa_dxs:8;
-                uint64_t i_wb_dxs:8;
-                uint64_t i_wc_dxs:8;
-                uint64_t i_wd_dxs:8;
-                uint64_t i_we_dxs:8;
-                uint64_t i_wf_dxs:8;
+        u64 ii_iidem_regval;
+        struct {
+                u64 i_w8_dxs:8;
+                u64 i_w9_dxs:8;
+                u64 i_wa_dxs:8;
+                u64 i_wb_dxs:8;
+                u64 i_wc_dxs:8;
+                u64 i_wd_dxs:8;
+                u64 i_we_dxs:8;
+                u64 i_wf_dxs:8;
         } ii_iidem_fld_s;
 } ii_iidem_u_t;
 
@@ -413,22 +413,22 @@ typedef union ii_iidem_u {
  ************************************************************************/
 
 typedef union ii_ilcsr_u {
-        uint64_t ii_ilcsr_regval;
-        struct {
-                uint64_t i_nullto:6;
-                uint64_t i_rsvd_4:2;
-                uint64_t i_wrmrst:1;
-                uint64_t i_rsvd_3:1;
-                uint64_t i_llp_en:1;
-                uint64_t i_bm8:1;
-                uint64_t i_llp_stat:2;
-                uint64_t i_remote_power:1;
-                uint64_t i_rsvd_2:1;
-                uint64_t i_maxrtry:10;
-                uint64_t i_d_avail_sel:2;
-                uint64_t i_rsvd_1:4;
-                uint64_t i_maxbrst:10;
-                uint64_t i_rsvd:22;
+        u64 ii_ilcsr_regval;
+        struct {
+                u64 i_nullto:6;
+                u64 i_rsvd_4:2;
+                u64 i_wrmrst:1;
+                u64 i_rsvd_3:1;
+                u64 i_llp_en:1;
+                u64 i_bm8:1;
+                u64 i_llp_stat:2;
+                u64 i_remote_power:1;
+                u64 i_rsvd_2:1;
+                u64 i_maxrtry:10;
+                u64 i_d_avail_sel:2;
+                u64 i_rsvd_1:4;
+                u64 i_maxbrst:10;
+                u64 i_rsvd:22;
 
         } ii_ilcsr_fld_s;
 } ii_ilcsr_u_t;
@@ -441,11 +441,11 @@ typedef union ii_ilcsr_u {
  ************************************************************************/
 
 typedef union ii_illr_u {
-        uint64_t ii_illr_regval;
+        u64 ii_illr_regval;
         struct {
-                uint64_t i_sn_cnt:16;
-                uint64_t i_cb_cnt:16;
-                uint64_t i_rsvd:32;
+                u64 i_sn_cnt:16;
+                u64 i_cb_cnt:16;
+                u64 i_rsvd:32;
         } ii_illr_fld_s;
 } ii_illr_u_t;
 
@@ -464,19 +464,19 @@ typedef union ii_illr_u {
  ************************************************************************/
 
 typedef union ii_iidsr_u {
-        uint64_t ii_iidsr_regval;
-        struct {
-                uint64_t i_level:8;
-                uint64_t i_pi_id:1;
-                uint64_t i_node:11;
-                uint64_t i_rsvd_3:4;
-                uint64_t i_enable:1;
-                uint64_t i_rsvd_2:3;
-                uint64_t i_int_sent:2;
-                uint64_t i_rsvd_1:2;
-                uint64_t i_pi0_forward_int:1;
-                uint64_t i_pi1_forward_int:1;
-                uint64_t i_rsvd:30;
+        u64 ii_iidsr_regval;
+        struct {
+                u64 i_level:8;
+                u64 i_pi_id:1;
+                u64 i_node:11;
+                u64 i_rsvd_3:4;
+                u64 i_enable:1;
+                u64 i_rsvd_2:3;
+                u64 i_int_sent:2;
+                u64 i_rsvd_1:2;
+                u64 i_pi0_forward_int:1;
+                u64 i_pi1_forward_int:1;
+                u64 i_rsvd:30;
         } ii_iidsr_fld_s;
 } ii_iidsr_u_t;
 
@@ -492,13 +492,13 @@ typedef union ii_iidsr_u {
  ************************************************************************/
 
 typedef union ii_igfx0_u {
-        uint64_t ii_igfx0_regval;
+        u64 ii_igfx0_regval;
         struct {
-                uint64_t i_w_num:4;
-                uint64_t i_pi_id:1;
-                uint64_t i_n_num:12;
-                uint64_t i_p_num:1;
-                uint64_t i_rsvd:46;
+                u64 i_w_num:4;
+                u64 i_pi_id:1;
+                u64 i_n_num:12;
+                u64 i_p_num:1;
+                u64 i_rsvd:46;
         } ii_igfx0_fld_s;
 } ii_igfx0_u_t;
 
@@ -514,13 +514,13 @@ typedef union ii_igfx0_u {
  ************************************************************************/
 
 typedef union ii_igfx1_u {
-        uint64_t ii_igfx1_regval;
+        u64 ii_igfx1_regval;
         struct {
-                uint64_t i_w_num:4;
-                uint64_t i_pi_id:1;
-                uint64_t i_n_num:12;
-                uint64_t i_p_num:1;
-                uint64_t i_rsvd:46;
+                u64 i_w_num:4;
+                u64 i_pi_id:1;
+                u64 i_n_num:12;
+                u64 i_p_num:1;
+                u64 i_rsvd:46;
         } ii_igfx1_fld_s;
 } ii_igfx1_u_t;
 
@@ -532,9 +532,9 @@ typedef union ii_igfx1_u {
  ************************************************************************/
 
 typedef union ii_iscr0_u {
-        uint64_t ii_iscr0_regval;
+        u64 ii_iscr0_regval;
         struct {
-                uint64_t i_scratch:64;
+                u64 i_scratch:64;
         } ii_iscr0_fld_s;
 } ii_iscr0_u_t;
 
@@ -546,9 +546,9 @@ typedef union ii_iscr0_u {
  ************************************************************************/
 
 typedef union ii_iscr1_u {
-        uint64_t ii_iscr1_regval;
+        u64 ii_iscr1_regval;
         struct {
-                uint64_t i_scratch:64;
+                u64 i_scratch:64;
         } ii_iscr1_fld_s;
 } ii_iscr1_u_t;
 
@@ -580,13 +580,13 @@ typedef union ii_iscr1_u {
  ************************************************************************/
 
 typedef union ii_itte1_u {
-        uint64_t ii_itte1_regval;
+        u64 ii_itte1_regval;
         struct {
-                uint64_t i_offset:5;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_w_num:4;
-                uint64_t i_iosp:1;
-                uint64_t i_rsvd:51;
+                u64 i_offset:5;
+                u64 i_rsvd_1:3;
+                u64 i_w_num:4;
+                u64 i_iosp:1;
+                u64 i_rsvd:51;
         } ii_itte1_fld_s;
 } ii_itte1_u_t;
 
@@ -618,13 +618,13 @@ typedef union ii_itte1_u {
  ************************************************************************/
 
 typedef union ii_itte2_u {
-        uint64_t ii_itte2_regval;
+        u64 ii_itte2_regval;
         struct {
-                uint64_t i_offset:5;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_w_num:4;
-                uint64_t i_iosp:1;
-                uint64_t i_rsvd:51;
+                u64 i_offset:5;
+                u64 i_rsvd_1:3;
+                u64 i_w_num:4;
+                u64 i_iosp:1;
+                u64 i_rsvd:51;
         } ii_itte2_fld_s;
 } ii_itte2_u_t;
 
@@ -656,13 +656,13 @@ typedef union ii_itte2_u {
  ************************************************************************/
 
 typedef union ii_itte3_u {
-        uint64_t ii_itte3_regval;
+        u64 ii_itte3_regval;
         struct {
-                uint64_t i_offset:5;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_w_num:4;
-                uint64_t i_iosp:1;
-                uint64_t i_rsvd:51;
+                u64 i_offset:5;
+                u64 i_rsvd_1:3;
+                u64 i_w_num:4;
+                u64 i_iosp:1;
+                u64 i_rsvd:51;
         } ii_itte3_fld_s;
 } ii_itte3_u_t;
 
@@ -694,13 +694,13 @@ typedef union ii_itte3_u {
  ************************************************************************/
 
 typedef union ii_itte4_u {
-        uint64_t ii_itte4_regval;
+        u64 ii_itte4_regval;
         struct {
-                uint64_t i_offset:5;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_w_num:4;
-                uint64_t i_iosp:1;
-                uint64_t i_rsvd:51;
+                u64 i_offset:5;
+                u64 i_rsvd_1:3;
+                u64 i_w_num:4;
+                u64 i_iosp:1;
+                u64 i_rsvd:51;
         } ii_itte4_fld_s;
 } ii_itte4_u_t;
 
@@ -732,13 +732,13 @@ typedef union ii_itte4_u {
  ************************************************************************/
 
 typedef union ii_itte5_u {
-        uint64_t ii_itte5_regval;
+        u64 ii_itte5_regval;
         struct {
-                uint64_t i_offset:5;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_w_num:4;
-                uint64_t i_iosp:1;
-                uint64_t i_rsvd:51;
+                u64 i_offset:5;
+                u64 i_rsvd_1:3;
+                u64 i_w_num:4;
+                u64 i_iosp:1;
+                u64 i_rsvd:51;
         } ii_itte5_fld_s;
 } ii_itte5_u_t;
 
@@ -770,13 +770,13 @@ typedef union ii_itte5_u {
  ************************************************************************/
 
 typedef union ii_itte6_u {
-        uint64_t ii_itte6_regval;
+        u64 ii_itte6_regval;
         struct {
-                uint64_t i_offset:5;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_w_num:4;
-                uint64_t i_iosp:1;
-                uint64_t i_rsvd:51;
+                u64 i_offset:5;
+                u64 i_rsvd_1:3;
+                u64 i_w_num:4;
+                u64 i_iosp:1;
+                u64 i_rsvd:51;
         } ii_itte6_fld_s;
 } ii_itte6_u_t;
 
@@ -808,13 +808,13 @@ typedef union ii_itte6_u {
  ************************************************************************/
 
 typedef union ii_itte7_u {
-        uint64_t ii_itte7_regval;
+        u64 ii_itte7_regval;
         struct {
-                uint64_t i_offset:5;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_w_num:4;
-                uint64_t i_iosp:1;
-                uint64_t i_rsvd:51;
+                u64 i_offset:5;
+                u64 i_rsvd_1:3;
+                u64 i_w_num:4;
+                u64 i_iosp:1;
+                u64 i_rsvd:51;
         } ii_itte7_fld_s;
 } ii_itte7_u_t;
 
@@ -843,22 +843,22 @@ typedef union ii_itte7_u {
  ************************************************************************/
 
 typedef union ii_iprb0_u {
-        uint64_t ii_iprb0_regval;
-        struct {
-                uint64_t i_c:8;
-                uint64_t i_na:14;
-                uint64_t i_rsvd_2:2;
-                uint64_t i_nb:14;
-                uint64_t i_rsvd_1:2;
-                uint64_t i_m:2;
-                uint64_t i_f:1;
-                uint64_t i_of_cnt:5;
-                uint64_t i_error:1;
-                uint64_t i_rd_to:1;
-                uint64_t i_spur_wr:1;
-                uint64_t i_spur_rd:1;
-                uint64_t i_rsvd:11;
-                uint64_t i_mult_err:1;
+        u64 ii_iprb0_regval;
+        struct {
+                u64 i_c:8;
+                u64 i_na:14;
+                u64 i_rsvd_2:2;
+                u64 i_nb:14;
+                u64 i_rsvd_1:2;
+                u64 i_m:2;
+                u64 i_f:1;
+                u64 i_of_cnt:5;
+                u64 i_error:1;
+                u64 i_rd_to:1;
+                u64 i_spur_wr:1;
+                u64 i_spur_rd:1;
+                u64 i_rsvd:11;
+                u64 i_mult_err:1;
         } ii_iprb0_fld_s;
 } ii_iprb0_u_t;
 
@@ -887,22 +887,22 @@ typedef union ii_iprb0_u {
  ************************************************************************/
 
 typedef union ii_iprb8_u {
-        uint64_t ii_iprb8_regval;
-        struct {
-                uint64_t i_c:8;
-                uint64_t i_na:14;
-                uint64_t i_rsvd_2:2;
-                uint64_t i_nb:14;
-                uint64_t i_rsvd_1:2;
-                uint64_t i_m:2;
-                uint64_t i_f:1;
-                uint64_t i_of_cnt:5;
-                uint64_t i_error:1;
-                uint64_t i_rd_to:1;
-                uint64_t i_spur_wr:1;
-                uint64_t i_spur_rd:1;
-                uint64_t i_rsvd:11;
-                uint64_t i_mult_err:1;
+        u64 ii_iprb8_regval;
+        struct {
+                u64 i_c:8;
+                u64 i_na:14;
+                u64 i_rsvd_2:2;
+                u64 i_nb:14;
+                u64 i_rsvd_1:2;
+                u64 i_m:2;
+                u64 i_f:1;
+                u64 i_of_cnt:5;
+                u64 i_error:1;
+                u64 i_rd_to:1;
+                u64 i_spur_wr:1;
+                u64 i_spur_rd:1;
+                u64 i_rsvd:11;
+                u64 i_mult_err:1;
         } ii_iprb8_fld_s;
 } ii_iprb8_u_t;
 
@@ -931,22 +931,22 @@ typedef union ii_iprb8_u {
  ************************************************************************/
 
 typedef union ii_iprb9_u {
-        uint64_t ii_iprb9_regval;
-        struct {
-                uint64_t i_c:8;
-                uint64_t i_na:14;
-                uint64_t i_rsvd_2:2;
-                uint64_t i_nb:14;
-                uint64_t i_rsvd_1:2;
-                uint64_t i_m:2;
-                uint64_t i_f:1;
-                uint64_t i_of_cnt:5;
-                uint64_t i_error:1;
-                uint64_t i_rd_to:1;
-                uint64_t i_spur_wr:1;
-                uint64_t i_spur_rd:1;
-                uint64_t i_rsvd:11;
-                uint64_t i_mult_err:1;
+        u64 ii_iprb9_regval;
+        struct {
+                u64 i_c:8;
+                u64 i_na:14;
+                u64 i_rsvd_2:2;
+                u64 i_nb:14;
+                u64 i_rsvd_1:2;
+                u64 i_m:2;
+                u64 i_f:1;
+                u64 i_of_cnt:5;
+                u64 i_error:1;
+                u64 i_rd_to:1;
+                u64 i_spur_wr:1;
+                u64 i_spur_rd:1;
+                u64 i_rsvd:11;
+                u64 i_mult_err:1;
         } ii_iprb9_fld_s;
 } ii_iprb9_u_t;
 
@@ -975,22 +975,22 @@ typedef union ii_iprb9_u {
  ************************************************************************/
 
 typedef union ii_iprba_u {
-        uint64_t ii_iprba_regval;
-        struct {
-                uint64_t i_c:8;
-                uint64_t i_na:14;
-                uint64_t i_rsvd_2:2;
-                uint64_t i_nb:14;
-                uint64_t i_rsvd_1:2;
-                uint64_t i_m:2;
-                uint64_t i_f:1;
-                uint64_t i_of_cnt:5;
-                uint64_t i_error:1;
-                uint64_t i_rd_to:1;
-                uint64_t i_spur_wr:1;
-                uint64_t i_spur_rd:1;
-                uint64_t i_rsvd:11;
-                uint64_t i_mult_err:1;
+        u64 ii_iprba_regval;
+        struct {
+                u64 i_c:8;
+                u64 i_na:14;
+                u64 i_rsvd_2:2;
+                u64 i_nb:14;
+                u64 i_rsvd_1:2;
+                u64 i_m:2;
+                u64 i_f:1;
+                u64 i_of_cnt:5;
+                u64 i_error:1;
+                u64 i_rd_to:1;
+                u64 i_spur_wr:1;
+                u64 i_spur_rd:1;
+                u64 i_rsvd:11;
+                u64 i_mult_err:1;
         } ii_iprba_fld_s;
 } ii_iprba_u_t;
 
@@ -1019,22 +1019,22 @@ typedef union ii_iprba_u {
  ************************************************************************/
 
 typedef union ii_iprbb_u {
-        uint64_t ii_iprbb_regval;
-        struct {
-                uint64_t i_c:8;
-                uint64_t i_na:14;
-                uint64_t i_rsvd_2:2;
-                uint64_t i_nb:14;
-                uint64_t i_rsvd_1:2;
-                uint64_t i_m:2;
-                uint64_t i_f:1;
-                uint64_t i_of_cnt:5;
-                uint64_t i_error:1;
-                uint64_t i_rd_to:1;
-                uint64_t i_spur_wr:1;
-                uint64_t i_spur_rd:1;
-                uint64_t i_rsvd:11;
-                uint64_t i_mult_err:1;
+        u64 ii_iprbb_regval;
+        struct {
+                u64 i_c:8;
+                u64 i_na:14;
+                u64 i_rsvd_2:2;
+                u64 i_nb:14;
+                u64 i_rsvd_1:2;
+                u64 i_m:2;
+                u64 i_f:1;
+                u64 i_of_cnt:5;
+                u64 i_error:1;
+                u64 i_rd_to:1;
+                u64 i_spur_wr:1;
+                u64 i_spur_rd:1;
+                u64 i_rsvd:11;
+                u64 i_mult_err:1;
         } ii_iprbb_fld_s;
 } ii_iprbb_u_t;
 
@@ -1063,22 +1063,22 @@ typedef union ii_iprbb_u {
  ************************************************************************/
 
 typedef union ii_iprbc_u {
-        uint64_t ii_iprbc_regval;
-        struct {
-                uint64_t i_c:8;
-                uint64_t i_na:14;
-                uint64_t i_rsvd_2:2;
-                uint64_t i_nb:14;
-                uint64_t i_rsvd_1:2;
-                uint64_t i_m:2;
-                uint64_t i_f:1;
-                uint64_t i_of_cnt:5;
-                uint64_t i_error:1;
-                uint64_t i_rd_to:1;
-                uint64_t i_spur_wr:1;
-                uint64_t i_spur_rd:1;
-                uint64_t i_rsvd:11;
-                uint64_t i_mult_err:1;
+        u64 ii_iprbc_regval;
+        struct {
+                u64 i_c:8;
+                u64 i_na:14;
+                u64 i_rsvd_2:2;
+                u64 i_nb:14;
+                u64 i_rsvd_1:2;
+                u64 i_m:2;
+                u64 i_f:1;
+                u64 i_of_cnt:5;
+                u64 i_error:1;
+                u64 i_rd_to:1;
+                u64 i_spur_wr:1;
+                u64 i_spur_rd:1;
+                u64 i_rsvd:11;
+                u64 i_mult_err:1;
         } ii_iprbc_fld_s;
 } ii_iprbc_u_t;
 
@@ -1107,22 +1107,22 @@ typedef union ii_iprbc_u {
  ************************************************************************/
 
 typedef union ii_iprbd_u {
-        uint64_t ii_iprbd_regval;
-        struct {
-                uint64_t i_c:8;
-                uint64_t i_na:14;
-                uint64_t i_rsvd_2:2;
-                uint64_t i_nb:14;
-                uint64_t i_rsvd_1:2;
-                uint64_t i_m:2;
-                uint64_t i_f:1;
-                uint64_t i_of_cnt:5;
-                uint64_t i_error:1;
-                uint64_t i_rd_to:1;
-                uint64_t i_spur_wr:1;
-                uint64_t i_spur_rd:1;
-                uint64_t i_rsvd:11;
-                uint64_t i_mult_err:1;
+        u64 ii_iprbd_regval;
+        struct {
+                u64 i_c:8;
+                u64 i_na:14;
+                u64 i_rsvd_2:2;
+                u64 i_nb:14;
+                u64 i_rsvd_1:2;
+                u64 i_m:2;
+                u64 i_f:1;
+                u64 i_of_cnt:5;
+                u64 i_error:1;
+                u64 i_rd_to:1;
+                u64 i_spur_wr:1;
+                u64 i_spur_rd:1;
+                u64 i_rsvd:11;
+                u64 i_mult_err:1;
         } ii_iprbd_fld_s;
 } ii_iprbd_u_t;
 
@@ -1151,22 +1151,22 @@ typedef union ii_iprbd_u {
  ************************************************************************/
 
 typedef union ii_iprbe_u {
-        uint64_t ii_iprbe_regval;
-        struct {
-                uint64_t i_c:8;
-                uint64_t i_na:14;
-                uint64_t i_rsvd_2:2;
-                uint64_t i_nb:14;
-                uint64_t i_rsvd_1:2;
-                uint64_t i_m:2;
-                uint64_t i_f:1;
-                uint64_t i_of_cnt:5;
-                uint64_t i_error:1;
-                uint64_t i_rd_to:1;
-                uint64_t i_spur_wr:1;
-                uint64_t i_spur_rd:1;
-                uint64_t i_rsvd:11;
-                uint64_t i_mult_err:1;
+        u64 ii_iprbe_regval;
+        struct {
+                u64 i_c:8;
+                u64 i_na:14;
+                u64 i_rsvd_2:2;
+                u64 i_nb:14;
+                u64 i_rsvd_1:2;
+                u64 i_m:2;
+                u64 i_f:1;
+                u64 i_of_cnt:5;
+                u64 i_error:1;
+                u64 i_rd_to:1;
+                u64 i_spur_wr:1;
+                u64 i_spur_rd:1;
+                u64 i_rsvd:11;
+                u64 i_mult_err:1;
         } ii_iprbe_fld_s;
 } ii_iprbe_u_t;
 
@@ -1195,22 +1195,22 @@ typedef union ii_iprbe_u {
  ************************************************************************/
 
 typedef union ii_iprbf_u {
-        uint64_t ii_iprbf_regval;
-        struct {
-                uint64_t i_c:8;
-                uint64_t i_na:14;
-                uint64_t i_rsvd_2:2;
-                uint64_t i_nb:14;
-                uint64_t i_rsvd_1:2;
-                uint64_t i_m:2;
-                uint64_t i_f:1;
-                uint64_t i_of_cnt:5;
-                uint64_t i_error:1;
-                uint64_t i_rd_to:1;
-                uint64_t i_spur_wr:1;
-                uint64_t i_spur_rd:1;
-                uint64_t i_rsvd:11;
-                uint64_t i_mult_err:1;
+        u64 ii_iprbf_regval;
+        struct {
+                u64 i_c:8;
+                u64 i_na:14;
+                u64 i_rsvd_2:2;
+                u64 i_nb:14;
+                u64 i_rsvd_1:2;
+                u64 i_m:2;
+                u64 i_f:1;
+                u64 i_of_cnt:5;
+                u64 i_error:1;
+                u64 i_rd_to:1;
+                u64 i_spur_wr:1;
+                u64 i_spur_rd:1;
+                u64 i_rsvd:11;
+                u64 i_mult_err:1;
         } ii_iprbe_fld_s;
 } ii_iprbf_u_t;
 
@@ -1232,10 +1232,10 @@ typedef union ii_iprbf_u {
  ************************************************************************/
 
 typedef union ii_ixcc_u {
-        uint64_t ii_ixcc_regval;
+        u64 ii_ixcc_regval;
         struct {
-                uint64_t i_time_out:26;
-                uint64_t i_rsvd:38;
+                u64 i_time_out:26;
+                u64 i_rsvd:38;
         } ii_ixcc_fld_s;
 } ii_ixcc_u_t;
 
@@ -1256,16 +1256,16 @@ typedef union ii_ixcc_u {
  ************************************************************************/
 
 typedef union ii_imem_u {
-        uint64_t ii_imem_regval;
-        struct {
-                uint64_t i_w0_esd:1;
-                uint64_t i_rsvd_3:3;
-                uint64_t i_b0_esd:1;
-                uint64_t i_rsvd_2:3;
-                uint64_t i_b1_esd:1;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_clr_precise:1;
-                uint64_t i_rsvd:51;
+        u64 ii_imem_regval;
+        struct {
+                u64 i_w0_esd:1;
+                u64 i_rsvd_3:3;
+                u64 i_b0_esd:1;
+                u64 i_rsvd_2:3;
+                u64 i_b1_esd:1;
+                u64 i_rsvd_1:3;
+                u64 i_clr_precise:1;
+                u64 i_rsvd:51;
         } ii_imem_fld_s;
 } ii_imem_u_t;
 
@@ -1294,13 +1294,13 @@ typedef union ii_imem_u {
  ************************************************************************/
 
 typedef union ii_ixtt_u {
-        uint64_t ii_ixtt_regval;
+        u64 ii_ixtt_regval;
         struct {
-                uint64_t i_tail_to:26;
-                uint64_t i_rsvd_1:6;
-                uint64_t i_rrsp_ps:23;
-                uint64_t i_rrsp_to:5;
-                uint64_t i_rsvd:4;
+                u64 i_tail_to:26;
+                u64 i_rsvd_1:6;
+                u64 i_rrsp_ps:23;
+                u64 i_rrsp_to:5;
+                u64 i_rsvd:4;
         } ii_ixtt_fld_s;
 } ii_ixtt_u_t;
 
@@ -1316,37 +1316,37 @@ typedef union ii_ixtt_u {
  ************************************************************************/
 
 typedef union ii_ieclr_u {
-        uint64_t ii_ieclr_regval;
-        struct {
-                uint64_t i_e_prb_0:1;
-                uint64_t i_rsvd:7;
-                uint64_t i_e_prb_8:1;
-                uint64_t i_e_prb_9:1;
-                uint64_t i_e_prb_a:1;
-                uint64_t i_e_prb_b:1;
-                uint64_t i_e_prb_c:1;
-                uint64_t i_e_prb_d:1;
-                uint64_t i_e_prb_e:1;
-                uint64_t i_e_prb_f:1;
-                uint64_t i_e_crazy:1;
-                uint64_t i_e_bte_0:1;
-                uint64_t i_e_bte_1:1;
-                uint64_t i_reserved_1:10;
-                uint64_t i_spur_rd_hdr:1;
-                uint64_t i_cam_intr_to:1;
-                uint64_t i_cam_overflow:1;
-                uint64_t i_cam_read_miss:1;
-                uint64_t i_ioq_rep_underflow:1;
-                uint64_t i_ioq_req_underflow:1;
-                uint64_t i_ioq_rep_overflow:1;
-                uint64_t i_ioq_req_overflow:1;
-                uint64_t i_iiq_rep_overflow:1;
-                uint64_t i_iiq_req_overflow:1;
-                uint64_t i_ii_xn_rep_cred_overflow:1;
-                uint64_t i_ii_xn_req_cred_overflow:1;
-                uint64_t i_ii_xn_invalid_cmd:1;
-                uint64_t i_xn_ii_invalid_cmd:1;
-                uint64_t i_reserved_2:21;
+        u64 ii_ieclr_regval;
+        struct {
+                u64 i_e_prb_0:1;
+                u64 i_rsvd:7;
+                u64 i_e_prb_8:1;
+                u64 i_e_prb_9:1;
+                u64 i_e_prb_a:1;
+                u64 i_e_prb_b:1;
+                u64 i_e_prb_c:1;
+                u64 i_e_prb_d:1;
+                u64 i_e_prb_e:1;
+                u64 i_e_prb_f:1;
+                u64 i_e_crazy:1;
+                u64 i_e_bte_0:1;
+                u64 i_e_bte_1:1;
+                u64 i_reserved_1:10;
+                u64 i_spur_rd_hdr:1;
+                u64 i_cam_intr_to:1;
+                u64 i_cam_overflow:1;
+                u64 i_cam_read_miss:1;
+                u64 i_ioq_rep_underflow:1;
+                u64 i_ioq_req_underflow:1;
+                u64 i_ioq_rep_overflow:1;
+                u64 i_ioq_req_overflow:1;
+                u64 i_iiq_rep_overflow:1;
+                u64 i_iiq_req_overflow:1;
+                u64 i_ii_xn_rep_cred_overflow:1;
+                u64 i_ii_xn_req_cred_overflow:1;
+                u64 i_ii_xn_invalid_cmd:1;
+                u64 i_xn_ii_invalid_cmd:1;
+                u64 i_reserved_2:21;
         } ii_ieclr_fld_s;
 } ii_ieclr_u_t;
 
@@ -1360,12 +1360,12 @@ typedef union ii_ieclr_u {
  ************************************************************************/
 
 typedef union ii_ibcr_u {
-        uint64_t ii_ibcr_regval;
+        u64 ii_ibcr_regval;
         struct {
-                uint64_t i_count:4;
-                uint64_t i_rsvd_1:4;
-                uint64_t i_soft_reset:1;
-                uint64_t i_rsvd:55;
+                u64 i_count:4;
+                u64 i_rsvd_1:4;
+                u64 i_soft_reset:1;
+                u64 i_rsvd:55;
         } ii_ibcr_fld_s;
 } ii_ibcr_u_t;
 
@@ -1399,22 +1399,22 @@ typedef union ii_ibcr_u {
  ************************************************************************/
 
 typedef union ii_ixsm_u {
-        uint64_t ii_ixsm_regval;
-        struct {
-                uint64_t i_byte_en:32;
-                uint64_t i_reserved:1;
-                uint64_t i_tag:3;
-                uint64_t i_alt_pactyp:4;
-                uint64_t i_bo:1;
-                uint64_t i_error:1;
-                uint64_t i_vbpm:1;
-                uint64_t i_gbr:1;
-                uint64_t i_ds:2;
-                uint64_t i_ct:1;
-                uint64_t i_tnum:5;
-                uint64_t i_pactyp:4;
-                uint64_t i_sidn:4;
-                uint64_t i_didn:4;
+        u64 ii_ixsm_regval;
+        struct {
+                u64 i_byte_en:32;
+                u64 i_reserved:1;
+                u64 i_tag:3;
+                u64 i_alt_pactyp:4;
+                u64 i_bo:1;
+                u64 i_error:1;
+                u64 i_vbpm:1;
+                u64 i_gbr:1;
+                u64 i_ds:2;
+                u64 i_ct:1;
+                u64 i_tnum:5;
+                u64 i_pactyp:4;
+                u64 i_sidn:4;
+                u64 i_didn:4;
         } ii_ixsm_fld_s;
 } ii_ixsm_u_t;
 
@@ -1426,11 +1426,11 @@ typedef union ii_ixsm_u {
  ************************************************************************/
 
 typedef union ii_ixss_u {
-        uint64_t ii_ixss_regval;
+        u64 ii_ixss_regval;
         struct {
-                uint64_t i_sideband:8;
-                uint64_t i_rsvd:55;
-                uint64_t i_valid:1;
+                u64 i_sideband:8;
+                u64 i_rsvd:55;
+                u64 i_valid:1;
         } ii_ixss_fld_s;
 } ii_ixss_u_t;
 
@@ -1447,17 +1447,17 @@ typedef union ii_ixss_u {
  ************************************************************************/
 
 typedef union ii_ilct_u {
-        uint64_t ii_ilct_regval;
-        struct {
-                uint64_t i_test_seed:20;
-                uint64_t i_test_mask:8;
-                uint64_t i_test_data:20;
-                uint64_t i_test_valid:1;
-                uint64_t i_test_cberr:1;
-                uint64_t i_test_flit:3;
-                uint64_t i_test_clear:1;
-                uint64_t i_test_err_capture:1;
-                uint64_t i_rsvd:9;
+        u64 ii_ilct_regval;
+        struct {
+                u64 i_test_seed:20;
+                u64 i_test_mask:8;
+                u64 i_test_data:20;
+                u64 i_test_valid:1;
+                u64 i_test_cberr:1;
+                u64 i_test_flit:3;
+                u64 i_test_clear:1;
+                u64 i_test_err_capture:1;
+                u64 i_rsvd:9;
         } ii_ilct_fld_s;
 } ii_ilct_u_t;
 
@@ -1482,20 +1482,20 @@ typedef union ii_ilct_u {
  ************************************************************************/
 
 typedef union ii_iieph1_u {
-        uint64_t ii_iieph1_regval;
-        struct {
-                uint64_t i_command:7;
-                uint64_t i_rsvd_5:1;
-                uint64_t i_suppl:14;
-                uint64_t i_rsvd_4:1;
-                uint64_t i_source:14;
-                uint64_t i_rsvd_3:1;
-                uint64_t i_err_type:4;
-                uint64_t i_rsvd_2:4;
-                uint64_t i_overrun:1;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_valid:1;
-                uint64_t i_rsvd:13;
+        u64 ii_iieph1_regval;
+        struct {
+                u64 i_command:7;
+                u64 i_rsvd_5:1;
+                u64 i_suppl:14;
+                u64 i_rsvd_4:1;
+                u64 i_source:14;
+                u64 i_rsvd_3:1;
+                u64 i_err_type:4;
+                u64 i_rsvd_2:4;
+                u64 i_overrun:1;
+                u64 i_rsvd_1:3;
+                u64 i_valid:1;
+                u64 i_rsvd:13;
         } ii_iieph1_fld_s;
 } ii_iieph1_u_t;
 
@@ -1511,13 +1511,13 @@ typedef union ii_iieph1_u {
  ************************************************************************/
 
 typedef union ii_iieph2_u {
-        uint64_t ii_iieph2_regval;
+        u64 ii_iieph2_regval;
         struct {
-                uint64_t i_rsvd_0:3;
-                uint64_t i_address:47;
-                uint64_t i_rsvd_1:10;
-                uint64_t i_tail:1;
-                uint64_t i_rsvd:3;
+                u64 i_rsvd_0:3;
+                u64 i_address:47;
+                u64 i_rsvd_1:10;
+                u64 i_tail:1;
+                u64 i_rsvd:3;
         } ii_iieph2_fld_s;
 } ii_iieph2_u_t;
 
@@ -1532,9 +1532,9 @@ typedef union ii_iieph2_u {
  ************************************************************************/
 
 typedef union ii_islapr_u {
-        uint64_t ii_islapr_regval;
+        u64 ii_islapr_regval;
         struct {
-                uint64_t i_region:64;
+                u64 i_region:64;
         } ii_islapr_fld_s;
 } ii_islapr_u_t;
 
@@ -1547,10 +1547,10 @@ typedef union ii_islapr_u {
  ************************************************************************/
 
 typedef union ii_islapo_u {
-        uint64_t ii_islapo_regval;
+        u64 ii_islapo_regval;
         struct {
-                uint64_t i_io_sbx_ovrride:56;
-                uint64_t i_rsvd:8;
+                u64 i_io_sbx_ovrride:56;
+                u64 i_rsvd:8;
         } ii_islapo_fld_s;
 } ii_islapo_u_t;
 
@@ -1563,14 +1563,14 @@ typedef union ii_islapo_u {
  ************************************************************************/
 
 typedef union ii_iwi_u {
-        uint64_t ii_iwi_regval;
-        struct {
-                uint64_t i_prescale:24;
-                uint64_t i_rsvd:8;
-                uint64_t i_timeout:8;
-                uint64_t i_rsvd1:8;
-                uint64_t i_intrpt_retry_period:8;
-                uint64_t i_rsvd2:8;
+        u64 ii_iwi_regval;
+        struct {
+                u64 i_prescale:24;
+                u64 i_rsvd:8;
+                u64 i_timeout:8;
+                u64 i_rsvd1:8;
+                u64 i_intrpt_retry_period:8;
+                u64 i_rsvd2:8;
         } ii_iwi_fld_s;
 } ii_iwi_u_t;
 
@@ -1582,26 +1582,26 @@ typedef union ii_iwi_u {
  ************************************************************************/
 
 typedef union ii_iwel_u {
-        uint64_t ii_iwel_regval;
-        struct {
-                uint64_t i_intr_timed_out:1;
-                uint64_t i_rsvd:7;
-                uint64_t i_cam_overflow:1;
-                uint64_t i_cam_read_miss:1;
-                uint64_t i_rsvd1:2;
-                uint64_t i_ioq_rep_underflow:1;
-                uint64_t i_ioq_req_underflow:1;
-                uint64_t i_ioq_rep_overflow:1;
-                uint64_t i_ioq_req_overflow:1;
-                uint64_t i_iiq_rep_overflow:1;
-                uint64_t i_iiq_req_overflow:1;
-                uint64_t i_rsvd2:6;
-                uint64_t i_ii_xn_rep_cred_over_under:1;
-                uint64_t i_ii_xn_req_cred_over_under:1;
-                uint64_t i_rsvd3:6;
-                uint64_t i_ii_xn_invalid_cmd:1;
-                uint64_t i_xn_ii_invalid_cmd:1;
-                uint64_t i_rsvd4:30;
+        u64 ii_iwel_regval;
+        struct {
+                u64 i_intr_timed_out:1;
+                u64 i_rsvd:7;
+                u64 i_cam_overflow:1;
+                u64 i_cam_read_miss:1;
+                u64 i_rsvd1:2;
+                u64 i_ioq_rep_underflow:1;
+                u64 i_ioq_req_underflow:1;
+                u64 i_ioq_rep_overflow:1;
+                u64 i_ioq_req_overflow:1;
+                u64 i_iiq_rep_overflow:1;
+                u64 i_iiq_req_overflow:1;
+                u64 i_rsvd2:6;
+                u64 i_ii_xn_rep_cred_over_under:1;
+                u64 i_ii_xn_req_cred_over_under:1;
+                u64 i_rsvd3:6;
+                u64 i_ii_xn_invalid_cmd:1;
+                u64 i_xn_ii_invalid_cmd:1;
+                u64 i_rsvd4:30;
         } ii_iwel_fld_s;
 } ii_iwel_u_t;
 
@@ -1612,22 +1612,22 @@ typedef union ii_iwel_u {
  ************************************************************************/
 
 typedef union ii_iwc_u {
-        uint64_t ii_iwc_regval;
-        struct {
-                uint64_t i_dma_byte_swap:1;
-                uint64_t i_rsvd:3;
-                uint64_t i_cam_read_lines_reset:1;
-                uint64_t i_rsvd1:3;
-                uint64_t i_ii_xn_cred_over_under_log:1;
-                uint64_t i_rsvd2:19;
-                uint64_t i_xn_rep_iq_depth:5;
-                uint64_t i_rsvd3:3;
-                uint64_t i_xn_req_iq_depth:5;
-                uint64_t i_rsvd4:3;
-                uint64_t i_iiq_depth:6;
-                uint64_t i_rsvd5:12;
-                uint64_t i_force_rep_cred:1;
-                uint64_t i_force_req_cred:1;
+        u64 ii_iwc_regval;
+        struct {
+                u64 i_dma_byte_swap:1;
+                u64 i_rsvd:3;
+                u64 i_cam_read_lines_reset:1;
+                u64 i_rsvd1:3;
+                u64 i_ii_xn_cred_over_under_log:1;
+                u64 i_rsvd2:19;
+                u64 i_xn_rep_iq_depth:5;
+                u64 i_rsvd3:3;
+                u64 i_xn_req_iq_depth:5;
+                u64 i_rsvd4:3;
+                u64 i_iiq_depth:6;
+                u64 i_rsvd5:12;
+                u64 i_force_rep_cred:1;
+                u64 i_force_req_cred:1;
         } ii_iwc_fld_s;
 } ii_iwc_u_t;
 
@@ -1638,12 +1638,12 @@ typedef union ii_iwc_u {
  ************************************************************************/
 
 typedef union ii_iws_u {
-        uint64_t ii_iws_regval;
+        u64 ii_iws_regval;
         struct {
-                uint64_t i_xn_rep_iq_credits:5;
-                uint64_t i_rsvd:3;
-                uint64_t i_xn_req_iq_credits:5;
-                uint64_t i_rsvd1:51;
+                u64 i_xn_rep_iq_credits:5;
+                u64 i_rsvd:3;
+                u64 i_xn_req_iq_credits:5;
+                u64 i_rsvd1:51;
         } ii_iws_fld_s;
 } ii_iws_u_t;
 
@@ -1654,26 +1654,26 @@ typedef union ii_iws_u {
  ************************************************************************/
 
 typedef union ii_iweim_u {
-        uint64_t ii_iweim_regval;
-        struct {
-                uint64_t i_intr_timed_out:1;
-                uint64_t i_rsvd:7;
-                uint64_t i_cam_overflow:1;
-                uint64_t i_cam_read_miss:1;
-                uint64_t i_rsvd1:2;
-                uint64_t i_ioq_rep_underflow:1;
-                uint64_t i_ioq_req_underflow:1;
-                uint64_t i_ioq_rep_overflow:1;
-                uint64_t i_ioq_req_overflow:1;
-                uint64_t i_iiq_rep_overflow:1;
-                uint64_t i_iiq_req_overflow:1;
-                uint64_t i_rsvd2:6;
-                uint64_t i_ii_xn_rep_cred_overflow:1;
-                uint64_t i_ii_xn_req_cred_overflow:1;
-                uint64_t i_rsvd3:6;
-                uint64_t i_ii_xn_invalid_cmd:1;
-                uint64_t i_xn_ii_invalid_cmd:1;
-                uint64_t i_rsvd4:30;
+        u64 ii_iweim_regval;
+        struct {
+                u64 i_intr_timed_out:1;
+                u64 i_rsvd:7;
+                u64 i_cam_overflow:1;
+                u64 i_cam_read_miss:1;
+                u64 i_rsvd1:2;
+                u64 i_ioq_rep_underflow:1;
+                u64 i_ioq_req_underflow:1;
+                u64 i_ioq_rep_overflow:1;
+                u64 i_ioq_req_overflow:1;
+                u64 i_iiq_rep_overflow:1;
+                u64 i_iiq_req_overflow:1;
+                u64 i_rsvd2:6;
+                u64 i_ii_xn_rep_cred_overflow:1;
+                u64 i_ii_xn_req_cred_overflow:1;
+                u64 i_rsvd3:6;
+                u64 i_ii_xn_invalid_cmd:1;
+                u64 i_xn_ii_invalid_cmd:1;
+                u64 i_rsvd4:30;
         } ii_iweim_fld_s;
 } ii_iweim_u_t;
 
@@ -1688,13 +1688,13 @@ typedef union ii_iweim_u {
  ************************************************************************/
 
 typedef union ii_ipca_u {
-        uint64_t ii_ipca_regval;
+        u64 ii_ipca_regval;
         struct {
-                uint64_t i_wid:4;
-                uint64_t i_adjust:1;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_field:2;
-                uint64_t i_rsvd:54;
+                u64 i_wid:4;
+                u64 i_adjust:1;
+                u64 i_rsvd_1:3;
+                u64 i_field:2;
+                u64 i_rsvd:54;
         } ii_ipca_fld_s;
 } ii_ipca_u_t;
 
@@ -1709,12 +1709,12 @@ typedef union ii_ipca_u {
  ************************************************************************/
 
 typedef union ii_iprte0a_u {
-        uint64_t ii_iprte0a_regval;
+        u64 ii_iprte0a_regval;
         struct {
-                uint64_t i_rsvd_1:54;
-                uint64_t i_widget:4;
-                uint64_t i_to_cnt:5;
-                uint64_t i_vld:1;
+                u64 i_rsvd_1:54;
+                u64 i_widget:4;
+                u64 i_to_cnt:5;
+                u64 i_vld:1;
         } ii_iprte0a_fld_s;
 } ii_iprte0a_u_t;
 
@@ -1729,12 +1729,12 @@ typedef union ii_iprte0a_u {
  ************************************************************************/
 
 typedef union ii_iprte1a_u {
-        uint64_t ii_iprte1a_regval;
+        u64 ii_iprte1a_regval;
         struct {
-                uint64_t i_rsvd_1:54;
-                uint64_t i_widget:4;
-                uint64_t i_to_cnt:5;
-                uint64_t i_vld:1;
+                u64 i_rsvd_1:54;
+                u64 i_widget:4;
+                u64 i_to_cnt:5;
+                u64 i_vld:1;
         } ii_iprte1a_fld_s;
 } ii_iprte1a_u_t;
 
@@ -1749,12 +1749,12 @@ typedef union ii_iprte1a_u {
  ************************************************************************/
 
 typedef union ii_iprte2a_u {
-        uint64_t ii_iprte2a_regval;
+        u64 ii_iprte2a_regval;
         struct {
-                uint64_t i_rsvd_1:54;
-                uint64_t i_widget:4;
-                uint64_t i_to_cnt:5;
-                uint64_t i_vld:1;
+                u64 i_rsvd_1:54;
+                u64 i_widget:4;
+                u64 i_to_cnt:5;
+                u64 i_vld:1;
         } ii_iprte2a_fld_s;
 } ii_iprte2a_u_t;
 
@@ -1769,12 +1769,12 @@ typedef union ii_iprte2a_u {
  ************************************************************************/
 
 typedef union ii_iprte3a_u {
-        uint64_t ii_iprte3a_regval;
+        u64 ii_iprte3a_regval;
         struct {
-                uint64_t i_rsvd_1:54;
-                uint64_t i_widget:4;
-                uint64_t i_to_cnt:5;
-                uint64_t i_vld:1;
+                u64 i_rsvd_1:54;
+                u64 i_widget:4;
+                u64 i_to_cnt:5;
+                u64 i_vld:1;
         } ii_iprte3a_fld_s;
 } ii_iprte3a_u_t;
 
@@ -1789,12 +1789,12 @@ typedef union ii_iprte3a_u {
  ************************************************************************/
 
 typedef union ii_iprte4a_u {
-        uint64_t ii_iprte4a_regval;
+        u64 ii_iprte4a_regval;
         struct {
-                uint64_t i_rsvd_1:54;
-                uint64_t i_widget:4;
-                uint64_t i_to_cnt:5;
-                uint64_t i_vld:1;
+                u64 i_rsvd_1:54;
+                u64 i_widget:4;
+                u64 i_to_cnt:5;
+                u64 i_vld:1;
         } ii_iprte4a_fld_s;
 } ii_iprte4a_u_t;
 
@@ -1809,12 +1809,12 @@ typedef union ii_iprte4a_u {
  ************************************************************************/
 
 typedef union ii_iprte5a_u {
-        uint64_t ii_iprte5a_regval;
+        u64 ii_iprte5a_regval;
         struct {
-                uint64_t i_rsvd_1:54;
-                uint64_t i_widget:4;
-                uint64_t i_to_cnt:5;
-                uint64_t i_vld:1;
+                u64 i_rsvd_1:54;
+                u64 i_widget:4;
+                u64 i_to_cnt:5;
+                u64 i_vld:1;
         } ii_iprte5a_fld_s;
 } ii_iprte5a_u_t;
 
@@ -1829,12 +1829,12 @@ typedef union ii_iprte5a_u {
  ************************************************************************/
 
 typedef union ii_iprte6a_u {
-        uint64_t ii_iprte6a_regval;
+        u64 ii_iprte6a_regval;
         struct {
-                uint64_t i_rsvd_1:54;
-                uint64_t i_widget:4;
-                uint64_t i_to_cnt:5;
-                uint64_t i_vld:1;
+                u64 i_rsvd_1:54;
+                u64 i_widget:4;
+                u64 i_to_cnt:5;
+                u64 i_vld:1;
         } ii_iprte6a_fld_s;
 } ii_iprte6a_u_t;
 
@@ -1849,12 +1849,12 @@ typedef union ii_iprte6a_u {
  ************************************************************************/
 
 typedef union ii_iprte7a_u {
-        uint64_t ii_iprte7a_regval;
+        u64 ii_iprte7a_regval;
         struct {
-                uint64_t i_rsvd_1:54;
-                uint64_t i_widget:4;
-                uint64_t i_to_cnt:5;
-                uint64_t i_vld:1;
+                u64 i_rsvd_1:54;
+                u64 i_widget:4;
+                u64 i_to_cnt:5;
+                u64 i_vld:1;
         } ii_iprtea7_fld_s;
 } ii_iprte7a_u_t;
 
@@ -1869,12 +1869,12 @@ typedef union ii_iprte7a_u {
  ************************************************************************/
 
 typedef union ii_iprte0b_u {
-        uint64_t ii_iprte0b_regval;
+        u64 ii_iprte0b_regval;
         struct {
-                uint64_t i_rsvd_1:3;
-                uint64_t i_address:47;
-                uint64_t i_init:3;
-                uint64_t i_source:11;
+                u64 i_rsvd_1:3;
+                u64 i_address:47;
+                u64 i_init:3;
+                u64 i_source:11;
         } ii_iprte0b_fld_s;
 } ii_iprte0b_u_t;
 
@@ -1889,12 +1889,12 @@ typedef union ii_iprte0b_u {
  ************************************************************************/
 
 typedef union ii_iprte1b_u {
-        uint64_t ii_iprte1b_regval;
+        u64 ii_iprte1b_regval;
         struct {
-                uint64_t i_rsvd_1:3;
-                uint64_t i_address:47;
-                uint64_t i_init:3;
-                uint64_t i_source:11;
+                u64 i_rsvd_1:3;
+                u64 i_address:47;
+                u64 i_init:3;
+                u64 i_source:11;
         } ii_iprte1b_fld_s;
 } ii_iprte1b_u_t;
 
@@ -1909,12 +1909,12 @@ typedef union ii_iprte1b_u {
  ************************************************************************/
 
 typedef union ii_iprte2b_u {
-        uint64_t ii_iprte2b_regval;
+        u64 ii_iprte2b_regval;
         struct {
-                uint64_t i_rsvd_1:3;
-                uint64_t i_address:47;
-                uint64_t i_init:3;
-                uint64_t i_source:11;
+                u64 i_rsvd_1:3;
+                u64 i_address:47;
+                u64 i_init:3;
+                u64 i_source:11;
         } ii_iprte2b_fld_s;
 } ii_iprte2b_u_t;
 
@@ -1929,12 +1929,12 @@ typedef union ii_iprte2b_u {
  ************************************************************************/
 
 typedef union ii_iprte3b_u {
-        uint64_t ii_iprte3b_regval;
+        u64 ii_iprte3b_regval;
         struct {
-                uint64_t i_rsvd_1:3;
-                uint64_t i_address:47;
-                uint64_t i_init:3;
-                uint64_t i_source:11;
+                u64 i_rsvd_1:3;
+                u64 i_address:47;
+                u64 i_init:3;
+                u64 i_source:11;
         } ii_iprte3b_fld_s;
 } ii_iprte3b_u_t;
 
@@ -1949,12 +1949,12 @@ typedef union ii_iprte3b_u {
  ************************************************************************/
 
 typedef union ii_iprte4b_u {
-        uint64_t ii_iprte4b_regval;
+        u64 ii_iprte4b_regval;
         struct {
-                uint64_t i_rsvd_1:3;
-                uint64_t i_address:47;
-                uint64_t i_init:3;
-                uint64_t i_source:11;
+                u64 i_rsvd_1:3;
+                u64 i_address:47;
+                u64 i_init:3;
+                u64 i_source:11;
         } ii_iprte4b_fld_s;
 } ii_iprte4b_u_t;
 
@@ -1969,12 +1969,12 @@ typedef union ii_iprte4b_u {
  ************************************************************************/
 
 typedef union ii_iprte5b_u {
-        uint64_t ii_iprte5b_regval;
+        u64 ii_iprte5b_regval;
         struct {
-                uint64_t i_rsvd_1:3;
-                uint64_t i_address:47;
-                uint64_t i_init:3;
-                uint64_t i_source:11;
+                u64 i_rsvd_1:3;
+                u64 i_address:47;
+                u64 i_init:3;
+                u64 i_source:11;
         } ii_iprte5b_fld_s;
 } ii_iprte5b_u_t;
 
@@ -1989,12 +1989,12 @@ typedef union ii_iprte5b_u {
  ************************************************************************/
 
 typedef union ii_iprte6b_u {
-        uint64_t ii_iprte6b_regval;
+        u64 ii_iprte6b_regval;
         struct {
-                uint64_t i_rsvd_1:3;
-                uint64_t i_address:47;
-                uint64_t i_init:3;
-                uint64_t i_source:11;
+                u64 i_rsvd_1:3;
+                u64 i_address:47;
+                u64 i_init:3;
+                u64 i_source:11;
 
         } ii_iprte6b_fld_s;
 } ii_iprte6b_u_t;
@@ -2010,12 +2010,12 @@ typedef union ii_iprte6b_u {
  ************************************************************************/
 
 typedef union ii_iprte7b_u {
-        uint64_t ii_iprte7b_regval;
+        u64 ii_iprte7b_regval;
         struct {
-                uint64_t i_rsvd_1:3;
-                uint64_t i_address:47;
-                uint64_t i_init:3;
-                uint64_t i_source:11;
+                u64 i_rsvd_1:3;
+                u64 i_address:47;
+                u64 i_init:3;
+                u64 i_source:11;
         } ii_iprte7b_fld_s;
 } ii_iprte7b_u_t;
 
@@ -2038,13 +2038,13 @@ typedef union ii_iprte7b_u {
  ************************************************************************/
 
 typedef union ii_ipdr_u {
-        uint64_t ii_ipdr_regval;
+        u64 ii_ipdr_regval;
         struct {
-                uint64_t i_te:3;
-                uint64_t i_rsvd_1:1;
-                uint64_t i_pnd:1;
-                uint64_t i_init_rpcnt:1;
-                uint64_t i_rsvd:58;
+                u64 i_te:3;
+                u64 i_rsvd_1:1;
+                u64 i_pnd:1;
+                u64 i_init_rpcnt:1;
+                u64 i_rsvd:58;
         } ii_ipdr_fld_s;
 } ii_ipdr_u_t;
 
@@ -2066,11 +2066,11 @@ typedef union ii_ipdr_u {
  ************************************************************************/
 
 typedef union ii_icdr_u {
-        uint64_t ii_icdr_regval;
+        u64 ii_icdr_regval;
         struct {
-                uint64_t i_crb_num:4;
-                uint64_t i_pnd:1;
-                uint64_t i_rsvd:59;
+                u64 i_crb_num:4;
+                u64 i_pnd:1;
+                u64 i_rsvd:59;
         } ii_icdr_fld_s;
 } ii_icdr_u_t;
 
@@ -2092,13 +2092,13 @@ typedef union ii_icdr_u {
  ************************************************************************/
 
 typedef union ii_ifdr_u {
-        uint64_t ii_ifdr_regval;
+        u64 ii_ifdr_regval;
         struct {
-                uint64_t i_ioq_max_rq:7;
-                uint64_t i_set_ioq_rq:1;
-                uint64_t i_ioq_max_rp:7;
-                uint64_t i_set_ioq_rp:1;
-                uint64_t i_rsvd:48;
+                u64 i_ioq_max_rq:7;
+                u64 i_set_ioq_rq:1;
+                u64 i_ioq_max_rp:7;
+                u64 i_set_ioq_rp:1;
+                u64 i_rsvd:48;
         } ii_ifdr_fld_s;
 } ii_ifdr_u_t;
 
@@ -2114,12 +2114,12 @@ typedef union ii_ifdr_u {
  ************************************************************************/
 
 typedef union ii_iiap_u {
-        uint64_t ii_iiap_regval;
+        u64 ii_iiap_regval;
         struct {
-                uint64_t i_rq_mls:6;
-                uint64_t i_rsvd_1:2;
-                uint64_t i_rp_mls:6;
-                uint64_t i_rsvd:50;
+                u64 i_rq_mls:6;
+                u64 i_rsvd_1:2;
+                u64 i_rp_mls:6;
+                u64 i_rsvd:50;
         } ii_iiap_fld_s;
 } ii_iiap_u_t;
 
@@ -2133,22 +2133,22 @@ typedef union ii_iiap_u {
  ************************************************************************/
 
 typedef union ii_icmr_u {
-        uint64_t ii_icmr_regval;
-        struct {
-                uint64_t i_sp_msg:1;
-                uint64_t i_rd_hdr:1;
-                uint64_t i_rsvd_4:2;
-                uint64_t i_c_cnt:4;
-                uint64_t i_rsvd_3:4;
-                uint64_t i_clr_rqpd:1;
-                uint64_t i_clr_rppd:1;
-                uint64_t i_rsvd_2:2;
-                uint64_t i_fc_cnt:4;
-                uint64_t i_crb_vld:15;
-                uint64_t i_crb_mark:15;
-                uint64_t i_rsvd_1:2;
-                uint64_t i_precise:1;
-                uint64_t i_rsvd:11;
+        u64 ii_icmr_regval;
+        struct {
+                u64 i_sp_msg:1;
+                u64 i_rd_hdr:1;
+                u64 i_rsvd_4:2;
+                u64 i_c_cnt:4;
+                u64 i_rsvd_3:4;
+                u64 i_clr_rqpd:1;
+                u64 i_clr_rppd:1;
+                u64 i_rsvd_2:2;
+                u64 i_fc_cnt:4;
+                u64 i_crb_vld:15;
+                u64 i_crb_mark:15;
+                u64 i_rsvd_1:2;
+                u64 i_precise:1;
+                u64 i_rsvd:11;
         } ii_icmr_fld_s;
 } ii_icmr_u_t;
 
@@ -2161,13 +2161,13 @@ typedef union ii_icmr_u {
  ************************************************************************/
 
 typedef union ii_iccr_u {
-        uint64_t ii_iccr_regval;
+        u64 ii_iccr_regval;
         struct {
-                uint64_t i_crb_num:4;
-                uint64_t i_rsvd_1:4;
-                uint64_t i_cmd:8;
-                uint64_t i_pending:1;
-                uint64_t i_rsvd:47;
+                u64 i_crb_num:4;
+                u64 i_rsvd_1:4;
+                u64 i_cmd:8;
+                u64 i_pending:1;
+                u64 i_rsvd:47;
         } ii_iccr_fld_s;
 } ii_iccr_u_t;
 
@@ -2178,10 +2178,10 @@ typedef union ii_iccr_u {
  ************************************************************************/
 
 typedef union ii_icto_u {
-        uint64_t ii_icto_regval;
+        u64 ii_icto_regval;
         struct {
-                uint64_t i_timeout:8;
-                uint64_t i_rsvd:56;
+                u64 i_timeout:8;
+                u64 i_rsvd:56;
         } ii_icto_fld_s;
 } ii_icto_u_t;
 
@@ -2197,10 +2197,10 @@ typedef union ii_icto_u {
  ************************************************************************/
 
 typedef union ii_ictp_u {
-        uint64_t ii_ictp_regval;
+        u64 ii_ictp_regval;
         struct {
-                uint64_t i_prescale:24;
-                uint64_t i_rsvd:40;
+                u64 i_prescale:24;
+                u64 i_rsvd:40;
         } ii_ictp_fld_s;
 } ii_ictp_u_t;
 
@@ -2228,14 +2228,14 @@ typedef union ii_ictp_u {
  ************************************************************************/
 
 typedef union ii_icrb0_a_u {
-        uint64_t ii_icrb0_a_regval;
-        struct {
-                uint64_t ia_iow:1;
-                uint64_t ia_vld:1;
-                uint64_t ia_addr:47;
-                uint64_t ia_tnum:5;
-                uint64_t ia_sidn:4;
-                uint64_t ia_rsvd:6;
+        u64 ii_icrb0_a_regval;
+        struct {
+                u64 ia_iow:1;
+                u64 ia_vld:1;
+                u64 ia_addr:47;
+                u64 ia_tnum:5;
+                u64 ia_sidn:4;
+                u64 ia_rsvd:6;
         } ii_icrb0_a_fld_s;
 } ii_icrb0_a_u_t;
 
@@ -2249,30 +2249,30 @@ typedef union ii_icrb0_a_u {
  ************************************************************************/
 
 typedef union ii_icrb0_b_u {
-        uint64_t ii_icrb0_b_regval;
-        struct {
-                uint64_t ib_xt_err:1;
-                uint64_t ib_mark:1;
-                uint64_t ib_ln_uce:1;
-                uint64_t ib_errcode:3;
-                uint64_t ib_error:1;
-                uint64_t ib_stall__bte_1:1;
-                uint64_t ib_stall__bte_0:1;
-                uint64_t ib_stall__intr:1;
-                uint64_t ib_stall_ib:1;
-                uint64_t ib_intvn:1;
-                uint64_t ib_wb:1;
-                uint64_t ib_hold:1;
-                uint64_t ib_ack:1;
-                uint64_t ib_resp:1;
-                uint64_t ib_ack_cnt:11;
-                uint64_t ib_rsvd:7;
-                uint64_t ib_exc:5;
-                uint64_t ib_init:3;
-                uint64_t ib_imsg:8;
-                uint64_t ib_imsgtype:2;
-                uint64_t ib_use_old:1;
-                uint64_t ib_rsvd_1:11;
+        u64 ii_icrb0_b_regval;
+        struct {
+                u64 ib_xt_err:1;
+                u64 ib_mark:1;
+                u64 ib_ln_uce:1;
+                u64 ib_errcode:3;
+                u64 ib_error:1;
+                u64 ib_stall__bte_1:1;
+                u64 ib_stall__bte_0:1;
+                u64 ib_stall__intr:1;
+                u64 ib_stall_ib:1;
+                u64 ib_intvn:1;
+                u64 ib_wb:1;
+                u64 ib_hold:1;
+                u64 ib_ack:1;
+                u64 ib_resp:1;
+                u64 ib_ack_cnt:11;
+                u64 ib_rsvd:7;
+                u64 ib_exc:5;
+                u64 ib_init:3;
+                u64 ib_imsg:8;
+                u64 ib_imsgtype:2;
+                u64 ib_use_old:1;
+                u64 ib_rsvd_1:11;
         } ii_icrb0_b_fld_s;
 } ii_icrb0_b_u_t;
 
@@ -2286,17 +2286,17 @@ typedef union ii_icrb0_b_u {
  ************************************************************************/
 
 typedef union ii_icrb0_c_u {
-        uint64_t ii_icrb0_c_regval;
-        struct {
-                uint64_t ic_source:15;
-                uint64_t ic_size:2;
-                uint64_t ic_ct:1;
-                uint64_t ic_bte_num:1;
-                uint64_t ic_gbr:1;
-                uint64_t ic_resprqd:1;
-                uint64_t ic_bo:1;
-                uint64_t ic_suppl:15;
-                uint64_t ic_rsvd:27;
+        u64 ii_icrb0_c_regval;
+        struct {
+                u64 ic_source:15;
+                u64 ic_size:2;
+                u64 ic_ct:1;
+                u64 ic_bte_num:1;
+                u64 ic_gbr:1;
+                u64 ic_resprqd:1;
+                u64 ic_bo:1;
+                u64 ic_suppl:15;
+                u64 ic_rsvd:27;
         } ii_icrb0_c_fld_s;
 } ii_icrb0_c_u_t;
 
@@ -2310,14 +2310,14 @@ typedef union ii_icrb0_c_u {
  ************************************************************************/
 
 typedef union ii_icrb0_d_u {
-        uint64_t ii_icrb0_d_regval;
-        struct {
-                uint64_t id_pa_be:43;
-                uint64_t id_bte_op:1;
-                uint64_t id_pr_psc:4;
-                uint64_t id_pr_cnt:4;
-                uint64_t id_sleep:1;
-                uint64_t id_rsvd:11;
+        u64 ii_icrb0_d_regval;
+        struct {
+                u64 id_pa_be:43;
+                u64 id_bte_op:1;
+                u64 id_pr_psc:4;
+                u64 id_pr_cnt:4;
+                u64 id_sleep:1;
+                u64 id_rsvd:11;
         } ii_icrb0_d_fld_s;
 } ii_icrb0_d_u_t;
 
@@ -2331,14 +2331,14 @@ typedef union ii_icrb0_d_u {
  ************************************************************************/
 
 typedef union ii_icrb0_e_u {
-        uint64_t ii_icrb0_e_regval;
-        struct {
-                uint64_t ie_timeout:8;
-                uint64_t ie_context:15;
-                uint64_t ie_rsvd:1;
-                uint64_t ie_tvld:1;
-                uint64_t ie_cvld:1;
-                uint64_t ie_rsvd_0:38;
+        u64 ii_icrb0_e_regval;
+        struct {
+                u64 ie_timeout:8;
+                u64 ie_context:15;
+                u64 ie_rsvd:1;
+                u64 ie_tvld:1;
+                u64 ie_cvld:1;
+                u64 ie_rsvd_0:38;
         } ii_icrb0_e_fld_s;
 } ii_icrb0_e_u_t;
 
@@ -2351,12 +2351,12 @@ typedef union ii_icrb0_e_u {
  ************************************************************************/
 
 typedef union ii_icsml_u {
-        uint64_t ii_icsml_regval;
+        u64 ii_icsml_regval;
         struct {
-                uint64_t i_tt_addr:47;
-                uint64_t i_newsuppl_ex:14;
-                uint64_t i_reserved:2;
-                uint64_t i_overflow:1;
+                u64 i_tt_addr:47;
+                u64 i_newsuppl_ex:14;
+                u64 i_reserved:2;
+                u64 i_overflow:1;
         } ii_icsml_fld_s;
 } ii_icsml_u_t;
 
@@ -2369,10 +2369,10 @@ typedef union ii_icsml_u {
  ************************************************************************/
 
 typedef union ii_icsmm_u {
-        uint64_t ii_icsmm_regval;
+        u64 ii_icsmm_regval;
         struct {
-                uint64_t i_tt_ack_cnt:11;
-                uint64_t i_reserved:53;
+                u64 i_tt_ack_cnt:11;
+                u64 i_reserved:53;
         } ii_icsmm_fld_s;
 } ii_icsmm_u_t;
 
@@ -2385,48 +2385,48 @@ typedef union ii_icsmm_u {
  ************************************************************************/
 
 typedef union ii_icsmh_u {
-        uint64_t ii_icsmh_regval;
-        struct {
-                uint64_t i_tt_vld:1;
-                uint64_t i_xerr:1;
-                uint64_t i_ft_cwact_o:1;
-                uint64_t i_ft_wact_o:1;
-                uint64_t i_ft_active_o:1;
-                uint64_t i_sync:1;
-                uint64_t i_mnusg:1;
-                uint64_t i_mnusz:1;
-                uint64_t i_plusz:1;
-                uint64_t i_plusg:1;
-                uint64_t i_tt_exc:5;
-                uint64_t i_tt_wb:1;
-                uint64_t i_tt_hold:1;
-                uint64_t i_tt_ack:1;
-                uint64_t i_tt_resp:1;
-                uint64_t i_tt_intvn:1;
-                uint64_t i_g_stall_bte1:1;
-                uint64_t i_g_stall_bte0:1;
-                uint64_t i_g_stall_il:1;
-                uint64_t i_g_stall_ib:1;
-                uint64_t i_tt_imsg:8;
-                uint64_t i_tt_imsgtype:2;
-                uint64_t i_tt_use_old:1;
-                uint64_t i_tt_respreqd:1;
-                uint64_t i_tt_bte_num:1;
-                uint64_t i_cbn:1;
-                uint64_t i_match:1;
-                uint64_t i_rpcnt_lt_34:1;
-                uint64_t i_rpcnt_ge_34:1;
-                uint64_t i_rpcnt_lt_18:1;
-                uint64_t i_rpcnt_ge_18:1;
-                uint64_t i_rpcnt_lt_2:1;
-                uint64_t i_rpcnt_ge_2:1;
-                uint64_t i_rqcnt_lt_18:1;
-                uint64_t i_rqcnt_ge_18:1;
-                uint64_t i_rqcnt_lt_2:1;
-                uint64_t i_rqcnt_ge_2:1;
-                uint64_t i_tt_device:7;
-                uint64_t i_tt_init:3;
-                uint64_t i_reserved:5;
+        u64 ii_icsmh_regval;
+        struct {
+                u64 i_tt_vld:1;
+                u64 i_xerr:1;
+                u64 i_ft_cwact_o:1;
+                u64 i_ft_wact_o:1;
+                u64 i_ft_active_o:1;
+                u64 i_sync:1;
+                u64 i_mnusg:1;
+                u64 i_mnusz:1;
+                u64 i_plusz:1;
+                u64 i_plusg:1;
+                u64 i_tt_exc:5;
+                u64 i_tt_wb:1;
+                u64 i_tt_hold:1;
+                u64 i_tt_ack:1;
+                u64 i_tt_resp:1;
+                u64 i_tt_intvn:1;
+                u64 i_g_stall_bte1:1;
+                u64 i_g_stall_bte0:1;
+                u64 i_g_stall_il:1;
+                u64 i_g_stall_ib:1;
+                u64 i_tt_imsg:8;
+                u64 i_tt_imsgtype:2;
+                u64 i_tt_use_old:1;
+                u64 i_tt_respreqd:1;
+                u64 i_tt_bte_num:1;
+                u64 i_cbn:1;
+                u64 i_match:1;
+                u64 i_rpcnt_lt_34:1;
+                u64 i_rpcnt_ge_34:1;
+                u64 i_rpcnt_lt_18:1;
+                u64 i_rpcnt_ge_18:1;
+                u64 i_rpcnt_lt_2:1;
+                u64 i_rpcnt_ge_2:1;
+                u64 i_rqcnt_lt_18:1;
+                u64 i_rqcnt_ge_18:1;
+                u64 i_rqcnt_lt_2:1;
+                u64 i_rqcnt_ge_2:1;
+                u64 i_tt_device:7;
+                u64 i_tt_init:3;
+                u64 i_reserved:5;
         } ii_icsmh_fld_s;
 } ii_icsmh_u_t;
 
@@ -2439,14 +2439,14 @@ typedef union ii_icsmh_u {
  ************************************************************************/
 
 typedef union ii_idbss_u {
-        uint64_t ii_idbss_regval;
-        struct {
-                uint64_t i_iioclk_core_submenu:3;
-                uint64_t i_rsvd:5;
-                uint64_t i_fsbclk_wrapper_submenu:3;
-                uint64_t i_rsvd_1:5;
-                uint64_t i_iioclk_menu:5;
-                uint64_t i_rsvd_2:43;
+        u64 ii_idbss_regval;
+        struct {
+                u64 i_iioclk_core_submenu:3;
+                u64 i_rsvd:5;
+                u64 i_fsbclk_wrapper_submenu:3;
+                u64 i_rsvd_1:5;
+                u64 i_iioclk_menu:5;
+                u64 i_rsvd_2:43;
         } ii_idbss_fld_s;
 } ii_idbss_u_t;
 
@@ -2466,13 +2466,13 @@ typedef union ii_idbss_u {
  ************************************************************************/
 
 typedef union ii_ibls0_u {
-        uint64_t ii_ibls0_regval;
+        u64 ii_ibls0_regval;
         struct {
-                uint64_t i_length:16;
-                uint64_t i_error:1;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_busy:1;
-                uint64_t i_rsvd:43;
+                u64 i_length:16;
+                u64 i_error:1;
+                u64 i_rsvd_1:3;
+                u64 i_busy:1;
+                u64 i_rsvd:43;
         } ii_ibls0_fld_s;
 } ii_ibls0_u_t;
 
@@ -2487,11 +2487,11 @@ typedef union ii_ibls0_u {
  ************************************************************************/
 
 typedef union ii_ibsa0_u {
-        uint64_t ii_ibsa0_regval;
+        u64 ii_ibsa0_regval;
         struct {
-                uint64_t i_rsvd_1:7;
-                uint64_t i_addr:42;
-                uint64_t i_rsvd:15;
+                u64 i_rsvd_1:7;
+                u64 i_addr:42;
+                u64 i_rsvd:15;
         } ii_ibsa0_fld_s;
 } ii_ibsa0_u_t;
 
@@ -2506,11 +2506,11 @@ typedef union ii_ibsa0_u {
  ************************************************************************/
 
 typedef union ii_ibda0_u {
-        uint64_t ii_ibda0_regval;
+        u64 ii_ibda0_regval;
         struct {
-                uint64_t i_rsvd_1:7;
-                uint64_t i_addr:42;
-                uint64_t i_rsvd:15;
+                u64 i_rsvd_1:7;
+                u64 i_addr:42;
+                u64 i_rsvd:15;
         } ii_ibda0_fld_s;
 } ii_ibda0_u_t;
 
@@ -2527,14 +2527,14 @@ typedef union ii_ibda0_u {
  ************************************************************************/
 
 typedef union ii_ibct0_u {
-        uint64_t ii_ibct0_regval;
-        struct {
-                uint64_t i_zerofill:1;
-                uint64_t i_rsvd_2:3;
-                uint64_t i_notify:1;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_poison:1;
-                uint64_t i_rsvd:55;
+        u64 ii_ibct0_regval;
+        struct {
+                u64 i_zerofill:1;
+                u64 i_rsvd_2:3;
+                u64 i_notify:1;
+                u64 i_rsvd_1:3;
+                u64 i_poison:1;
+                u64 i_rsvd:55;
         } ii_ibct0_fld_s;
 } ii_ibct0_u_t;
 
@@ -2546,11 +2546,11 @@ typedef union ii_ibct0_u {
  ************************************************************************/
 
 typedef union ii_ibna0_u {
-        uint64_t ii_ibna0_regval;
+        u64 ii_ibna0_regval;
         struct {
-                uint64_t i_rsvd_1:7;
-                uint64_t i_addr:42;
-                uint64_t i_rsvd:15;
+                u64 i_rsvd_1:7;
+                u64 i_addr:42;
+                u64 i_rsvd:15;
         } ii_ibna0_fld_s;
 } ii_ibna0_u_t;
 
@@ -2563,13 +2563,13 @@ typedef union ii_ibna0_u {
  ************************************************************************/
 
 typedef union ii_ibia0_u {
-        uint64_t ii_ibia0_regval;
+        u64 ii_ibia0_regval;
         struct {
-                uint64_t i_rsvd_2:1;
-                uint64_t i_node_id:11;
-                uint64_t i_rsvd_1:4;
-                uint64_t i_level:7;
-                uint64_t i_rsvd:41;
+                u64 i_rsvd_2:1;
+                u64 i_node_id:11;
+                u64 i_rsvd_1:4;
+                u64 i_level:7;
+                u64 i_rsvd:41;
         } ii_ibia0_fld_s;
 } ii_ibia0_u_t;
 
@@ -2589,13 +2589,13 @@ typedef union ii_ibia0_u {
  ************************************************************************/
 
 typedef union ii_ibls1_u {
-        uint64_t ii_ibls1_regval;
+        u64 ii_ibls1_regval;
         struct {
-                uint64_t i_length:16;
-                uint64_t i_error:1;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_busy:1;
-                uint64_t i_rsvd:43;
+                u64 i_length:16;
+                u64 i_error:1;
+                u64 i_rsvd_1:3;
+                u64 i_busy:1;
+                u64 i_rsvd:43;
         } ii_ibls1_fld_s;
 } ii_ibls1_u_t;
 
@@ -2610,11 +2610,11 @@ typedef union ii_ibls1_u {
  ************************************************************************/
 
 typedef union ii_ibsa1_u {
-        uint64_t ii_ibsa1_regval;
+        u64 ii_ibsa1_regval;
         struct {
-                uint64_t i_rsvd_1:7;
-                uint64_t i_addr:33;
-                uint64_t i_rsvd:24;
+                u64 i_rsvd_1:7;
+                u64 i_addr:33;
+                u64 i_rsvd:24;
         } ii_ibsa1_fld_s;
 } ii_ibsa1_u_t;
 
@@ -2629,11 +2629,11 @@ typedef union ii_ibsa1_u {
  ************************************************************************/
 
 typedef union ii_ibda1_u {
-        uint64_t ii_ibda1_regval;
+        u64 ii_ibda1_regval;
         struct {
-                uint64_t i_rsvd_1:7;
-                uint64_t i_addr:33;
-                uint64_t i_rsvd:24;
+                u64 i_rsvd_1:7;
+                u64 i_addr:33;
+                u64 i_rsvd:24;
         } ii_ibda1_fld_s;
 } ii_ibda1_u_t;
 
@@ -2650,14 +2650,14 @@ typedef union ii_ibda1_u {
  ************************************************************************/
 
 typedef union ii_ibct1_u {
-        uint64_t ii_ibct1_regval;
-        struct {
-                uint64_t i_zerofill:1;
-                uint64_t i_rsvd_2:3;
-                uint64_t i_notify:1;
-                uint64_t i_rsvd_1:3;
-                uint64_t i_poison:1;
-                uint64_t i_rsvd:55;
+        u64 ii_ibct1_regval;
+        struct {
+                u64 i_zerofill:1;
+                u64 i_rsvd_2:3;
+                u64 i_notify:1;
+                u64 i_rsvd_1:3;
+                u64 i_poison:1;
+                u64 i_rsvd:55;
         } ii_ibct1_fld_s;
 } ii_ibct1_u_t;
 
@@ -2669,11 +2669,11 @@ typedef union ii_ibct1_u {
  ************************************************************************/
 
 typedef union ii_ibna1_u {
-        uint64_t ii_ibna1_regval;
+        u64 ii_ibna1_regval;
         struct {
-                uint64_t i_rsvd_1:7;
-                uint64_t i_addr:33;
-                uint64_t i_rsvd:24;
+                u64 i_rsvd_1:7;
+                u64 i_addr:33;
+                u64 i_rsvd:24;
         } ii_ibna1_fld_s;
 } ii_ibna1_u_t;
 
@@ -2686,13 +2686,13 @@ typedef union ii_ibna1_u {
  ************************************************************************/
 
 typedef union ii_ibia1_u {
-        uint64_t ii_ibia1_regval;
+        u64 ii_ibia1_regval;
         struct {
-                uint64_t i_pi_id:1;
-                uint64_t i_node_id:8;
-                uint64_t i_rsvd_1:7;
-                uint64_t i_level:7;
-                uint64_t i_rsvd:41;
+                u64 i_pi_id:1;
+                u64 i_node_id:8;
+                u64 i_rsvd_1:7;
+                u64 i_level:7;
+                u64 i_rsvd:41;
         } ii_ibia1_fld_s;
 } ii_ibia1_u_t;
 
@@ -2712,12 +2712,12 @@ typedef union ii_ibia1_u {
  ************************************************************************/
 
 typedef union ii_ipcr_u {
-        uint64_t ii_ipcr_regval;
+        u64 ii_ipcr_regval;
         struct {
-                uint64_t i_ippr0_c:4;
-                uint64_t i_ippr1_c:4;
-                uint64_t i_icct:8;
-                uint64_t i_rsvd:48;
+                u64 i_ippr0_c:4;
+                u64 i_ippr1_c:4;
+                u64 i_icct:8;
+                u64 i_rsvd:48;
         } ii_ipcr_fld_s;
 } ii_ipcr_u_t;
 
@@ -2728,10 +2728,10 @@ typedef union ii_ipcr_u {
  ************************************************************************/
 
 typedef union ii_ippr_u {
-        uint64_t ii_ippr_regval;
+        u64 ii_ippr_regval;
         struct {
-                uint64_t i_ippr0:32;
-                uint64_t i_ippr1:32;
+                u64 i_ippr0:32;
+                u64 i_ippr1:32;
         } ii_ippr_fld_s;
 } ii_ippr_u_t;
 
@@ -3267,15 +3267,15 @@ typedef ii_icrb0_e_u_t icrbe_t;
 #define IO_PERF_SETS    32
 
 /* Bit for the widget in inbound access register */
-#define IIO_IIWA_WIDGET(_w)     ((uint64_t)(1ULL << _w))
+#define IIO_IIWA_WIDGET(_w)     ((u64)(1ULL << _w))
 /* Bit for the widget in outbound access register */
-#define IIO_IOWA_WIDGET(_w)     ((uint64_t)(1ULL << _w))
+#define IIO_IOWA_WIDGET(_w)     ((u64)(1ULL << _w))
 
 /* NOTE: The following define assumes that we are going to get
  * widget numbers from 8 thru F and the device numbers within
  * widget from 0 thru 7.
  */
-#define IIO_IIDEM_WIDGETDEV_MASK(w, d)  ((uint64_t)(1ULL << (8 * ((w) - 8) + (d))))
+#define IIO_IIDEM_WIDGETDEV_MASK(w, d)  ((u64)(1ULL << (8 * ((w) - 8) + (d))))
 
 /* IO Interrupt Destination Register */
 #define IIO_IIDSR_SENT_SHIFT    28
@@ -3302,9 +3302,9 @@ typedef ii_icrb0_e_u_t icrbe_t;
  */
 
 typedef union hubii_wcr_u {
-        uint64_t wcr_reg_value;
+        u64 wcr_reg_value;
         struct {
-                uint64_t wcr_widget_id:4,       /* LLP crossbar credit */
+                u64 wcr_widget_id:4,    /* LLP crossbar credit */
                  wcr_tag_mode:1,        /* Tag mode */
                  wcr_rsvd1:8,   /* Reserved */
                  wcr_xbar_crd:3,        /* LLP crossbar credit */
@@ -3324,9 +3324,9 @@ performance registers */
    performed */
 
 typedef union io_perf_sel {
-        uint64_t perf_sel_reg;
+        u64 perf_sel_reg;
         struct {
-                uint64_t perf_ippr0:4, perf_ippr1:4, perf_icct:8, perf_rsvd:48;
+                u64 perf_ippr0:4, perf_ippr1:4, perf_icct:8, perf_rsvd:48;
         } perf_sel_bits;
 } io_perf_sel_t;
 
@@ -3334,24 +3334,24 @@ typedef union io_perf_sel {
    hardware problems there is only one counter, not two. */
 
 typedef union io_perf_cnt {
-        uint64_t perf_cnt;
+        u64 perf_cnt;
         struct {
-                uint64_t perf_cnt:20, perf_rsvd2:12, perf_rsvd1:32;
+                u64 perf_cnt:20, perf_rsvd2:12, perf_rsvd1:32;
         } perf_cnt_bits;
 
 } io_perf_cnt_t;
 
 typedef union iprte_a {
-        uint64_t entry;
-        struct {
-                uint64_t i_rsvd_1:3;
-                uint64_t i_addr:38;
-                uint64_t i_init:3;
-                uint64_t i_source:8;
-                uint64_t i_rsvd:2;
-                uint64_t i_widget:4;
-                uint64_t i_to_cnt:5;
-                uint64_t i_vld:1;
+        u64 entry;
+        struct {
+                u64 i_rsvd_1:3;
+                u64 i_addr:38;
+                u64 i_init:3;
+                u64 i_source:8;
+                u64 i_rsvd:2;
+                u64 i_widget:4;
+                u64 i_to_cnt:5;
+                u64 i_vld:1;
         } iprte_fields;
 } iprte_a_t;
 
diff --git a/include/asm-ia64/sn/sn_sal.h b/include/asm-ia64/sn/sn_sal.h
index 8b9e10e7cdba..e77f0c9b7d3d 100644
--- a/include/asm-ia64/sn/sn_sal.h
+++ b/include/asm-ia64/sn/sn_sal.h
@@ -273,7 +273,7 @@ ia64_sn_console_putc(char ch)
         ret_stuff.v0 = 0;
         ret_stuff.v1 = 0;
         ret_stuff.v2 = 0;
-        SAL_CALL_NOLOCK(ret_stuff, SN_SAL_CONSOLE_PUTC, (uint64_t)ch, 0, 0, 0, 0, 0, 0);
+        SAL_CALL_NOLOCK(ret_stuff, SN_SAL_CONSOLE_PUTC, (u64)ch, 0, 0, 0, 0, 0, 0);
 
         return ret_stuff.status;
 }
@@ -290,7 +290,7 @@ ia64_sn_console_putb(const char *buf, int len)
         ret_stuff.v0 = 0; 
         ret_stuff.v1 = 0;
         ret_stuff.v2 = 0;
-        SAL_CALL_NOLOCK(ret_stuff, SN_SAL_CONSOLE_PUTB, (uint64_t)buf, (uint64_t)len, 0, 0, 0, 0, 0);
+        SAL_CALL_NOLOCK(ret_stuff, SN_SAL_CONSOLE_PUTB, (u64)buf, (u64)len, 0, 0, 0, 0, 0);
 
         if ( ret_stuff.status == 0 ) {
                 return ret_stuff.v0;
@@ -310,7 +310,7 @@ ia64_sn_plat_specific_err_print(int (*hook)(const char*, ...), char *rec)
         ret_stuff.v0 = 0;
         ret_stuff.v1 = 0;
         ret_stuff.v2 = 0;
-        SAL_CALL_REENTRANT(ret_stuff, SN_SAL_PRINT_ERROR, (uint64_t)hook, (uint64_t)rec, 0, 0, 0, 0, 0);
+        SAL_CALL_REENTRANT(ret_stuff, SN_SAL_PRINT_ERROR, (u64)hook, (u64)rec, 0, 0, 0, 0, 0);
 
         return ret_stuff.status;
 }
@@ -398,7 +398,7 @@ ia64_sn_console_intr_status(void)
  * Enable an interrupt on the SAL console device.
  */
 static inline void
-ia64_sn_console_intr_enable(uint64_t intr)
+ia64_sn_console_intr_enable(u64 intr)
 {
         struct ia64_sal_retval ret_stuff;
 
@@ -415,7 +415,7 @@ ia64_sn_console_intr_enable(uint64_t intr)
  * Disable an interrupt on the SAL console device.
  */
 static inline void
-ia64_sn_console_intr_disable(uint64_t intr)
+ia64_sn_console_intr_disable(u64 intr)
 {
         struct ia64_sal_retval ret_stuff;
 
@@ -441,7 +441,7 @@ ia64_sn_console_xmit_chars(char *buf, int len)
         ret_stuff.v1 = 0;
         ret_stuff.v2 = 0;
         SAL_CALL_NOLOCK(ret_stuff, SN_SAL_CONSOLE_XMIT_CHARS,
-                 (uint64_t)buf, (uint64_t)len,
+                 (u64)buf, (u64)len,
                  0, 0, 0, 0, 0);
 
         if (ret_stuff.status == 0) {
diff --git a/include/asm-ia64/sn/tioca.h b/include/asm-ia64/sn/tioca.h
index bc1aacfb9483..666222d7f0f6 100644
--- a/include/asm-ia64/sn/tioca.h
+++ b/include/asm-ia64/sn/tioca.h
@@ -19,47 +19,47 @@
  */
 
 struct tioca {
-        uint64_t        ca_id;                          /* 0x000000 */
-        uint64_t        ca_control1;                    /* 0x000008 */
-        uint64_t        ca_control2;                    /* 0x000010 */
-        uint64_t        ca_status1;                     /* 0x000018 */
-        uint64_t        ca_status2;                     /* 0x000020 */
-        uint64_t        ca_gart_aperature;              /* 0x000028 */
-        uint64_t        ca_gfx_detach;                  /* 0x000030 */
-        uint64_t        ca_inta_dest_addr;              /* 0x000038 */
-        uint64_t        ca_intb_dest_addr;              /* 0x000040 */
-        uint64_t        ca_err_int_dest_addr;           /* 0x000048 */
-        uint64_t        ca_int_status;                  /* 0x000050 */
-        uint64_t        ca_int_status_alias;            /* 0x000058 */
-        uint64_t        ca_mult_error;                  /* 0x000060 */
-        uint64_t        ca_mult_error_alias;            /* 0x000068 */
-        uint64_t        ca_first_error;                 /* 0x000070 */
-        uint64_t        ca_int_mask;                    /* 0x000078 */
-        uint64_t        ca_crm_pkterr_type;             /* 0x000080 */
-        uint64_t        ca_crm_pkterr_type_alias;       /* 0x000088 */
-        uint64_t        ca_crm_ct_error_detail_1;       /* 0x000090 */
-        uint64_t        ca_crm_ct_error_detail_2;       /* 0x000098 */
-        uint64_t        ca_crm_tnumto;                  /* 0x0000A0 */
-        uint64_t        ca_gart_err;                    /* 0x0000A8 */
-        uint64_t        ca_pcierr_type;                 /* 0x0000B0 */
-        uint64_t        ca_pcierr_addr;                 /* 0x0000B8 */
-
-        uint64_t        ca_pad_0000C0[3];               /* 0x0000{C0..D0} */
-
-        uint64_t        ca_pci_rd_buf_flush;            /* 0x0000D8 */
-        uint64_t        ca_pci_dma_addr_extn;           /* 0x0000E0 */
-        uint64_t        ca_agp_dma_addr_extn;           /* 0x0000E8 */
-        uint64_t        ca_force_inta;                  /* 0x0000F0 */
-        uint64_t        ca_force_intb;                  /* 0x0000F8 */
-        uint64_t        ca_debug_vector_sel;            /* 0x000100 */
-        uint64_t        ca_debug_mux_core_sel;          /* 0x000108 */
-        uint64_t        ca_debug_mux_pci_sel;           /* 0x000110 */
-        uint64_t        ca_debug_domain_sel;            /* 0x000118 */
-
-        uint64_t        ca_pad_000120[28];              /* 0x0001{20..F8} */
-
-        uint64_t        ca_gart_ptr_table;              /* 0x200 */
-        uint64_t        ca_gart_tlb_addr[8];            /* 0x2{08..40} */
+        u64     ca_id;                          /* 0x000000 */
+        u64     ca_control1;                    /* 0x000008 */
+        u64     ca_control2;                    /* 0x000010 */
+        u64     ca_status1;                     /* 0x000018 */
+        u64     ca_status2;                     /* 0x000020 */
+        u64     ca_gart_aperature;              /* 0x000028 */
+        u64     ca_gfx_detach;                  /* 0x000030 */
+        u64     ca_inta_dest_addr;              /* 0x000038 */
+        u64     ca_intb_dest_addr;              /* 0x000040 */
+        u64     ca_err_int_dest_addr;           /* 0x000048 */
+        u64     ca_int_status;                  /* 0x000050 */
+        u64     ca_int_status_alias;            /* 0x000058 */
+        u64     ca_mult_error;                  /* 0x000060 */
+        u64     ca_mult_error_alias;            /* 0x000068 */
+        u64     ca_first_error;                 /* 0x000070 */
+        u64     ca_int_mask;                    /* 0x000078 */
+        u64     ca_crm_pkterr_type;             /* 0x000080 */
+        u64     ca_crm_pkterr_type_alias;       /* 0x000088 */
+        u64     ca_crm_ct_error_detail_1;       /* 0x000090 */
+        u64     ca_crm_ct_error_detail_2;       /* 0x000098 */
+        u64     ca_crm_tnumto;                  /* 0x0000A0 */
+        u64     ca_gart_err;                    /* 0x0000A8 */
+        u64     ca_pcierr_type;                 /* 0x0000B0 */
+        u64     ca_pcierr_addr;                 /* 0x0000B8 */
+
+        u64     ca_pad_0000C0[3];               /* 0x0000{C0..D0} */
+
+        u64     ca_pci_rd_buf_flush;            /* 0x0000D8 */
+        u64     ca_pci_dma_addr_extn;           /* 0x0000E0 */
+        u64     ca_agp_dma_addr_extn;           /* 0x0000E8 */
+        u64     ca_force_inta;                  /* 0x0000F0 */
+        u64     ca_force_intb;                  /* 0x0000F8 */
+        u64     ca_debug_vector_sel;            /* 0x000100 */
+        u64     ca_debug_mux_core_sel;          /* 0x000108 */
+        u64     ca_debug_mux_pci_sel;           /* 0x000110 */
+        u64     ca_debug_domain_sel;            /* 0x000118 */
+
+        u64     ca_pad_000120[28];              /* 0x0001{20..F8} */
+
+        u64     ca_gart_ptr_table;              /* 0x200 */
+        u64     ca_gart_tlb_addr[8];            /* 0x2{08..40} */
 };
 
 /*
diff --git a/include/asm-ia64/sn/tioca_provider.h b/include/asm-ia64/sn/tioca_provider.h
index b532ef6148ed..ab7fe2463468 100644
--- a/include/asm-ia64/sn/tioca_provider.h
+++ b/include/asm-ia64/sn/tioca_provider.h
@@ -56,31 +56,31 @@ struct tioca_kernel {
         /*
          * General GART stuff
          */
-        uint64_t        ca_ap_size;             /* size of aperature in bytes */
-        uint32_t        ca_gart_entries;        /* # uint64_t entries in gart */
-        uint32_t        ca_ap_pagesize;         /* aperature page size in bytes */
-        uint64_t        ca_ap_bus_base;         /* bus address of CA aperature */
-        uint64_t        ca_gart_size;           /* gart size in bytes */
-        uint64_t        *ca_gart;               /* gart table vaddr */
-        uint64_t        ca_gart_coretalk_addr;  /* gart coretalk addr */
-        uint8_t         ca_gart_iscoherent;     /* used in tioca_tlbflush */
+        u64     ca_ap_size;             /* size of aperature in bytes */
+        u32     ca_gart_entries;        /* # u64 entries in gart */
+        u32     ca_ap_pagesize;         /* aperature page size in bytes */
+        u64     ca_ap_bus_base;         /* bus address of CA aperature */
+        u64     ca_gart_size;           /* gart size in bytes */
+        u64     *ca_gart;               /* gart table vaddr */
+        u64     ca_gart_coretalk_addr;  /* gart coretalk addr */
+        u8              ca_gart_iscoherent;     /* used in tioca_tlbflush */
 
         /* PCI GART convenience values */
-        uint64_t        ca_pciap_base;          /* pci aperature bus base address */
-        uint64_t        ca_pciap_size;          /* pci aperature size (bytes) */
-        uint64_t        ca_pcigart_base;        /* gfx GART bus base address */
-        uint64_t        *ca_pcigart;            /* gfx GART vm address */
-        uint32_t        ca_pcigart_entries;
-        uint32_t        ca_pcigart_start;       /* PCI start index in ca_gart */
+        u64     ca_pciap_base;          /* pci aperature bus base address */
+        u64     ca_pciap_size;          /* pci aperature size (bytes) */
+        u64     ca_pcigart_base;        /* gfx GART bus base address */
+        u64     *ca_pcigart;            /* gfx GART vm address */
+        u32     ca_pcigart_entries;
+        u32     ca_pcigart_start;       /* PCI start index in ca_gart */
         void            *ca_pcigart_pagemap;
 
         /* AGP GART convenience values */
-        uint64_t        ca_gfxap_base;          /* gfx aperature bus base address */
-        uint64_t        ca_gfxap_size;          /* gfx aperature size (bytes) */
-        uint64_t        ca_gfxgart_base;        /* gfx GART bus base address */
-        uint64_t        *ca_gfxgart;            /* gfx GART vm address */
-        uint32_t        ca_gfxgart_entries;
-        uint32_t        ca_gfxgart_start;       /* agpgart start index in ca_gart */
+        u64     ca_gfxap_base;          /* gfx aperature bus base address */
+        u64     ca_gfxap_size;          /* gfx aperature size (bytes) */
+        u64     ca_gfxgart_base;        /* gfx GART bus base address */
+        u64     *ca_gfxgart;            /* gfx GART vm address */
+        u32     ca_gfxgart_entries;
+        u32     ca_gfxgart_start;       /* agpgart start index in ca_gart */
 };
 
 /*
@@ -93,11 +93,11 @@ struct tioca_kernel {
 struct tioca_common {
         struct pcibus_bussoft   ca_common;      /* common pciio header */
 
-        uint32_t                ca_rev;
-        uint32_t                ca_closest_nasid;
+        u32             ca_rev;
+        u32             ca_closest_nasid;
 
-        uint64_t                ca_prom_private;
-        uint64_t                ca_kernel_private;
+        u64             ca_prom_private;
+        u64             ca_kernel_private;
 };
 
 /**
@@ -139,9 +139,9 @@ tioca_paddr_to_gart(unsigned long paddr)
  */
 
 static inline unsigned long
-tioca_physpage_to_gart(uint64_t page_addr)
+tioca_physpage_to_gart(u64 page_addr)
 {
-        uint64_t coretalk_addr;
+        u64 coretalk_addr;
 
         coretalk_addr = PHYS_TO_TIODMA(page_addr);
         if (!coretalk_addr) {
@@ -161,7 +161,7 @@ tioca_physpage_to_gart(uint64_t page_addr)
 static inline void
 tioca_tlbflush(struct tioca_kernel *tioca_kernel)
 {
-        volatile uint64_t tmp;
+        volatile u64 tmp;
         volatile struct tioca *ca_base;
         struct tioca_common *tioca_common;
 
@@ -200,7 +200,7 @@ tioca_tlbflush(struct tioca_kernel *tioca_kernel)
         tmp = __sn_readq_relaxed(&ca_base->ca_control2);
 }
 
-extern uint32_t tioca_gart_found;
+extern u32      tioca_gart_found;
 extern struct list_head tioca_list;
 extern int tioca_init_provider(void);
 extern void tioca_fastwrite_enable(struct tioca_kernel *tioca_kern);
diff --git a/include/asm-ia64/sn/tioce.h b/include/asm-ia64/sn/tioce.h
index ecaddf960086..d4c990712eac 100644
--- a/include/asm-ia64/sn/tioce.h
+++ b/include/asm-ia64/sn/tioce.h
@@ -35,72 +35,72 @@ typedef volatile struct tioce {
         /*
          * ADMIN : Administration Registers
          */
-        uint64_t        ce_adm_id;                              /* 0x000000 */
-        uint64_t        ce_pad_000008;                          /* 0x000008 */
-        uint64_t        ce_adm_dyn_credit_status;               /* 0x000010 */
-        uint64_t        ce_adm_last_credit_status;              /* 0x000018 */
-        uint64_t        ce_adm_credit_limit;                    /* 0x000020 */
-        uint64_t        ce_adm_force_credit;                    /* 0x000028 */
-        uint64_t        ce_adm_control;                         /* 0x000030 */
-        uint64_t        ce_adm_mmr_chn_timeout;                 /* 0x000038 */
-        uint64_t        ce_adm_ssp_ure_timeout;                 /* 0x000040 */
-        uint64_t        ce_adm_ssp_dre_timeout;                 /* 0x000048 */
-        uint64_t        ce_adm_ssp_debug_sel;                   /* 0x000050 */
-        uint64_t        ce_adm_int_status;                      /* 0x000058 */
-        uint64_t        ce_adm_int_status_alias;                /* 0x000060 */
-        uint64_t        ce_adm_int_mask;                        /* 0x000068 */
-        uint64_t        ce_adm_int_pending;                     /* 0x000070 */
-        uint64_t        ce_adm_force_int;                       /* 0x000078 */
-        uint64_t        ce_adm_ure_ups_buf_barrier_flush;       /* 0x000080 */
-        uint64_t        ce_adm_int_dest[15];        /* 0x000088 -- 0x0000F8 */
-        uint64_t        ce_adm_error_summary;                   /* 0x000100 */
-        uint64_t        ce_adm_error_summary_alias;             /* 0x000108 */
-        uint64_t        ce_adm_error_mask;                      /* 0x000110 */
-        uint64_t        ce_adm_first_error;                     /* 0x000118 */
-        uint64_t        ce_adm_error_overflow;                  /* 0x000120 */
-        uint64_t        ce_adm_error_overflow_alias;            /* 0x000128 */
-        uint64_t        ce_pad_000130[2];           /* 0x000130 -- 0x000138 */
-        uint64_t        ce_adm_tnum_error;                      /* 0x000140 */
-        uint64_t        ce_adm_mmr_err_detail;                  /* 0x000148 */
-        uint64_t        ce_adm_msg_sram_perr_detail;            /* 0x000150 */
-        uint64_t        ce_adm_bap_sram_perr_detail;            /* 0x000158 */
-        uint64_t        ce_adm_ce_sram_perr_detail;             /* 0x000160 */
-        uint64_t        ce_adm_ce_credit_oflow_detail;          /* 0x000168 */
-        uint64_t        ce_adm_tx_link_idle_max_timer;          /* 0x000170 */
-        uint64_t        ce_adm_pcie_debug_sel;                  /* 0x000178 */
-        uint64_t        ce_pad_000180[16];          /* 0x000180 -- 0x0001F8 */
-
-        uint64_t        ce_adm_pcie_debug_sel_top;              /* 0x000200 */
-        uint64_t        ce_adm_pcie_debug_lat_sel_lo_top;       /* 0x000208 */
-        uint64_t        ce_adm_pcie_debug_lat_sel_hi_top;       /* 0x000210 */
-        uint64_t        ce_adm_pcie_debug_trig_sel_top;         /* 0x000218 */
-        uint64_t        ce_adm_pcie_debug_trig_lat_sel_lo_top;  /* 0x000220 */
-        uint64_t        ce_adm_pcie_debug_trig_lat_sel_hi_top;  /* 0x000228 */
-        uint64_t        ce_adm_pcie_trig_compare_top;           /* 0x000230 */
-        uint64_t        ce_adm_pcie_trig_compare_en_top;        /* 0x000238 */
-        uint64_t        ce_adm_ssp_debug_sel_top;               /* 0x000240 */
-        uint64_t        ce_adm_ssp_debug_lat_sel_lo_top;        /* 0x000248 */
-        uint64_t        ce_adm_ssp_debug_lat_sel_hi_top;        /* 0x000250 */
-        uint64_t        ce_adm_ssp_debug_trig_sel_top;          /* 0x000258 */
-        uint64_t        ce_adm_ssp_debug_trig_lat_sel_lo_top;   /* 0x000260 */
-        uint64_t        ce_adm_ssp_debug_trig_lat_sel_hi_top;   /* 0x000268 */
-        uint64_t        ce_adm_ssp_trig_compare_top;            /* 0x000270 */
-        uint64_t        ce_adm_ssp_trig_compare_en_top;         /* 0x000278 */
-        uint64_t        ce_pad_000280[48];          /* 0x000280 -- 0x0003F8 */
-
-        uint64_t        ce_adm_bap_ctrl;                        /* 0x000400 */
-        uint64_t        ce_pad_000408[127];         /* 0x000408 -- 0x0007F8 */
-
-        uint64_t        ce_msg_buf_data63_0[35];    /* 0x000800 -- 0x000918 */
-        uint64_t        ce_pad_000920[29];          /* 0x000920 -- 0x0009F8 */
-
-        uint64_t        ce_msg_buf_data127_64[35];  /* 0x000A00 -- 0x000B18 */
-        uint64_t        ce_pad_000B20[29];          /* 0x000B20 -- 0x000BF8 */
-
-        uint64_t        ce_msg_buf_parity[35];      /* 0x000C00 -- 0x000D18 */
-        uint64_t        ce_pad_000D20[29];          /* 0x000D20 -- 0x000DF8 */
-
-        uint64_t        ce_pad_000E00[576];         /* 0x000E00 -- 0x001FF8 */
+        u64     ce_adm_id;                              /* 0x000000 */
+        u64     ce_pad_000008;                          /* 0x000008 */
+        u64     ce_adm_dyn_credit_status;               /* 0x000010 */
+        u64     ce_adm_last_credit_status;              /* 0x000018 */
+        u64     ce_adm_credit_limit;                    /* 0x000020 */
+        u64     ce_adm_force_credit;                    /* 0x000028 */
+        u64     ce_adm_control;                         /* 0x000030 */
+        u64     ce_adm_mmr_chn_timeout;                 /* 0x000038 */
+        u64     ce_adm_ssp_ure_timeout;                 /* 0x000040 */
+        u64     ce_adm_ssp_dre_timeout;                 /* 0x000048 */
+        u64     ce_adm_ssp_debug_sel;                   /* 0x000050 */
+        u64     ce_adm_int_status;                      /* 0x000058 */
+        u64     ce_adm_int_status_alias;                /* 0x000060 */
+        u64     ce_adm_int_mask;                        /* 0x000068 */
+        u64     ce_adm_int_pending;                     /* 0x000070 */
+        u64     ce_adm_force_int;                       /* 0x000078 */
+        u64     ce_adm_ure_ups_buf_barrier_flush;       /* 0x000080 */
+        u64     ce_adm_int_dest[15];        /* 0x000088 -- 0x0000F8 */
+        u64     ce_adm_error_summary;                   /* 0x000100 */
+        u64     ce_adm_error_summary_alias;             /* 0x000108 */
+        u64     ce_adm_error_mask;                      /* 0x000110 */
+        u64     ce_adm_first_error;                     /* 0x000118 */
+        u64     ce_adm_error_overflow;                  /* 0x000120 */
+        u64     ce_adm_error_overflow_alias;            /* 0x000128 */
+        u64     ce_pad_000130[2];           /* 0x000130 -- 0x000138 */
+        u64     ce_adm_tnum_error;                      /* 0x000140 */
+        u64     ce_adm_mmr_err_detail;                  /* 0x000148 */
+        u64     ce_adm_msg_sram_perr_detail;            /* 0x000150 */
+        u64     ce_adm_bap_sram_perr_detail;            /* 0x000158 */
+        u64     ce_adm_ce_sram_perr_detail;             /* 0x000160 */
+        u64     ce_adm_ce_credit_oflow_detail;          /* 0x000168 */
+        u64     ce_adm_tx_link_idle_max_timer;          /* 0x000170 */
+        u64     ce_adm_pcie_debug_sel;                  /* 0x000178 */
+        u64     ce_pad_000180[16];          /* 0x000180 -- 0x0001F8 */
+
+        u64     ce_adm_pcie_debug_sel_top;              /* 0x000200 */
+        u64     ce_adm_pcie_debug_lat_sel_lo_top;       /* 0x000208 */
+        u64     ce_adm_pcie_debug_lat_sel_hi_top;       /* 0x000210 */
+        u64     ce_adm_pcie_debug_trig_sel_top;         /* 0x000218 */
+        u64     ce_adm_pcie_debug_trig_lat_sel_lo_top;  /* 0x000220 */
+        u64     ce_adm_pcie_debug_trig_lat_sel_hi_top;  /* 0x000228 */
+        u64     ce_adm_pcie_trig_compare_top;           /* 0x000230 */
+        u64     ce_adm_pcie_trig_compare_en_top;        /* 0x000238 */
+        u64     ce_adm_ssp_debug_sel_top;               /* 0x000240 */
+        u64     ce_adm_ssp_debug_lat_sel_lo_top;        /* 0x000248 */
+        u64     ce_adm_ssp_debug_lat_sel_hi_top;        /* 0x000250 */
+        u64     ce_adm_ssp_debug_trig_sel_top;          /* 0x000258 */
+        u64     ce_adm_ssp_debug_trig_lat_sel_lo_top;   /* 0x000260 */
+        u64     ce_adm_ssp_debug_trig_lat_sel_hi_top;   /* 0x000268 */
+        u64     ce_adm_ssp_trig_compare_top;            /* 0x000270 */
+        u64     ce_adm_ssp_trig_compare_en_top;         /* 0x000278 */
+        u64     ce_pad_000280[48];          /* 0x000280 -- 0x0003F8 */
+
+        u64     ce_adm_bap_ctrl;                        /* 0x000400 */
+        u64     ce_pad_000408[127];         /* 0x000408 -- 0x0007F8 */
+
+        u64     ce_msg_buf_data63_0[35];    /* 0x000800 -- 0x000918 */
+        u64     ce_pad_000920[29];          /* 0x000920 -- 0x0009F8 */
+
+        u64     ce_msg_buf_data127_64[35];  /* 0x000A00 -- 0x000B18 */
+        u64     ce_pad_000B20[29];          /* 0x000B20 -- 0x000BF8 */
+
+        u64     ce_msg_buf_parity[35];      /* 0x000C00 -- 0x000D18 */
+        u64     ce_pad_000D20[29];          /* 0x000D20 -- 0x000DF8 */
+
+        u64     ce_pad_000E00[576];         /* 0x000E00 -- 0x001FF8 */
 
         /*
          * LSI : LSI's PCI Express Link Registers (Link#1 and Link#2)
@@ -109,141 +109,141 @@ typedef volatile struct tioce {
          */
         #define ce_lsi(link_num)        ce_lsi[link_num-1]
         struct ce_lsi_reg {
-                uint64_t        ce_lsi_lpu_id;                  /* 0x00z000 */
-                uint64_t        ce_lsi_rst;                     /* 0x00z008 */
-                uint64_t        ce_lsi_dbg_stat;                /* 0x00z010 */
-                uint64_t        ce_lsi_dbg_cfg;                 /* 0x00z018 */
-                uint64_t        ce_lsi_ltssm_ctrl;              /* 0x00z020 */
-                uint64_t        ce_lsi_lk_stat;                 /* 0x00z028 */
-                uint64_t        ce_pad_00z030[2];   /* 0x00z030 -- 0x00z038 */
-                uint64_t        ce_lsi_int_and_stat;            /* 0x00z040 */
-                uint64_t        ce_lsi_int_mask;                /* 0x00z048 */
-                uint64_t        ce_pad_00z050[22];  /* 0x00z050 -- 0x00z0F8 */
-                uint64_t        ce_lsi_lk_perf_cnt_sel;         /* 0x00z100 */
-                uint64_t        ce_pad_00z108;                  /* 0x00z108 */
-                uint64_t        ce_lsi_lk_perf_cnt_ctrl;        /* 0x00z110 */
-                uint64_t        ce_pad_00z118;                  /* 0x00z118 */
-                uint64_t        ce_lsi_lk_perf_cnt1;            /* 0x00z120 */
-                uint64_t        ce_lsi_lk_perf_cnt1_test;       /* 0x00z128 */
-                uint64_t        ce_lsi_lk_perf_cnt2;            /* 0x00z130 */
-                uint64_t        ce_lsi_lk_perf_cnt2_test;       /* 0x00z138 */
-                uint64_t        ce_pad_00z140[24];  /* 0x00z140 -- 0x00z1F8 */
-                uint64_t        ce_lsi_lk_lyr_cfg;              /* 0x00z200 */
-                uint64_t        ce_lsi_lk_lyr_status;           /* 0x00z208 */
-                uint64_t        ce_lsi_lk_lyr_int_stat;         /* 0x00z210 */
-                uint64_t        ce_lsi_lk_ly_int_stat_test;     /* 0x00z218 */
-                uint64_t        ce_lsi_lk_ly_int_stat_mask;     /* 0x00z220 */
-                uint64_t        ce_pad_00z228[3];   /* 0x00z228 -- 0x00z238 */
-                uint64_t        ce_lsi_fc_upd_ctl;              /* 0x00z240 */
-                uint64_t        ce_pad_00z248[3];   /* 0x00z248 -- 0x00z258 */
-                uint64_t        ce_lsi_flw_ctl_upd_to_timer;    /* 0x00z260 */
-                uint64_t        ce_lsi_flw_ctl_upd_timer0;      /* 0x00z268 */
-                uint64_t        ce_lsi_flw_ctl_upd_timer1;      /* 0x00z270 */
-                uint64_t        ce_pad_00z278[49];  /* 0x00z278 -- 0x00z3F8 */
-                uint64_t        ce_lsi_freq_nak_lat_thrsh;      /* 0x00z400 */
-                uint64_t        ce_lsi_ack_nak_lat_tmr;         /* 0x00z408 */
-                uint64_t        ce_lsi_rply_tmr_thr;            /* 0x00z410 */
-                uint64_t        ce_lsi_rply_tmr;                /* 0x00z418 */
-                uint64_t        ce_lsi_rply_num_stat;           /* 0x00z420 */
-                uint64_t        ce_lsi_rty_buf_max_addr;        /* 0x00z428 */
-                uint64_t        ce_lsi_rty_fifo_ptr;            /* 0x00z430 */
-                uint64_t        ce_lsi_rty_fifo_rd_wr_ptr;      /* 0x00z438 */
-                uint64_t        ce_lsi_rty_fifo_cred;           /* 0x00z440 */
-                uint64_t        ce_lsi_seq_cnt;                 /* 0x00z448 */
-                uint64_t        ce_lsi_ack_sent_seq_num;        /* 0x00z450 */
-                uint64_t        ce_lsi_seq_cnt_fifo_max_addr;   /* 0x00z458 */
-                uint64_t        ce_lsi_seq_cnt_fifo_ptr;        /* 0x00z460 */
-                uint64_t        ce_lsi_seq_cnt_rd_wr_ptr;       /* 0x00z468 */
-                uint64_t        ce_lsi_tx_lk_ts_ctl;            /* 0x00z470 */
-                uint64_t        ce_pad_00z478;                  /* 0x00z478 */
-                uint64_t        ce_lsi_mem_addr_ctl;            /* 0x00z480 */
-                uint64_t        ce_lsi_mem_d_ld0;               /* 0x00z488 */
-                uint64_t        ce_lsi_mem_d_ld1;               /* 0x00z490 */
-                uint64_t        ce_lsi_mem_d_ld2;               /* 0x00z498 */
-                uint64_t        ce_lsi_mem_d_ld3;               /* 0x00z4A0 */
-                uint64_t        ce_lsi_mem_d_ld4;               /* 0x00z4A8 */
-                uint64_t        ce_pad_00z4B0[2];   /* 0x00z4B0 -- 0x00z4B8 */
-                uint64_t        ce_lsi_rty_d_cnt;               /* 0x00z4C0 */
-                uint64_t        ce_lsi_seq_buf_cnt;             /* 0x00z4C8 */
-                uint64_t        ce_lsi_seq_buf_bt_d;            /* 0x00z4D0 */
-                uint64_t        ce_pad_00z4D8;                  /* 0x00z4D8 */
-                uint64_t        ce_lsi_ack_lat_thr;             /* 0x00z4E0 */
-                uint64_t        ce_pad_00z4E8[3];   /* 0x00z4E8 -- 0x00z4F8 */
-                uint64_t        ce_lsi_nxt_rcv_seq_1_cntr;      /* 0x00z500 */
-                uint64_t        ce_lsi_unsp_dllp_rcvd;          /* 0x00z508 */
-                uint64_t        ce_lsi_rcv_lk_ts_ctl;           /* 0x00z510 */
-                uint64_t        ce_pad_00z518[29];  /* 0x00z518 -- 0x00z5F8 */
-                uint64_t        ce_lsi_phy_lyr_cfg;             /* 0x00z600 */
-                uint64_t        ce_pad_00z608;                  /* 0x00z608 */
-                uint64_t        ce_lsi_phy_lyr_int_stat;        /* 0x00z610 */
-                uint64_t        ce_lsi_phy_lyr_int_stat_test;   /* 0x00z618 */
-                uint64_t        ce_lsi_phy_lyr_int_mask;        /* 0x00z620 */
-                uint64_t        ce_pad_00z628[11];  /* 0x00z628 -- 0x00z678 */
-                uint64_t        ce_lsi_rcv_phy_cfg;             /* 0x00z680 */
-                uint64_t        ce_lsi_rcv_phy_stat1;           /* 0x00z688 */
-                uint64_t        ce_lsi_rcv_phy_stat2;           /* 0x00z690 */
-                uint64_t        ce_lsi_rcv_phy_stat3;           /* 0x00z698 */
-                uint64_t        ce_lsi_rcv_phy_int_stat;        /* 0x00z6A0 */
-                uint64_t        ce_lsi_rcv_phy_int_stat_test;   /* 0x00z6A8 */
-                uint64_t        ce_lsi_rcv_phy_int_mask;        /* 0x00z6B0 */
-                uint64_t        ce_pad_00z6B8[9];   /* 0x00z6B8 -- 0x00z6F8 */
-                uint64_t        ce_lsi_tx_phy_cfg;              /* 0x00z700 */
-                uint64_t        ce_lsi_tx_phy_stat;             /* 0x00z708 */
-                uint64_t        ce_lsi_tx_phy_int_stat;         /* 0x00z710 */
-                uint64_t        ce_lsi_tx_phy_int_stat_test;    /* 0x00z718 */
-                uint64_t        ce_lsi_tx_phy_int_mask;         /* 0x00z720 */
-                uint64_t        ce_lsi_tx_phy_stat2;            /* 0x00z728 */
-                uint64_t        ce_pad_00z730[10];  /* 0x00z730 -- 0x00z77F */
-                uint64_t        ce_lsi_ltssm_cfg1;              /* 0x00z780 */
-                uint64_t        ce_lsi_ltssm_cfg2;              /* 0x00z788 */
-                uint64_t        ce_lsi_ltssm_cfg3;              /* 0x00z790 */
-                uint64_t        ce_lsi_ltssm_cfg4;              /* 0x00z798 */
-                uint64_t        ce_lsi_ltssm_cfg5;              /* 0x00z7A0 */
-                uint64_t        ce_lsi_ltssm_stat1;             /* 0x00z7A8 */
-                uint64_t        ce_lsi_ltssm_stat2;             /* 0x00z7B0 */
-                uint64_t        ce_lsi_ltssm_int_stat;          /* 0x00z7B8 */
-                uint64_t        ce_lsi_ltssm_int_stat_test;     /* 0x00z7C0 */
-                uint64_t        ce_lsi_ltssm_int_mask;          /* 0x00z7C8 */
-                uint64_t        ce_lsi_ltssm_stat_wr_en;        /* 0x00z7D0 */
-                uint64_t        ce_pad_00z7D8[5];   /* 0x00z7D8 -- 0x00z7F8 */
-                uint64_t        ce_lsi_gb_cfg1;                 /* 0x00z800 */
-                uint64_t        ce_lsi_gb_cfg2;                 /* 0x00z808 */
-                uint64_t        ce_lsi_gb_cfg3;                 /* 0x00z810 */
-                uint64_t        ce_lsi_gb_cfg4;                 /* 0x00z818 */
-                uint64_t        ce_lsi_gb_stat;                 /* 0x00z820 */
-                uint64_t        ce_lsi_gb_int_stat;             /* 0x00z828 */
-                uint64_t        ce_lsi_gb_int_stat_test;        /* 0x00z830 */
-                uint64_t        ce_lsi_gb_int_mask;             /* 0x00z838 */
-                uint64_t        ce_lsi_gb_pwr_dn1;              /* 0x00z840 */
-                uint64_t        ce_lsi_gb_pwr_dn2;              /* 0x00z848 */
-                uint64_t        ce_pad_00z850[246]; /* 0x00z850 -- 0x00zFF8 */
+                u64     ce_lsi_lpu_id;                  /* 0x00z000 */
+                u64     ce_lsi_rst;                     /* 0x00z008 */
+                u64     ce_lsi_dbg_stat;                /* 0x00z010 */
+                u64     ce_lsi_dbg_cfg;                 /* 0x00z018 */
+                u64     ce_lsi_ltssm_ctrl;              /* 0x00z020 */
+                u64     ce_lsi_lk_stat;                 /* 0x00z028 */
+                u64     ce_pad_00z030[2];   /* 0x00z030 -- 0x00z038 */
+                u64     ce_lsi_int_and_stat;            /* 0x00z040 */
+                u64     ce_lsi_int_mask;                /* 0x00z048 */
+                u64     ce_pad_00z050[22];  /* 0x00z050 -- 0x00z0F8 */
+                u64     ce_lsi_lk_perf_cnt_sel;         /* 0x00z100 */
+                u64     ce_pad_00z108;                  /* 0x00z108 */
+                u64     ce_lsi_lk_perf_cnt_ctrl;        /* 0x00z110 */
+                u64     ce_pad_00z118;                  /* 0x00z118 */
+                u64     ce_lsi_lk_perf_cnt1;            /* 0x00z120 */
+                u64     ce_lsi_lk_perf_cnt1_test;       /* 0x00z128 */
+                u64     ce_lsi_lk_perf_cnt2;            /* 0x00z130 */
+                u64     ce_lsi_lk_perf_cnt2_test;       /* 0x00z138 */
+                u64     ce_pad_00z140[24];  /* 0x00z140 -- 0x00z1F8 */
+                u64     ce_lsi_lk_lyr_cfg;              /* 0x00z200 */
+                u64     ce_lsi_lk_lyr_status;           /* 0x00z208 */
+                u64     ce_lsi_lk_lyr_int_stat;         /* 0x00z210 */
+                u64     ce_lsi_lk_ly_int_stat_test;     /* 0x00z218 */
+                u64     ce_lsi_lk_ly_int_stat_mask;     /* 0x00z220 */
+                u64     ce_pad_00z228[3];   /* 0x00z228 -- 0x00z238 */
+                u64     ce_lsi_fc_upd_ctl;              /* 0x00z240 */
+                u64     ce_pad_00z248[3];   /* 0x00z248 -- 0x00z258 */
+                u64     ce_lsi_flw_ctl_upd_to_timer;    /* 0x00z260 */
+                u64     ce_lsi_flw_ctl_upd_timer0;      /* 0x00z268 */
+                u64     ce_lsi_flw_ctl_upd_timer1;      /* 0x00z270 */
+                u64     ce_pad_00z278[49];  /* 0x00z278 -- 0x00z3F8 */
+                u64     ce_lsi_freq_nak_lat_thrsh;      /* 0x00z400 */
+                u64     ce_lsi_ack_nak_lat_tmr;         /* 0x00z408 */
+                u64     ce_lsi_rply_tmr_thr;            /* 0x00z410 */
+                u64     ce_lsi_rply_tmr;                /* 0x00z418 */
+                u64     ce_lsi_rply_num_stat;           /* 0x00z420 */
+                u64     ce_lsi_rty_buf_max_addr;        /* 0x00z428 */
+                u64     ce_lsi_rty_fifo_ptr;            /* 0x00z430 */
+                u64     ce_lsi_rty_fifo_rd_wr_ptr;      /* 0x00z438 */
+                u64     ce_lsi_rty_fifo_cred;           /* 0x00z440 */
+                u64     ce_lsi_seq_cnt;                 /* 0x00z448 */
+                u64     ce_lsi_ack_sent_seq_num;        /* 0x00z450 */
+                u64     ce_lsi_seq_cnt_fifo_max_addr;   /* 0x00z458 */
+                u64     ce_lsi_seq_cnt_fifo_ptr;        /* 0x00z460 */
+                u64     ce_lsi_seq_cnt_rd_wr_ptr;       /* 0x00z468 */
+                u64     ce_lsi_tx_lk_ts_ctl;            /* 0x00z470 */
+                u64     ce_pad_00z478;                  /* 0x00z478 */
+                u64     ce_lsi_mem_addr_ctl;            /* 0x00z480 */
+                u64     ce_lsi_mem_d_ld0;               /* 0x00z488 */
+                u64     ce_lsi_mem_d_ld1;               /* 0x00z490 */
+                u64     ce_lsi_mem_d_ld2;               /* 0x00z498 */
+                u64     ce_lsi_mem_d_ld3;               /* 0x00z4A0 */
+                u64     ce_lsi_mem_d_ld4;               /* 0x00z4A8 */
+                u64     ce_pad_00z4B0[2];   /* 0x00z4B0 -- 0x00z4B8 */
+                u64     ce_lsi_rty_d_cnt;               /* 0x00z4C0 */
+                u64     ce_lsi_seq_buf_cnt;             /* 0x00z4C8 */
+                u64     ce_lsi_seq_buf_bt_d;            /* 0x00z4D0 */
+                u64     ce_pad_00z4D8;                  /* 0x00z4D8 */
+                u64     ce_lsi_ack_lat_thr;             /* 0x00z4E0 */
+                u64     ce_pad_00z4E8[3];   /* 0x00z4E8 -- 0x00z4F8 */
+                u64     ce_lsi_nxt_rcv_seq_1_cntr;      /* 0x00z500 */
+                u64     ce_lsi_unsp_dllp_rcvd;          /* 0x00z508 */
+                u64     ce_lsi_rcv_lk_ts_ctl;           /* 0x00z510 */
+                u64     ce_pad_00z518[29];  /* 0x00z518 -- 0x00z5F8 */
+                u64     ce_lsi_phy_lyr_cfg;             /* 0x00z600 */
+                u64     ce_pad_00z608;                  /* 0x00z608 */
+                u64     ce_lsi_phy_lyr_int_stat;        /* 0x00z610 */
+                u64     ce_lsi_phy_lyr_int_stat_test;   /* 0x00z618 */
+                u64     ce_lsi_phy_lyr_int_mask;        /* 0x00z620 */
+                u64     ce_pad_00z628[11];  /* 0x00z628 -- 0x00z678 */
+                u64     ce_lsi_rcv_phy_cfg;             /* 0x00z680 */
+                u64     ce_lsi_rcv_phy_stat1;           /* 0x00z688 */
+                u64     ce_lsi_rcv_phy_stat2;           /* 0x00z690 */
+                u64     ce_lsi_rcv_phy_stat3;           /* 0x00z698 */
+                u64     ce_lsi_rcv_phy_int_stat;        /* 0x00z6A0 */
+                u64     ce_lsi_rcv_phy_int_stat_test;   /* 0x00z6A8 */
+                u64     ce_lsi_rcv_phy_int_mask;        /* 0x00z6B0 */
+                u64     ce_pad_00z6B8[9];   /* 0x00z6B8 -- 0x00z6F8 */
+                u64     ce_lsi_tx_phy_cfg;              /* 0x00z700 */
+                u64     ce_lsi_tx_phy_stat;             /* 0x00z708 */
+                u64     ce_lsi_tx_phy_int_stat;         /* 0x00z710 */
+                u64     ce_lsi_tx_phy_int_stat_test;    /* 0x00z718 */
+                u64     ce_lsi_tx_phy_int_mask;         /* 0x00z720 */
+                u64     ce_lsi_tx_phy_stat2;            /* 0x00z728 */
+                u64     ce_pad_00z730[10];  /* 0x00z730 -- 0x00z77F */
+                u64     ce_lsi_ltssm_cfg1;              /* 0x00z780 */
+                u64     ce_lsi_ltssm_cfg2;              /* 0x00z788 */
+                u64     ce_lsi_ltssm_cfg3;              /* 0x00z790 */
+                u64     ce_lsi_ltssm_cfg4;              /* 0x00z798 */
+                u64     ce_lsi_ltssm_cfg5;              /* 0x00z7A0 */
+                u64     ce_lsi_ltssm_stat1;             /* 0x00z7A8 */
+                u64     ce_lsi_ltssm_stat2;             /* 0x00z7B0 */
+                u64     ce_lsi_ltssm_int_stat;          /* 0x00z7B8 */
+                u64     ce_lsi_ltssm_int_stat_test;     /* 0x00z7C0 */
+                u64     ce_lsi_ltssm_int_mask;          /* 0x00z7C8 */
+                u64     ce_lsi_ltssm_stat_wr_en;        /* 0x00z7D0 */
+                u64     ce_pad_00z7D8[5];   /* 0x00z7D8 -- 0x00z7F8 */
+                u64     ce_lsi_gb_cfg1;                 /* 0x00z800 */
+                u64     ce_lsi_gb_cfg2;                 /* 0x00z808 */
+                u64     ce_lsi_gb_cfg3;                 /* 0x00z810 */
+                u64     ce_lsi_gb_cfg4;                 /* 0x00z818 */
+                u64     ce_lsi_gb_stat;                 /* 0x00z820 */
+                u64     ce_lsi_gb_int_stat;             /* 0x00z828 */
+                u64     ce_lsi_gb_int_stat_test;        /* 0x00z830 */
+                u64     ce_lsi_gb_int_mask;             /* 0x00z838 */
+                u64     ce_lsi_gb_pwr_dn1;              /* 0x00z840 */
+                u64     ce_lsi_gb_pwr_dn2;              /* 0x00z848 */
+                u64     ce_pad_00z850[246]; /* 0x00z850 -- 0x00zFF8 */
         } ce_lsi[2];
 
-        uint64_t        ce_pad_004000[10];          /* 0x004000 -- 0x004048 */
+        u64     ce_pad_004000[10];          /* 0x004000 -- 0x004048 */
 
         /*
          * CRM: Coretalk Receive Module Registers
          */
-        uint64_t        ce_crm_debug_mux;                       /* 0x004050 */
-        uint64_t        ce_pad_004058;                          /* 0x004058 */
-        uint64_t        ce_crm_ssp_err_cmd_wrd;                 /* 0x004060 */
-        uint64_t        ce_crm_ssp_err_addr;                    /* 0x004068 */
-        uint64_t        ce_crm_ssp_err_syn;                     /* 0x004070 */
+        u64     ce_crm_debug_mux;                       /* 0x004050 */
+        u64     ce_pad_004058;                          /* 0x004058 */
+        u64     ce_crm_ssp_err_cmd_wrd;                 /* 0x004060 */
+        u64     ce_crm_ssp_err_addr;                    /* 0x004068 */
+        u64     ce_crm_ssp_err_syn;                     /* 0x004070 */
 
-        uint64_t        ce_pad_004078[499];         /* 0x004078 -- 0x005008 */
+        u64     ce_pad_004078[499];         /* 0x004078 -- 0x005008 */
 
         /*
          * CXM: Coretalk Xmit Module Registers
          */
-        uint64_t        ce_cxm_dyn_credit_status;               /* 0x005010 */
-        uint64_t        ce_cxm_last_credit_status;              /* 0x005018 */
-        uint64_t        ce_cxm_credit_limit;                    /* 0x005020 */
-        uint64_t        ce_cxm_force_credit;                    /* 0x005028 */
-        uint64_t        ce_cxm_disable_bypass;                  /* 0x005030 */
-        uint64_t        ce_pad_005038[3];           /* 0x005038 -- 0x005048 */
-        uint64_t        ce_cxm_debug_mux;                       /* 0x005050 */
+        u64     ce_cxm_dyn_credit_status;               /* 0x005010 */
+        u64     ce_cxm_last_credit_status;              /* 0x005018 */
+        u64     ce_cxm_credit_limit;                    /* 0x005020 */
+        u64     ce_cxm_force_credit;                    /* 0x005028 */
+        u64     ce_cxm_disable_bypass;                  /* 0x005030 */
+        u64     ce_pad_005038[3];           /* 0x005038 -- 0x005048 */
+        u64     ce_cxm_debug_mux;                       /* 0x005050 */
 
-        uint64_t        ce_pad_005058[501];         /* 0x005058 -- 0x005FF8 */
+        u64        ce_pad_005058[501];         /* 0x005058 -- 0x005FF8 */
 
         /*
          * DTL: Downstream Transaction Layer Regs (Link#1 and Link#2)
@@ -258,209 +258,209 @@ typedef volatile struct tioce {
         #define ce_utl(link_num)        ce_dtl_utl[link_num-1]
         struct ce_dtl_utl_reg {
                 /* DTL */
-                uint64_t        ce_dtl_dtdr_credit_limit;       /* 0x00y000 */
-                uint64_t        ce_dtl_dtdr_credit_force;       /* 0x00y008 */
-                uint64_t        ce_dtl_dyn_credit_status;       /* 0x00y010 */
-                uint64_t        ce_dtl_dtl_last_credit_stat;    /* 0x00y018 */
-                uint64_t        ce_dtl_dtl_ctrl;                /* 0x00y020 */
-                uint64_t        ce_pad_00y028[5];   /* 0x00y028 -- 0x00y048 */
-                uint64_t        ce_dtl_debug_sel;               /* 0x00y050 */
-                uint64_t        ce_pad_00y058[501]; /* 0x00y058 -- 0x00yFF8 */
+                u64     ce_dtl_dtdr_credit_limit;       /* 0x00y000 */
+                u64     ce_dtl_dtdr_credit_force;       /* 0x00y008 */
+                u64     ce_dtl_dyn_credit_status;       /* 0x00y010 */
+                u64     ce_dtl_dtl_last_credit_stat;    /* 0x00y018 */
+                u64     ce_dtl_dtl_ctrl;                /* 0x00y020 */
+                u64     ce_pad_00y028[5];   /* 0x00y028 -- 0x00y048 */
+                u64     ce_dtl_debug_sel;               /* 0x00y050 */
+                u64     ce_pad_00y058[501]; /* 0x00y058 -- 0x00yFF8 */
 
                 /* UTL */
-                uint64_t        ce_utl_utl_ctrl;                /* 0x00z000 */
-                uint64_t        ce_utl_debug_sel;               /* 0x00z008 */
-                uint64_t        ce_pad_00z010[510]; /* 0x00z010 -- 0x00zFF8 */
+                u64     ce_utl_utl_ctrl;                /* 0x00z000 */
+                u64     ce_utl_debug_sel;               /* 0x00z008 */
+                u64     ce_pad_00z010[510]; /* 0x00z010 -- 0x00zFF8 */
         } ce_dtl_utl[2];
 
-        uint64_t        ce_pad_00A000[514];         /* 0x00A000 -- 0x00B008 */
+        u64     ce_pad_00A000[514];         /* 0x00A000 -- 0x00B008 */
 
         /*
          * URE: Upstream Request Engine
          */
-        uint64_t        ce_ure_dyn_credit_status;               /* 0x00B010 */
-        uint64_t        ce_ure_last_credit_status;              /* 0x00B018 */
-        uint64_t        ce_ure_credit_limit;                    /* 0x00B020 */
-        uint64_t        ce_pad_00B028;                          /* 0x00B028 */
-        uint64_t        ce_ure_control;                         /* 0x00B030 */
-        uint64_t        ce_ure_status;                          /* 0x00B038 */
-        uint64_t        ce_pad_00B040[2];           /* 0x00B040 -- 0x00B048 */
-        uint64_t        ce_ure_debug_sel;                       /* 0x00B050 */
-        uint64_t        ce_ure_pcie_debug_sel;                  /* 0x00B058 */
-        uint64_t        ce_ure_ssp_err_cmd_wrd;                 /* 0x00B060 */
-        uint64_t        ce_ure_ssp_err_addr;                    /* 0x00B068 */
-        uint64_t        ce_ure_page_map;                        /* 0x00B070 */
-        uint64_t        ce_ure_dir_map[TIOCE_NUM_PORTS];        /* 0x00B078 */
-        uint64_t        ce_ure_pipe_sel1;                       /* 0x00B088 */
-        uint64_t        ce_ure_pipe_mask1;                      /* 0x00B090 */
-        uint64_t        ce_ure_pipe_sel2;                       /* 0x00B098 */
-        uint64_t        ce_ure_pipe_mask2;                      /* 0x00B0A0 */
-        uint64_t        ce_ure_pcie1_credits_sent;              /* 0x00B0A8 */
-        uint64_t        ce_ure_pcie1_credits_used;              /* 0x00B0B0 */
-        uint64_t        ce_ure_pcie1_credit_limit;              /* 0x00B0B8 */
-        uint64_t        ce_ure_pcie2_credits_sent;              /* 0x00B0C0 */
-        uint64_t        ce_ure_pcie2_credits_used;              /* 0x00B0C8 */
-        uint64_t        ce_ure_pcie2_credit_limit;              /* 0x00B0D0 */
-        uint64_t        ce_ure_pcie_force_credit;               /* 0x00B0D8 */
-        uint64_t        ce_ure_rd_tnum_val;                     /* 0x00B0E0 */
-        uint64_t        ce_ure_rd_tnum_rsp_rcvd;                /* 0x00B0E8 */
-        uint64_t        ce_ure_rd_tnum_esent_timer;             /* 0x00B0F0 */
-        uint64_t        ce_ure_rd_tnum_error;                   /* 0x00B0F8 */
-        uint64_t        ce_ure_rd_tnum_first_cl;                /* 0x00B100 */
-        uint64_t        ce_ure_rd_tnum_link_buf;                /* 0x00B108 */
-        uint64_t        ce_ure_wr_tnum_val;                     /* 0x00B110 */
-        uint64_t        ce_ure_sram_err_addr0;                  /* 0x00B118 */
-        uint64_t        ce_ure_sram_err_addr1;                  /* 0x00B120 */
-        uint64_t        ce_ure_sram_err_addr2;                  /* 0x00B128 */
-        uint64_t        ce_ure_sram_rd_addr0;                   /* 0x00B130 */
-        uint64_t        ce_ure_sram_rd_addr1;                   /* 0x00B138 */
-        uint64_t        ce_ure_sram_rd_addr2;                   /* 0x00B140 */
-        uint64_t        ce_ure_sram_wr_addr0;                   /* 0x00B148 */
-        uint64_t        ce_ure_sram_wr_addr1;                   /* 0x00B150 */
-        uint64_t        ce_ure_sram_wr_addr2;                   /* 0x00B158 */
-        uint64_t        ce_ure_buf_flush10;                     /* 0x00B160 */
-        uint64_t        ce_ure_buf_flush11;                     /* 0x00B168 */
-        uint64_t        ce_ure_buf_flush12;                     /* 0x00B170 */
-        uint64_t        ce_ure_buf_flush13;                     /* 0x00B178 */
-        uint64_t        ce_ure_buf_flush20;                     /* 0x00B180 */
-        uint64_t        ce_ure_buf_flush21;                     /* 0x00B188 */
-        uint64_t        ce_ure_buf_flush22;                     /* 0x00B190 */
-        uint64_t        ce_ure_buf_flush23;                     /* 0x00B198 */
-        uint64_t        ce_ure_pcie_control1;                   /* 0x00B1A0 */
-        uint64_t        ce_ure_pcie_control2;                   /* 0x00B1A8 */
-
-        uint64_t        ce_pad_00B1B0[458];         /* 0x00B1B0 -- 0x00BFF8 */
+        u64     ce_ure_dyn_credit_status;               /* 0x00B010 */
+        u64     ce_ure_last_credit_status;              /* 0x00B018 */
+        u64     ce_ure_credit_limit;                    /* 0x00B020 */
+        u64     ce_pad_00B028;                          /* 0x00B028 */
+        u64     ce_ure_control;                         /* 0x00B030 */
+        u64     ce_ure_status;                          /* 0x00B038 */
+        u64     ce_pad_00B040[2];           /* 0x00B040 -- 0x00B048 */
+        u64     ce_ure_debug_sel;                       /* 0x00B050 */
+        u64     ce_ure_pcie_debug_sel;                  /* 0x00B058 */
+        u64     ce_ure_ssp_err_cmd_wrd;                 /* 0x00B060 */
+        u64     ce_ure_ssp_err_addr;                    /* 0x00B068 */
+        u64     ce_ure_page_map;                        /* 0x00B070 */
+        u64     ce_ure_dir_map[TIOCE_NUM_PORTS];        /* 0x00B078 */
+        u64     ce_ure_pipe_sel1;                       /* 0x00B088 */
+        u64     ce_ure_pipe_mask1;                      /* 0x00B090 */
+        u64     ce_ure_pipe_sel2;                       /* 0x00B098 */
+        u64     ce_ure_pipe_mask2;                      /* 0x00B0A0 */
+        u64     ce_ure_pcie1_credits_sent;              /* 0x00B0A8 */
+        u64     ce_ure_pcie1_credits_used;              /* 0x00B0B0 */
+        u64     ce_ure_pcie1_credit_limit;              /* 0x00B0B8 */
+        u64     ce_ure_pcie2_credits_sent;              /* 0x00B0C0 */
+        u64     ce_ure_pcie2_credits_used;              /* 0x00B0C8 */
+        u64     ce_ure_pcie2_credit_limit;              /* 0x00B0D0 */
+        u64     ce_ure_pcie_force_credit;               /* 0x00B0D8 */
+        u64     ce_ure_rd_tnum_val;                     /* 0x00B0E0 */
+        u64     ce_ure_rd_tnum_rsp_rcvd;                /* 0x00B0E8 */
+        u64     ce_ure_rd_tnum_esent_timer;             /* 0x00B0F0 */
+        u64     ce_ure_rd_tnum_error;                   /* 0x00B0F8 */
+        u64     ce_ure_rd_tnum_first_cl;                /* 0x00B100 */
+        u64     ce_ure_rd_tnum_link_buf;                /* 0x00B108 */
+        u64     ce_ure_wr_tnum_val;                     /* 0x00B110 */
+        u64     ce_ure_sram_err_addr0;                  /* 0x00B118 */
+        u64     ce_ure_sram_err_addr1;                  /* 0x00B120 */
+        u64     ce_ure_sram_err_addr2;                  /* 0x00B128 */
+        u64     ce_ure_sram_rd_addr0;                   /* 0x00B130 */
+        u64     ce_ure_sram_rd_addr1;                   /* 0x00B138 */
+        u64     ce_ure_sram_rd_addr2;                   /* 0x00B140 */
+        u64     ce_ure_sram_wr_addr0;                   /* 0x00B148 */
+        u64     ce_ure_sram_wr_addr1;                   /* 0x00B150 */
+        u64     ce_ure_sram_wr_addr2;                   /* 0x00B158 */
+        u64     ce_ure_buf_flush10;                     /* 0x00B160 */
+        u64     ce_ure_buf_flush11;                     /* 0x00B168 */
+        u64     ce_ure_buf_flush12;                     /* 0x00B170 */
+        u64     ce_ure_buf_flush13;                     /* 0x00B178 */
+        u64     ce_ure_buf_flush20;                     /* 0x00B180 */
+        u64     ce_ure_buf_flush21;                     /* 0x00B188 */
+        u64     ce_ure_buf_flush22;                     /* 0x00B190 */
+        u64     ce_ure_buf_flush23;                     /* 0x00B198 */
+        u64     ce_ure_pcie_control1;                   /* 0x00B1A0 */
+        u64     ce_ure_pcie_control2;                   /* 0x00B1A8 */
+
+        u64     ce_pad_00B1B0[458];         /* 0x00B1B0 -- 0x00BFF8 */
 
         /* Upstream Data Buffer, Port1 */
         struct ce_ure_maint_ups_dat1_data {
-                uint64_t        data63_0[512];      /* 0x00C000 -- 0x00CFF8 */
-                uint64_t        data127_64[512];    /* 0x00D000 -- 0x00DFF8 */
-                uint64_t        parity[512];        /* 0x00E000 -- 0x00EFF8 */
+                u64     data63_0[512];      /* 0x00C000 -- 0x00CFF8 */
+                u64     data127_64[512];    /* 0x00D000 -- 0x00DFF8 */
+                u64     parity[512];        /* 0x00E000 -- 0x00EFF8 */
         } ce_ure_maint_ups_dat1;
 
         /* Upstream Header Buffer, Port1 */
         struct ce_ure_maint_ups_hdr1_data {
-                uint64_t        data63_0[512];      /* 0x00F000 -- 0x00FFF8 */
-                uint64_t        data127_64[512];    /* 0x010000 -- 0x010FF8 */
-                uint64_t        parity[512];        /* 0x011000 -- 0x011FF8 */
+                u64     data63_0[512];      /* 0x00F000 -- 0x00FFF8 */
+                u64     data127_64[512];    /* 0x010000 -- 0x010FF8 */
+                u64     parity[512];        /* 0x011000 -- 0x011FF8 */
         } ce_ure_maint_ups_hdr1;
 
         /* Upstream Data Buffer, Port2 */
         struct ce_ure_maint_ups_dat2_data {
-                uint64_t        data63_0[512];      /* 0x012000 -- 0x012FF8 */
-                uint64_t        data127_64[512];    /* 0x013000 -- 0x013FF8 */
-                uint64_t        parity[512];        /* 0x014000 -- 0x014FF8 */
+                u64     data63_0[512];      /* 0x012000 -- 0x012FF8 */
+                u64     data127_64[512];    /* 0x013000 -- 0x013FF8 */
+                u64     parity[512];        /* 0x014000 -- 0x014FF8 */
         } ce_ure_maint_ups_dat2;
 
         /* Upstream Header Buffer, Port2 */
         struct ce_ure_maint_ups_hdr2_data {
-                uint64_t        data63_0[512];      /* 0x015000 -- 0x015FF8 */
-                uint64_t        data127_64[512];    /* 0x016000 -- 0x016FF8 */
-                uint64_t        parity[512];        /* 0x017000 -- 0x017FF8 */
+                u64     data63_0[512];      /* 0x015000 -- 0x015FF8 */
+                u64     data127_64[512];    /* 0x016000 -- 0x016FF8 */
+                u64     parity[512];        /* 0x017000 -- 0x017FF8 */
         } ce_ure_maint_ups_hdr2;
 
         /* Downstream Data Buffer */
         struct ce_ure_maint_dns_dat_data {
-                uint64_t        data63_0[512];      /* 0x018000 -- 0x018FF8 */
-                uint64_t        data127_64[512];    /* 0x019000 -- 0x019FF8 */
-                uint64_t        parity[512];        /* 0x01A000 -- 0x01AFF8 */
+                u64     data63_0[512];      /* 0x018000 -- 0x018FF8 */
+                u64     data127_64[512];    /* 0x019000 -- 0x019FF8 */
+                u64     parity[512];        /* 0x01A000 -- 0x01AFF8 */
         } ce_ure_maint_dns_dat;
 
         /* Downstream Header Buffer */
         struct  ce_ure_maint_dns_hdr_data {
-                uint64_t        data31_0[64];       /* 0x01B000 -- 0x01B1F8 */
-                uint64_t        data95_32[64];      /* 0x01B200 -- 0x01B3F8 */
-                uint64_t        parity[64];         /* 0x01B400 -- 0x01B5F8 */
+                u64     data31_0[64];       /* 0x01B000 -- 0x01B1F8 */
+                u64     data95_32[64];      /* 0x01B200 -- 0x01B3F8 */
+                u64     parity[64];         /* 0x01B400 -- 0x01B5F8 */
         } ce_ure_maint_dns_hdr;
 
         /* RCI Buffer Data */
         struct  ce_ure_maint_rci_data {
-                uint64_t        data41_0[64];       /* 0x01B600 -- 0x01B7F8 */
-                uint64_t        data69_42[64];      /* 0x01B800 -- 0x01B9F8 */
+                u64     data41_0[64];       /* 0x01B600 -- 0x01B7F8 */
+                u64     data69_42[64];      /* 0x01B800 -- 0x01B9F8 */
         } ce_ure_maint_rci;
 
         /* Response Queue */
-        uint64_t        ce_ure_maint_rspq[64];      /* 0x01BA00 -- 0x01BBF8 */
+        u64     ce_ure_maint_rspq[64];      /* 0x01BA00 -- 0x01BBF8 */
 
-        uint64_t        ce_pad_01C000[4224];        /* 0x01BC00 -- 0x023FF8 */
+        u64     ce_pad_01C000[4224];        /* 0x01BC00 -- 0x023FF8 */
 
         /* Admin Build-a-Packet Buffer */
         struct  ce_adm_maint_bap_buf_data {
-                uint64_t        data63_0[258];      /* 0x024000 -- 0x024808 */
-                uint64_t        data127_64[258];    /* 0x024810 -- 0x025018 */
-                uint64_t        parity[258];        /* 0x025020 -- 0x025828 */
+                u64     data63_0[258];      /* 0x024000 -- 0x024808 */
+                u64     data127_64[258];    /* 0x024810 -- 0x025018 */
+                u64     parity[258];        /* 0x025020 -- 0x025828 */
         } ce_adm_maint_bap_buf;
 
-        uint64_t        ce_pad_025830[5370];        /* 0x025830 -- 0x02FFF8 */
+        u64     ce_pad_025830[5370];        /* 0x025830 -- 0x02FFF8 */
 
         /* URE: 40bit PMU ATE Buffer */             /* 0x030000 -- 0x037FF8 */
-        uint64_t        ce_ure_ate40[TIOCE_NUM_M40_ATES];
+        u64     ce_ure_ate40[TIOCE_NUM_M40_ATES];
 
         /* URE: 32/40bit PMU ATE Buffer */          /* 0x038000 -- 0x03BFF8 */
-        uint64_t        ce_ure_ate3240[TIOCE_NUM_M3240_ATES];
+        u64     ce_ure_ate3240[TIOCE_NUM_M3240_ATES];
 
-        uint64_t        ce_pad_03C000[2050];        /* 0x03C000 -- 0x040008 */
+        u64     ce_pad_03C000[2050];        /* 0x03C000 -- 0x040008 */
 
         /*
          * DRE: Down Stream Request Engine
          */
-        uint64_t        ce_dre_dyn_credit_status1;              /* 0x040010 */
-        uint64_t        ce_dre_dyn_credit_status2;              /* 0x040018 */
-        uint64_t        ce_dre_last_credit_status1;             /* 0x040020 */
-        uint64_t        ce_dre_last_credit_status2;             /* 0x040028 */
-        uint64_t        ce_dre_credit_limit1;                   /* 0x040030 */
-        uint64_t        ce_dre_credit_limit2;                   /* 0x040038 */
-        uint64_t        ce_dre_force_credit1;                   /* 0x040040 */
-        uint64_t        ce_dre_force_credit2;                   /* 0x040048 */
-        uint64_t        ce_dre_debug_mux1;                      /* 0x040050 */
-        uint64_t        ce_dre_debug_mux2;                      /* 0x040058 */
-        uint64_t        ce_dre_ssp_err_cmd_wrd;                 /* 0x040060 */
-        uint64_t        ce_dre_ssp_err_addr;                    /* 0x040068 */
-        uint64_t        ce_dre_comp_err_cmd_wrd;                /* 0x040070 */
-        uint64_t        ce_dre_comp_err_addr;                   /* 0x040078 */
-        uint64_t        ce_dre_req_status;                      /* 0x040080 */
-        uint64_t        ce_dre_config1;                         /* 0x040088 */
-        uint64_t        ce_dre_config2;                         /* 0x040090 */
-        uint64_t        ce_dre_config_req_status;               /* 0x040098 */
-        uint64_t        ce_pad_0400A0[12];          /* 0x0400A0 -- 0x0400F8 */
-        uint64_t        ce_dre_dyn_fifo;                        /* 0x040100 */
-        uint64_t        ce_pad_040108[3];           /* 0x040108 -- 0x040118 */
-        uint64_t        ce_dre_last_fifo;                       /* 0x040120 */
-
-        uint64_t        ce_pad_040128[27];          /* 0x040128 -- 0x0401F8 */
+        u64     ce_dre_dyn_credit_status1;              /* 0x040010 */
+        u64     ce_dre_dyn_credit_status2;              /* 0x040018 */
+        u64     ce_dre_last_credit_status1;             /* 0x040020 */
+        u64     ce_dre_last_credit_status2;             /* 0x040028 */
+        u64     ce_dre_credit_limit1;                   /* 0x040030 */
+        u64     ce_dre_credit_limit2;                   /* 0x040038 */
+        u64     ce_dre_force_credit1;                   /* 0x040040 */
+        u64     ce_dre_force_credit2;                   /* 0x040048 */
+        u64     ce_dre_debug_mux1;                      /* 0x040050 */
+        u64     ce_dre_debug_mux2;                      /* 0x040058 */
+        u64     ce_dre_ssp_err_cmd_wrd;                 /* 0x040060 */
+        u64     ce_dre_ssp_err_addr;                    /* 0x040068 */
+        u64     ce_dre_comp_err_cmd_wrd;                /* 0x040070 */
+        u64     ce_dre_comp_err_addr;                   /* 0x040078 */
+        u64     ce_dre_req_status;                      /* 0x040080 */
+        u64     ce_dre_config1;                         /* 0x040088 */
+        u64     ce_dre_config2;                         /* 0x040090 */
+        u64     ce_dre_config_req_status;               /* 0x040098 */
+        u64     ce_pad_0400A0[12];          /* 0x0400A0 -- 0x0400F8 */
+        u64     ce_dre_dyn_fifo;                        /* 0x040100 */
+        u64     ce_pad_040108[3];           /* 0x040108 -- 0x040118 */
+        u64     ce_dre_last_fifo;                       /* 0x040120 */
+
+        u64     ce_pad_040128[27];          /* 0x040128 -- 0x0401F8 */
 
         /* DRE Downstream Head Queue */
         struct  ce_dre_maint_ds_head_queue {
-                uint64_t        data63_0[32];       /* 0x040200 -- 0x0402F8 */
-                uint64_t        data127_64[32];     /* 0x040300 -- 0x0403F8 */
-                uint64_t        parity[32];         /* 0x040400 -- 0x0404F8 */
+                u64     data63_0[32];       /* 0x040200 -- 0x0402F8 */
+                u64     data127_64[32];     /* 0x040300 -- 0x0403F8 */
+                u64     parity[32];         /* 0x040400 -- 0x0404F8 */
         } ce_dre_maint_ds_head_q;
 
-        uint64_t        ce_pad_040500[352];         /* 0x040500 -- 0x040FF8 */
+        u64     ce_pad_040500[352];         /* 0x040500 -- 0x040FF8 */
 
         /* DRE Downstream Data Queue */
         struct  ce_dre_maint_ds_data_queue {
-                uint64_t        data63_0[256];      /* 0x041000 -- 0x0417F8 */
-                uint64_t        ce_pad_041800[256]; /* 0x041800 -- 0x041FF8 */
-                uint64_t        data127_64[256];    /* 0x042000 -- 0x0427F8 */
-                uint64_t        ce_pad_042800[256]; /* 0x042800 -- 0x042FF8 */
-                uint64_t        parity[256];        /* 0x043000 -- 0x0437F8 */
-                uint64_t        ce_pad_043800[256]; /* 0x043800 -- 0x043FF8 */
+                u64     data63_0[256];      /* 0x041000 -- 0x0417F8 */
+                u64     ce_pad_041800[256]; /* 0x041800 -- 0x041FF8 */
+                u64     data127_64[256];    /* 0x042000 -- 0x0427F8 */
+                u64     ce_pad_042800[256]; /* 0x042800 -- 0x042FF8 */
+                u64     parity[256];        /* 0x043000 -- 0x0437F8 */
+                u64     ce_pad_043800[256]; /* 0x043800 -- 0x043FF8 */
         } ce_dre_maint_ds_data_q;
 
         /* DRE URE Upstream Response Queue */
         struct  ce_dre_maint_ure_us_rsp_queue {
-                uint64_t        data63_0[8];        /* 0x044000 -- 0x044038 */
-                uint64_t        ce_pad_044040[24];  /* 0x044040 -- 0x0440F8 */
-                uint64_t        data127_64[8];      /* 0x044100 -- 0x044138 */
-                uint64_t        ce_pad_044140[24];  /* 0x044140 -- 0x0441F8 */
-                uint64_t        parity[8];          /* 0x044200 -- 0x044238 */
-                uint64_t        ce_pad_044240[24];  /* 0x044240 -- 0x0442F8 */
+                u64     data63_0[8];        /* 0x044000 -- 0x044038 */
+                u64     ce_pad_044040[24];  /* 0x044040 -- 0x0440F8 */
+                u64     data127_64[8];      /* 0x044100 -- 0x044138 */
+                u64     ce_pad_044140[24];  /* 0x044140 -- 0x0441F8 */
+                u64     parity[8];          /* 0x044200 -- 0x044238 */
+                u64     ce_pad_044240[24];  /* 0x044240 -- 0x0442F8 */
         } ce_dre_maint_ure_us_rsp_q;
 
-        uint64_t        ce_dre_maint_us_wrt_rsp[32];/* 0x044300 -- 0x0443F8 */
+        u64     ce_dre_maint_us_wrt_rsp[32];/* 0x044300 -- 0x0443F8 */
 
-        uint64_t        ce_end_of_struct;                       /* 0x044400 */
+        u64     ce_end_of_struct;                       /* 0x044400 */
 } tioce_t;
 
 
@@ -625,11 +625,11 @@ typedef volatile struct tioce {
 #define CE_URE_BUS_MASK                 (0xFFULL << BUS_SRC_ID_SHFT)
 #define CE_URE_DEV_MASK                 (0x1FULL << DEV_SRC_ID_SHFT)
 #define CE_URE_FNC_MASK                 (0x07ULL << FNC_SRC_ID_SHFT)
-#define CE_URE_PIPE_BUS(b)              (((uint64_t)(b) << BUS_SRC_ID_SHFT) & \
+#define CE_URE_PIPE_BUS(b)              (((u64)(b) << BUS_SRC_ID_SHFT) & \
                                          CE_URE_BUS_MASK)
-#define CE_URE_PIPE_DEV(d)              (((uint64_t)(d) << DEV_SRC_ID_SHFT) & \
+#define CE_URE_PIPE_DEV(d)              (((u64)(d) << DEV_SRC_ID_SHFT) & \
                                          CE_URE_DEV_MASK)
-#define CE_URE_PIPE_FNC(f)              (((uint64_t)(f) << FNC_SRC_ID_SHFT) & \
+#define CE_URE_PIPE_FNC(f)              (((u64)(f) << FNC_SRC_ID_SHFT) & \
                                          CE_URE_FNC_MASK)
 
 #define CE_URE_SEL1_SHFT                0
@@ -660,9 +660,9 @@ typedef volatile struct tioce {
 #define CE_URE_PN1_MASK                 (0xFFULL << CE_URE_PN1_SHFT)
 #define CE_URE_PN2_SHFT                 24
 #define CE_URE_PN2_MASK                 (0xFFULL << CE_URE_PN2_SHFT)
-#define CE_URE_PN1_SET(n)               (((uint64_t)(n) << CE_URE_PN1_SHFT) & \
+#define CE_URE_PN1_SET(n)               (((u64)(n) << CE_URE_PN1_SHFT) & \
                                          CE_URE_PN1_MASK)
-#define CE_URE_PN2_SET(n)               (((uint64_t)(n) << CE_URE_PN2_SHFT) & \
+#define CE_URE_PN2_SET(n)               (((u64)(n) << CE_URE_PN2_SHFT) & \
                                          CE_URE_PN2_MASK)
 
 /* ce_ure_pcie_control2 register bit masks & shifts */
@@ -681,9 +681,9 @@ typedef volatile struct tioce {
 #define CE_URE_PSN1_MASK                (0x1FFFULL << CE_URE_PSN1_SHFT)
 #define CE_URE_PSN2_SHFT                32
 #define CE_URE_PSN2_MASK                (0x1FFFULL << CE_URE_PSN2_SHFT)
-#define CE_URE_PSN1_SET(n)              (((uint64_t)(n) << CE_URE_PSN1_SHFT) & \
+#define CE_URE_PSN1_SET(n)              (((u64)(n) << CE_URE_PSN1_SHFT) & \
                                          CE_URE_PSN1_MASK)
-#define CE_URE_PSN2_SET(n)              (((uint64_t)(n) << CE_URE_PSN2_SHFT) & \
+#define CE_URE_PSN2_SET(n)              (((u64)(n) << CE_URE_PSN2_SHFT) & \
                                          CE_URE_PSN2_MASK)
 
 /*
diff --git a/include/asm-ia64/sn/tioce_provider.h b/include/asm-ia64/sn/tioce_provider.h
index cb414908671d..6d62b13f7ae7 100644
--- a/include/asm-ia64/sn/tioce_provider.h
+++ b/include/asm-ia64/sn/tioce_provider.h
@@ -21,9 +21,9 @@
 struct tioce_common {
         struct pcibus_bussoft   ce_pcibus;      /* common pciio header */
 
-        uint32_t                ce_rev;
-        uint64_t                ce_kernel_private;
-        uint64_t                ce_prom_private;
+        u32             ce_rev;
+        u64             ce_kernel_private;
+        u64             ce_prom_private;
 };
 
 struct tioce_kernel {
@@ -31,31 +31,31 @@ struct tioce_kernel {
         spinlock_t              ce_lock;
         struct list_head        ce_dmamap_list;
 
-        uint64_t                ce_ate40_shadow[TIOCE_NUM_M40_ATES];
-        uint64_t                ce_ate3240_shadow[TIOCE_NUM_M3240_ATES];
-        uint32_t                ce_ate3240_pagesize;
+        u64             ce_ate40_shadow[TIOCE_NUM_M40_ATES];
+        u64             ce_ate3240_shadow[TIOCE_NUM_M3240_ATES];
+        u32             ce_ate3240_pagesize;
 
-        uint8_t                 ce_port1_secondary;
+        u8                      ce_port1_secondary;
 
         /* per-port resources */
         struct {
                 int             dirmap_refcnt;
-                uint64_t        dirmap_shadow;
+                u64     dirmap_shadow;
         } ce_port[TIOCE_NUM_PORTS];
 };
 
 struct tioce_dmamap {
         struct list_head        ce_dmamap_list; /* headed by tioce_kernel */
-        uint32_t                refcnt;
+        u32             refcnt;
 
-        uint64_t                nbytes;         /* # bytes mapped */
+        u64             nbytes;         /* # bytes mapped */
 
-        uint64_t                ct_start;       /* coretalk start address */
-        uint64_t                pci_start;      /* bus start address */
+        u64             ct_start;       /* coretalk start address */
+        u64             pci_start;      /* bus start address */
 
-        uint64_t                *ate_hw;        /* hw ptr of first ate in map */
-        uint64_t                *ate_shadow;    /* shadow ptr of firat ate */
-        uint16_t                ate_count;      /* # ate's in the map */
+        u64             *ate_hw;        /* hw ptr of first ate in map */
+        u64             *ate_shadow;    /* shadow ptr of firat ate */
+        u16             ate_count;      /* # ate's in the map */
 };
 
 extern int tioce_init_provider(void);
diff --git a/include/asm-ia64/sn/tiocp.h b/include/asm-ia64/sn/tiocp.h
index 5f2489c9d2dd..f47c08ab483c 100644
--- a/include/asm-ia64/sn/tiocp.h
+++ b/include/asm-ia64/sn/tiocp.h
@@ -21,189 +21,189 @@ struct tiocp{
     /* 0x000000-0x00FFFF -- Local Registers */
 
     /* 0x000000-0x000057 -- (Legacy Widget Space) Configuration */
-    uint64_t            cp_id;                          /* 0x000000 */
-    uint64_t            cp_stat;                        /* 0x000008 */
-    uint64_t            cp_err_upper;                   /* 0x000010 */
-    uint64_t            cp_err_lower;                   /* 0x000018 */
+    u64         cp_id;                          /* 0x000000 */
+    u64         cp_stat;                        /* 0x000008 */
+    u64         cp_err_upper;                   /* 0x000010 */
+    u64         cp_err_lower;                   /* 0x000018 */
     #define cp_err cp_err_lower
-    uint64_t            cp_control;                     /* 0x000020 */
-    uint64_t            cp_req_timeout;                 /* 0x000028 */
-    uint64_t            cp_intr_upper;                  /* 0x000030 */
-    uint64_t            cp_intr_lower;                  /* 0x000038 */
+    u64         cp_control;                     /* 0x000020 */
+    u64         cp_req_timeout;                 /* 0x000028 */
+    u64         cp_intr_upper;                  /* 0x000030 */
+    u64         cp_intr_lower;                  /* 0x000038 */
     #define cp_intr cp_intr_lower
-    uint64_t            cp_err_cmdword;                 /* 0x000040 */
-    uint64_t            _pad_000048;                    /* 0x000048 */
-    uint64_t            cp_tflush;                      /* 0x000050 */
+    u64         cp_err_cmdword;                 /* 0x000040 */
+    u64         _pad_000048;                    /* 0x000048 */
+    u64         cp_tflush;                      /* 0x000050 */
 
     /* 0x000058-0x00007F -- Bridge-specific Configuration */
-    uint64_t            cp_aux_err;                     /* 0x000058 */
-    uint64_t            cp_resp_upper;                  /* 0x000060 */
-    uint64_t            cp_resp_lower;                  /* 0x000068 */
+    u64         cp_aux_err;                     /* 0x000058 */
+    u64         cp_resp_upper;                  /* 0x000060 */
+    u64         cp_resp_lower;                  /* 0x000068 */
     #define cp_resp cp_resp_lower
-    uint64_t            cp_tst_pin_ctrl;                /* 0x000070 */
-    uint64_t            cp_addr_lkerr;                  /* 0x000078 */
+    u64         cp_tst_pin_ctrl;                /* 0x000070 */
+    u64         cp_addr_lkerr;                  /* 0x000078 */
 
     /* 0x000080-0x00008F -- PMU & MAP */
-    uint64_t            cp_dir_map;                     /* 0x000080 */
-    uint64_t            _pad_000088;                    /* 0x000088 */
+    u64         cp_dir_map;                     /* 0x000080 */
+    u64         _pad_000088;                    /* 0x000088 */
 
     /* 0x000090-0x00009F -- SSRAM */
-    uint64_t            cp_map_fault;                   /* 0x000090 */
-    uint64_t            _pad_000098;                    /* 0x000098 */
+    u64         cp_map_fault;                   /* 0x000090 */
+    u64         _pad_000098;                    /* 0x000098 */
 
     /* 0x0000A0-0x0000AF -- Arbitration */
-    uint64_t            cp_arb;                         /* 0x0000A0 */
-    uint64_t            _pad_0000A8;                    /* 0x0000A8 */
+    u64         cp_arb;                         /* 0x0000A0 */
+    u64         _pad_0000A8;                    /* 0x0000A8 */
 
     /* 0x0000B0-0x0000BF -- Number In A Can or ATE Parity Error */
-    uint64_t            cp_ate_parity_err;              /* 0x0000B0 */
-    uint64_t            _pad_0000B8;                    /* 0x0000B8 */
+    u64         cp_ate_parity_err;              /* 0x0000B0 */
+    u64         _pad_0000B8;                    /* 0x0000B8 */
 
     /* 0x0000C0-0x0000FF -- PCI/GIO */
-    uint64_t            cp_bus_timeout;                 /* 0x0000C0 */
-    uint64_t            cp_pci_cfg;                     /* 0x0000C8 */
-    uint64_t            cp_pci_err_upper;               /* 0x0000D0 */
-    uint64_t            cp_pci_err_lower;               /* 0x0000D8 */
+    u64         cp_bus_timeout;                 /* 0x0000C0 */
+    u64         cp_pci_cfg;                     /* 0x0000C8 */
+    u64         cp_pci_err_upper;               /* 0x0000D0 */
+    u64         cp_pci_err_lower;               /* 0x0000D8 */
     #define cp_pci_err cp_pci_err_lower
-    uint64_t            _pad_0000E0[4];                 /* 0x0000{E0..F8} */
+    u64         _pad_0000E0[4];                 /* 0x0000{E0..F8} */
 
     /* 0x000100-0x0001FF -- Interrupt */
-    uint64_t            cp_int_status;                  /* 0x000100 */
-    uint64_t            cp_int_enable;                  /* 0x000108 */
-    uint64_t            cp_int_rst_stat;                /* 0x000110 */
-    uint64_t            cp_int_mode;                    /* 0x000118 */
-    uint64_t            cp_int_device;                  /* 0x000120 */
-    uint64_t            cp_int_host_err;                /* 0x000128 */
-    uint64_t            cp_int_addr[8];                 /* 0x0001{30,,,68} */
-    uint64_t            cp_err_int_view;                /* 0x000170 */
-    uint64_t            cp_mult_int;                    /* 0x000178 */
-    uint64_t            cp_force_always[8];             /* 0x0001{80,,,B8} */
-    uint64_t            cp_force_pin[8];                /* 0x0001{C0,,,F8} */
+    u64         cp_int_status;                  /* 0x000100 */
+    u64         cp_int_enable;                  /* 0x000108 */
+    u64         cp_int_rst_stat;                /* 0x000110 */
+    u64         cp_int_mode;                    /* 0x000118 */
+    u64         cp_int_device;                  /* 0x000120 */
+    u64         cp_int_host_err;                /* 0x000128 */
+    u64         cp_int_addr[8];                 /* 0x0001{30,,,68} */
+    u64         cp_err_int_view;                /* 0x000170 */
+    u64         cp_mult_int;                    /* 0x000178 */
+    u64         cp_force_always[8];             /* 0x0001{80,,,B8} */
+    u64         cp_force_pin[8];                /* 0x0001{C0,,,F8} */
 
     /* 0x000200-0x000298 -- Device */
-    uint64_t            cp_device[4];                   /* 0x0002{00,,,18} */
-    uint64_t            _pad_000220[4];                 /* 0x0002{20,,,38} */
-    uint64_t            cp_wr_req_buf[4];               /* 0x0002{40,,,58} */
-    uint64_t            _pad_000260[4];                 /* 0x0002{60,,,78} */
-    uint64_t            cp_rrb_map[2];                  /* 0x0002{80,,,88} */
+    u64         cp_device[4];                   /* 0x0002{00,,,18} */
+    u64         _pad_000220[4];                 /* 0x0002{20,,,38} */
+    u64         cp_wr_req_buf[4];               /* 0x0002{40,,,58} */
+    u64         _pad_000260[4];                 /* 0x0002{60,,,78} */
+    u64         cp_rrb_map[2];                  /* 0x0002{80,,,88} */
     #define cp_even_resp cp_rrb_map[0]                  /* 0x000280 */
     #define cp_odd_resp  cp_rrb_map[1]                  /* 0x000288 */
-    uint64_t            cp_resp_status;                 /* 0x000290 */
-    uint64_t            cp_resp_clear;                  /* 0x000298 */
+    u64         cp_resp_status;                 /* 0x000290 */
+    u64         cp_resp_clear;                  /* 0x000298 */
 
-    uint64_t            _pad_0002A0[12];                /* 0x0002{A0..F8} */
+    u64         _pad_0002A0[12];                /* 0x0002{A0..F8} */
 
     /* 0x000300-0x0003F8 -- Buffer Address Match Registers */
     struct {
-        uint64_t        upper;                          /* 0x0003{00,,,F0} */
-        uint64_t        lower;                          /* 0x0003{08,,,F8} */
+        u64     upper;                          /* 0x0003{00,,,F0} */
+        u64     lower;                          /* 0x0003{08,,,F8} */
     } cp_buf_addr_match[16];
 
     /* 0x000400-0x0005FF -- Performance Monitor Registers (even only) */
     struct {
-        uint64_t        flush_w_touch;                  /* 0x000{400,,,5C0} */
-        uint64_t        flush_wo_touch;                 /* 0x000{408,,,5C8} */
-        uint64_t        inflight;                       /* 0x000{410,,,5D0} */
-        uint64_t        prefetch;                       /* 0x000{418,,,5D8} */
-        uint64_t        total_pci_retry;                /* 0x000{420,,,5E0} */
-        uint64_t        max_pci_retry;                  /* 0x000{428,,,5E8} */
-        uint64_t        max_latency;                    /* 0x000{430,,,5F0} */
-        uint64_t        clear_all;                      /* 0x000{438,,,5F8} */
+        u64     flush_w_touch;                  /* 0x000{400,,,5C0} */
+        u64     flush_wo_touch;                 /* 0x000{408,,,5C8} */
+        u64     inflight;                       /* 0x000{410,,,5D0} */
+        u64     prefetch;                       /* 0x000{418,,,5D8} */
+        u64     total_pci_retry;                /* 0x000{420,,,5E0} */
+        u64     max_pci_retry;                  /* 0x000{428,,,5E8} */
+        u64     max_latency;                    /* 0x000{430,,,5F0} */
+        u64     clear_all;                      /* 0x000{438,,,5F8} */
     } cp_buf_count[8];
 
 
     /* 0x000600-0x0009FF -- PCI/X registers */
-    uint64_t            cp_pcix_bus_err_addr;           /* 0x000600 */
-    uint64_t            cp_pcix_bus_err_attr;           /* 0x000608 */
-    uint64_t            cp_pcix_bus_err_data;           /* 0x000610 */
-    uint64_t            cp_pcix_pio_split_addr;         /* 0x000618 */
-    uint64_t            cp_pcix_pio_split_attr;         /* 0x000620 */
-    uint64_t            cp_pcix_dma_req_err_attr;       /* 0x000628 */
-    uint64_t            cp_pcix_dma_req_err_addr;       /* 0x000630 */
-    uint64_t            cp_pcix_timeout;                /* 0x000638 */
+    u64         cp_pcix_bus_err_addr;           /* 0x000600 */
+    u64         cp_pcix_bus_err_attr;           /* 0x000608 */
+    u64         cp_pcix_bus_err_data;           /* 0x000610 */
+    u64         cp_pcix_pio_split_addr;         /* 0x000618 */
+    u64         cp_pcix_pio_split_attr;         /* 0x000620 */
+    u64         cp_pcix_dma_req_err_attr;       /* 0x000628 */
+    u64         cp_pcix_dma_req_err_addr;       /* 0x000630 */
+    u64         cp_pcix_timeout;                /* 0x000638 */
 
-    uint64_t            _pad_000640[24];                /* 0x000{640,,,6F8} */
+    u64         _pad_000640[24];                /* 0x000{640,,,6F8} */
 
     /* 0x000700-0x000737 -- Debug Registers */
-    uint64_t            cp_ct_debug_ctl;                /* 0x000700 */
-    uint64_t            cp_br_debug_ctl;                /* 0x000708 */
-    uint64_t            cp_mux3_debug_ctl;              /* 0x000710 */
-    uint64_t            cp_mux4_debug_ctl;              /* 0x000718 */
-    uint64_t            cp_mux5_debug_ctl;              /* 0x000720 */
-    uint64_t            cp_mux6_debug_ctl;              /* 0x000728 */
-    uint64_t            cp_mux7_debug_ctl;              /* 0x000730 */
+    u64         cp_ct_debug_ctl;                /* 0x000700 */
+    u64         cp_br_debug_ctl;                /* 0x000708 */
+    u64         cp_mux3_debug_ctl;              /* 0x000710 */
+    u64         cp_mux4_debug_ctl;              /* 0x000718 */
+    u64         cp_mux5_debug_ctl;              /* 0x000720 */
+    u64         cp_mux6_debug_ctl;              /* 0x000728 */
+    u64         cp_mux7_debug_ctl;              /* 0x000730 */
 
-    uint64_t            _pad_000738[89];                /* 0x000{738,,,9F8} */
+    u64         _pad_000738[89];                /* 0x000{738,,,9F8} */
 
     /* 0x000A00-0x000BFF -- PCI/X Read&Write Buffer */
     struct {
-        uint64_t        cp_buf_addr;                    /* 0x000{A00,,,AF0} */
-        uint64_t        cp_buf_attr;                    /* 0X000{A08,,,AF8} */
+        u64     cp_buf_addr;                    /* 0x000{A00,,,AF0} */
+        u64     cp_buf_attr;                    /* 0X000{A08,,,AF8} */
     } cp_pcix_read_buf_64[16];
 
     struct {
-        uint64_t        cp_buf_addr;                    /* 0x000{B00,,,BE0} */
-        uint64_t        cp_buf_attr;                    /* 0x000{B08,,,BE8} */
-        uint64_t        cp_buf_valid;                   /* 0x000{B10,,,BF0} */
-        uint64_t        __pad1;                         /* 0x000{B18,,,BF8} */
+        u64     cp_buf_addr;                    /* 0x000{B00,,,BE0} */
+        u64     cp_buf_attr;                    /* 0x000{B08,,,BE8} */
+        u64     cp_buf_valid;                   /* 0x000{B10,,,BF0} */
+        u64     __pad1;                         /* 0x000{B18,,,BF8} */
     } cp_pcix_write_buf_64[8];
 
     /* End of Local Registers -- Start of Address Map space */
 
-    char                _pad_000c00[0x010000 - 0x000c00];
+    char        _pad_000c00[0x010000 - 0x000c00];
 
     /* 0x010000-0x011FF8 -- Internal ATE RAM (Auto Parity Generation) */
-    uint64_t            cp_int_ate_ram[1024];           /* 0x010000-0x011FF8 */
+    u64         cp_int_ate_ram[1024];           /* 0x010000-0x011FF8 */
 
-    char                _pad_012000[0x14000 - 0x012000];
+    char        _pad_012000[0x14000 - 0x012000];
 
     /* 0x014000-0x015FF8 -- Internal ATE RAM (Manual Parity Generation) */
-    uint64_t            cp_int_ate_ram_mp[1024];        /* 0x014000-0x015FF8 */
+    u64         cp_int_ate_ram_mp[1024];        /* 0x014000-0x015FF8 */
 
-    char                _pad_016000[0x18000 - 0x016000];
+    char        _pad_016000[0x18000 - 0x016000];
 
     /* 0x18000-0x197F8 -- TIOCP Write Request Ram */
-    uint64_t            cp_wr_req_lower[256];           /* 0x18000 - 0x187F8 */
-    uint64_t            cp_wr_req_upper[256];           /* 0x18800 - 0x18FF8 */
-    uint64_t            cp_wr_req_parity[256];          /* 0x19000 - 0x197F8 */
+    u64         cp_wr_req_lower[256];           /* 0x18000 - 0x187F8 */
+    u64         cp_wr_req_upper[256];           /* 0x18800 - 0x18FF8 */
+    u64         cp_wr_req_parity[256];          /* 0x19000 - 0x197F8 */
 
-    char                _pad_019800[0x1C000 - 0x019800];
+    char        _pad_019800[0x1C000 - 0x019800];
 
     /* 0x1C000-0x1EFF8 -- TIOCP Read Response Ram */
-    uint64_t            cp_rd_resp_lower[512];          /* 0x1C000 - 0x1CFF8 */
-    uint64_t            cp_rd_resp_upper[512];          /* 0x1D000 - 0x1DFF8 */
-    uint64_t            cp_rd_resp_parity[512];         /* 0x1E000 - 0x1EFF8 */
+    u64         cp_rd_resp_lower[512];          /* 0x1C000 - 0x1CFF8 */
+    u64         cp_rd_resp_upper[512];          /* 0x1D000 - 0x1DFF8 */
+    u64         cp_rd_resp_parity[512];         /* 0x1E000 - 0x1EFF8 */
 
-    char                _pad_01F000[0x20000 - 0x01F000];
+    char        _pad_01F000[0x20000 - 0x01F000];
 
     /* 0x020000-0x021FFF -- Host Device (CP) Configuration Space (not used)  */
-    char                _pad_020000[0x021000 - 0x20000];
+    char        _pad_020000[0x021000 - 0x20000];
 
     /* 0x021000-0x027FFF -- PCI Device Configuration Spaces */
     union {
-        uint8_t         c[0x1000 / 1];                  /* 0x02{0000,,,7FFF} */
-        uint16_t        s[0x1000 / 2];                  /* 0x02{0000,,,7FFF} */
-        uint32_t        l[0x1000 / 4];                  /* 0x02{0000,,,7FFF} */
-        uint64_t        d[0x1000 / 8];                  /* 0x02{0000,,,7FFF} */
+        u8      c[0x1000 / 1];                  /* 0x02{0000,,,7FFF} */
+        u16     s[0x1000 / 2];                  /* 0x02{0000,,,7FFF} */
+        u32     l[0x1000 / 4];                  /* 0x02{0000,,,7FFF} */
+        u64     d[0x1000 / 8];                  /* 0x02{0000,,,7FFF} */
         union {
-            uint8_t     c[0x100 / 1];
-            uint16_t    s[0x100 / 2];
-            uint32_t    l[0x100 / 4];
-            uint64_t    d[0x100 / 8];
+            u8  c[0x100 / 1];
+            u16 s[0x100 / 2];
+            u32 l[0x100 / 4];
+            u64 d[0x100 / 8];
         } f[8];
     } cp_type0_cfg_dev[7];                              /* 0x02{1000,,,7FFF} */
 
     /* 0x028000-0x028FFF -- PCI Type 1 Configuration Space */
     union {
-        uint8_t         c[0x1000 / 1];                  /* 0x028000-0x029000 */
-        uint16_t        s[0x1000 / 2];                  /* 0x028000-0x029000 */
-        uint32_t        l[0x1000 / 4];                  /* 0x028000-0x029000 */
-        uint64_t        d[0x1000 / 8];                  /* 0x028000-0x029000 */
+        u8      c[0x1000 / 1];                  /* 0x028000-0x029000 */
+        u16     s[0x1000 / 2];                  /* 0x028000-0x029000 */
+        u32     l[0x1000 / 4];                  /* 0x028000-0x029000 */
+        u64     d[0x1000 / 8];                  /* 0x028000-0x029000 */
         union {
-            uint8_t     c[0x100 / 1];
-            uint16_t    s[0x100 / 2];
-            uint32_t    l[0x100 / 4];
-            uint64_t    d[0x100 / 8];
+            u8  c[0x100 / 1];
+            u16 s[0x100 / 2];
+            u32 l[0x100 / 4];
+            u64 d[0x100 / 8];
         } f[8];
     } cp_type1_cfg;                                     /* 0x028000-0x029000 */
 
@@ -211,30 +211,30 @@ struct tiocp{
 
     /* 0x030000-0x030007 -- PCI Interrupt Acknowledge Cycle */
     union {
-        uint8_t         c[8 / 1];
-        uint16_t        s[8 / 2];
-        uint32_t        l[8 / 4];
-        uint64_t        d[8 / 8];
+        u8      c[8 / 1];
+        u16     s[8 / 2];
+        u32     l[8 / 4];
+        u64     d[8 / 8];
     } cp_pci_iack;                                      /* 0x030000-0x030007 */
 
     char                _pad_030007[0x040000-0x030008];
 
     /* 0x040000-0x040007 -- PCIX Special Cycle */
     union {
-        uint8_t         c[8 / 1];
-        uint16_t        s[8 / 2];
-        uint32_t        l[8 / 4];
-        uint64_t        d[8 / 8];
+        u8      c[8 / 1];
+        u16     s[8 / 2];
+        u32     l[8 / 4];
+        u64     d[8 / 8];
     } cp_pcix_cycle;                                    /* 0x040000-0x040007 */
 
     char                _pad_040007[0x200000-0x040008];
 
     /* 0x200000-0x7FFFFF -- PCI/GIO Device Spaces */
     union {
-        uint8_t         c[0x100000 / 1];
-        uint16_t        s[0x100000 / 2];
-        uint32_t        l[0x100000 / 4];
-        uint64_t        d[0x100000 / 8];
+        u8      c[0x100000 / 1];
+        u16     s[0x100000 / 2];
+        u32     l[0x100000 / 4];
+        u64     d[0x100000 / 8];
     } cp_devio_raw[6];                                  /* 0x200000-0x7FFFFF */
 
     #define cp_devio(n)  cp_devio_raw[((n)<2)?(n*2):(n+2)]
@@ -243,10 +243,10 @@ struct tiocp{
 
     /* 0xA00000-0xBFFFFF -- PCI/GIO Device Spaces w/flush  */
     union {
-        uint8_t         c[0x100000 / 1];
-        uint16_t        s[0x100000 / 2];
-        uint32_t        l[0x100000 / 4];
-        uint64_t        d[0x100000 / 8];
+        u8      c[0x100000 / 1];
+        u16     s[0x100000 / 2];
+        u32     l[0x100000 / 4];
+        u64     d[0x100000 / 8];
     } cp_devio_raw_flush[6];                            /* 0xA00000-0xBFFFFF */
 
     #define cp_devio_flush(n)  cp_devio_raw_flush[((n)<2)?(n*2):(n+2)]
diff --git a/include/asm-ia64/sn/tiocx.h b/include/asm-ia64/sn/tiocx.h
index 5699e75e5024..d29728492f36 100644
--- a/include/asm-ia64/sn/tiocx.h
+++ b/include/asm-ia64/sn/tiocx.h
@@ -40,10 +40,10 @@ struct cx_drv {
 };
 
 /* create DMA address by stripping AS bits */
-#define TIOCX_DMA_ADDR(a) (uint64_t)((uint64_t)(a) & 0xffffcfffffffffUL)
+#define TIOCX_DMA_ADDR(a) (u64)((u64)(a) & 0xffffcfffffffffUL)
 
-#define TIOCX_TO_TIOCX_DMA_ADDR(a) (uint64_t)(((uint64_t)(a) & 0xfffffffff) |  \
-                                  ((((uint64_t)(a)) & 0xffffc000000000UL) <<2))
+#define TIOCX_TO_TIOCX_DMA_ADDR(a) (u64)(((u64)(a) & 0xfffffffff) |  \
+                                  ((((u64)(a)) & 0xffffc000000000UL) <<2))
 
 #define TIO_CE_ASIC_PARTNUM 0xce00
 #define TIOCX_CORELET 3
@@ -63,10 +63,10 @@ extern int cx_device_unregister(struct cx_dev *);
 extern int cx_device_register(nasid_t, int, int, struct hubdev_info *, int);
 extern int cx_driver_unregister(struct cx_drv *);
 extern int cx_driver_register(struct cx_drv *);
-extern uint64_t tiocx_dma_addr(uint64_t addr);
-extern uint64_t tiocx_swin_base(int nasid);
-extern void tiocx_mmr_store(int nasid, uint64_t offset, uint64_t value);
-extern uint64_t tiocx_mmr_load(int nasid, uint64_t offset);
+extern u64 tiocx_dma_addr(u64 addr);
+extern u64 tiocx_swin_base(int nasid);
+extern void tiocx_mmr_store(int nasid, u64 offset, u64 value);
+extern u64 tiocx_mmr_load(int nasid, u64 offset);
 
 #endif                          //  __KERNEL__
 #endif                          // _ASM_IA64_SN_TIO_TIOCX__
diff --git a/include/asm-sh/bus-sh.h b/include/asm-sh/bus-sh.h
index 83c5d2fd057f..e42d63b65cb5 100644
--- a/include/asm-sh/bus-sh.h
+++ b/include/asm-sh/bus-sh.h
@@ -21,6 +21,7 @@ struct sh_dev {
         void            *mapbase;
         unsigned int    irq[6];
         u64             *dma_mask;
+        u64             coherent_dma_mask;
 };
 
 #define to_sh_dev(d)    container_of((d), struct sh_dev, dev)
diff --git a/include/asm-sh/clock.h b/include/asm-sh/clock.h
new file mode 100644
index 000000000000..fdfb75b30f0d
--- /dev/null
+++ b/include/asm-sh/clock.h
@@ -0,0 +1,61 @@
+#ifndef __ASM_SH_CLOCK_H
+#define __ASM_SH_CLOCK_H
+
+#include <linux/kref.h>
+#include <linux/list.h>
+#include <linux/seq_file.h>
+
+struct clk;
+
+struct clk_ops {
+        void (*init)(struct clk *clk);
+        void (*enable)(struct clk *clk);
+        void (*disable)(struct clk *clk);
+        void (*recalc)(struct clk *clk);
+        int (*set_rate)(struct clk *clk, unsigned long rate);
+};
+
+struct clk {
+        struct list_head        node;
+        const char              *name;
+
+        struct module           *owner;
+
+        struct clk              *parent;
+        struct clk_ops          *ops;
+
+        struct kref             kref;
+
+        unsigned long           rate;
+        unsigned long           flags;
+};
+
+#define CLK_ALWAYS_ENABLED      (1 << 0)
+#define CLK_RATE_PROPAGATES     (1 << 1)
+
+/* Should be defined by processor-specific code */
+void arch_init_clk_ops(struct clk_ops **, int type);
+
+/* arch/sh/kernel/cpu/clock.c */
+int clk_init(void);
+
+int __clk_enable(struct clk *);
+int clk_enable(struct clk *);
+
+void __clk_disable(struct clk *);
+void clk_disable(struct clk *);
+
+int clk_set_rate(struct clk *, unsigned long rate);
+unsigned long clk_get_rate(struct clk *);
+void clk_recalc_rate(struct clk *);
+
+struct clk *clk_get(const char *id);
+void clk_put(struct clk *);
+
+int clk_register(struct clk *);
+void clk_unregister(struct clk *);
+
+int show_clocks(struct seq_file *m);
+
+#endif /* __ASM_SH_CLOCK_H */
+
diff --git a/include/asm-sh/cpu-sh3/dma.h b/include/asm-sh/cpu-sh3/dma.h
index b972e715f9ee..954801b46022 100644
--- a/include/asm-sh/cpu-sh3/dma.h
+++ b/include/asm-sh/cpu-sh3/dma.h
@@ -3,5 +3,34 @@
 
 #define SH_DMAC_BASE    0xa4000020
 
-#endif /* __ASM_CPU_SH3_DMA_H */
+/* Definitions for the SuperH DMAC */
+#define TM_BURST        0x00000020
+#define TS_8            0x00000000
+#define TS_16           0x00000008
+#define TS_32           0x00000010
+#define TS_128          0x00000018
+
+#define CHCR_TS_MASK    0x18
+#define CHCR_TS_SHIFT   3
+
+#define DMAOR_INIT      DMAOR_DME
 
+/*
+ * The SuperH DMAC supports a number of transmit sizes, we list them here,
+ * with their respective values as they appear in the CHCR registers.
+ */
+enum {
+        XMIT_SZ_8BIT,
+        XMIT_SZ_16BIT,
+        XMIT_SZ_32BIT,
+        XMIT_SZ_128BIT,
+};
+
+static unsigned int ts_shift[] __attribute__ ((used)) = {
+        [XMIT_SZ_8BIT]          = 0,
+        [XMIT_SZ_16BIT]         = 1,
+        [XMIT_SZ_32BIT]         = 2,
+        [XMIT_SZ_128BIT]        = 4,
+};
+
+#endif /* __ASM_CPU_SH3_DMA_H */
diff --git a/include/asm-sh/cpu-sh4/dma.h b/include/asm-sh/cpu-sh4/dma.h
index e2b91adf821a..0dfe61f14802 100644
--- a/include/asm-sh/cpu-sh4/dma.h
+++ b/include/asm-sh/cpu-sh4/dma.h
@@ -1,17 +1,49 @@
 #ifndef __ASM_CPU_SH4_DMA_H
 #define __ASM_CPU_SH4_DMA_H
 
+#ifdef CONFIG_CPU_SH4A
+#define SH_DMAC_BASE    0xfc808020
+#else
 #define SH_DMAC_BASE    0xffa00000
+#endif
 
-#define SAR     ((unsigned long[]){SH_DMAC_BASE + 0x00, SH_DMAC_BASE + 0x10, \
-                                   SH_DMAC_BASE + 0x20, SH_DMAC_BASE + 0x30})
-#define DAR     ((unsigned long[]){SH_DMAC_BASE + 0x04, SH_DMAC_BASE + 0x14, \
-                                   SH_DMAC_BASE + 0x24, SH_DMAC_BASE + 0x34})
-#define DMATCR  ((unsigned long[]){SH_DMAC_BASE + 0x08, SH_DMAC_BASE + 0x18, \
-                                   SH_DMAC_BASE + 0x28, SH_DMAC_BASE + 0x38})
-#define CHCR    ((unsigned long[]){SH_DMAC_BASE + 0x0c, SH_DMAC_BASE + 0x1c, \
-                                   SH_DMAC_BASE + 0x2c, SH_DMAC_BASE + 0x3c})
-#define DMAOR   (SH_DMAC_BASE + 0x40)
+/* Definitions for the SuperH DMAC */
+#define TM_BURST        0x0000080
+#define TS_8            0x00000010
+#define TS_16           0x00000020
+#define TS_32           0x00000030
+#define TS_64           0x00000000
 
-#endif /* __ASM_CPU_SH4_DMA_H */
+#define CHCR_TS_MASK    0x30
+#define CHCR_TS_SHIFT   4
+
+#define DMAOR_COD       0x00000008
+
+#define DMAOR_INIT      ( 0x8000 | DMAOR_DME )
 
+/*
+ * The SuperH DMAC supports a number of transmit sizes, we list them here,
+ * with their respective values as they appear in the CHCR registers.
+ *
+ * Defaults to a 64-bit transfer size.
+ */
+enum {
+        XMIT_SZ_64BIT,
+        XMIT_SZ_8BIT,
+        XMIT_SZ_16BIT,
+        XMIT_SZ_32BIT,
+        XMIT_SZ_256BIT,
+};
+
+/*
+ * The DMA count is defined as the number of bytes to transfer.
+ */
+static unsigned int ts_shift[] __attribute__ ((used)) = {
+        [XMIT_SZ_64BIT]         = 3,
+        [XMIT_SZ_8BIT]          = 0,
+        [XMIT_SZ_16BIT]         = 1,
+        [XMIT_SZ_32BIT]         = 2,
+        [XMIT_SZ_256BIT]        = 5,
+};
+
+#endif /* __ASM_CPU_SH4_DMA_H */
diff --git a/include/asm-sh/cpu-sh4/freq.h b/include/asm-sh/cpu-sh4/freq.h
index 201d94fd214f..ef2b9b1ae41f 100644
--- a/include/asm-sh/cpu-sh4/freq.h
+++ b/include/asm-sh/cpu-sh4/freq.h
@@ -12,6 +12,8 @@
 
 #if defined(CONFIG_CPU_SUBTYPE_SH73180)
 #define FRQCR                   0xa4150000
+#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
+#define FRQCR                   0xffc80000
 #else
 #define FRQCR                   0xffc00000
 #endif
diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h
index d3fa5c2b889d..48f1f42c5d14 100644
--- a/include/asm-sh/dma-mapping.h
+++ b/include/asm-sh/dma-mapping.h
@@ -4,6 +4,7 @@
 #include <linux/config.h>
 #include <linux/mm.h>
 #include <asm/scatterlist.h>
+#include <asm/cacheflush.h>
 #include <asm/io.h>
 
 extern struct bus_type pci_bus_type;
@@ -141,24 +142,24 @@ static inline void dma_sync_sg(struct device *dev, struct scatterlist *sg,
         }
 }
 
-static inline void dma_sync_single_for_cpu(struct device *dev,
-                                           dma_addr_t dma_handle, size_t size,
-                                           enum dma_data_direction dir)
+static void dma_sync_single_for_cpu(struct device *dev,
+                                    dma_addr_t dma_handle, size_t size,
+                                    enum dma_data_direction dir)
         __attribute__ ((alias("dma_sync_single")));
 
-static inline void dma_sync_single_for_device(struct device *dev,
-                                           dma_addr_t dma_handle, size_t size,
-                                           enum dma_data_direction dir)
+static void dma_sync_single_for_device(struct device *dev,
+                                       dma_addr_t dma_handle, size_t size,
+                                       enum dma_data_direction dir)
         __attribute__ ((alias("dma_sync_single")));
 
-static inline void dma_sync_sg_for_cpu(struct device *dev,
-                                       struct scatterlist *sg, int nelems,
-                                       enum dma_data_direction dir)
+static void dma_sync_sg_for_cpu(struct device *dev,
+                                struct scatterlist *sg, int nelems,
+                                enum dma_data_direction dir)
         __attribute__ ((alias("dma_sync_sg")));
 
-static inline void dma_sync_sg_for_device(struct device *dev,
-                                       struct scatterlist *sg, int nelems,
-                                       enum dma_data_direction dir)
+static void dma_sync_sg_for_device(struct device *dev,
+                                   struct scatterlist *sg, int nelems,
+                                   enum dma_data_direction dir)
         __attribute__ ((alias("dma_sync_sg")));
 
 static inline int dma_get_cache_alignment(void)
diff --git a/include/asm-sh/dma.h b/include/asm-sh/dma.h
index 8e9436093ca8..a118a0d43053 100644
--- a/include/asm-sh/dma.h
+++ b/include/asm-sh/dma.h
@@ -15,6 +15,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/sysdev.h>
+#include <linux/device.h>
 #include <asm/cpu/dma.h>
 #include <asm/semaphore.h>
 
@@ -54,8 +55,8 @@ enum {
  * DMA channel capabilities / flags
  */
 enum {
-        DMA_CONFIGURED                  = 0x00,
         DMA_TEI_CAPABLE                 = 0x01,
+        DMA_CONFIGURED                  = 0x02,
 };
 
 extern spinlock_t dma_spin_lock;
@@ -74,7 +75,8 @@ struct dma_ops {
 struct dma_channel {
         char dev_id[16];
 
-        unsigned int chan;
+        unsigned int chan;              /* Physical channel number */
+        unsigned int vchan;             /* Virtual channel number */
         unsigned int mode;
         unsigned int count;
 
@@ -91,6 +93,8 @@ struct dma_channel {
 };
 
 struct dma_info {
+        struct platform_device *pdev;
+
         const char *name;
         unsigned int nr_channels;
         unsigned long flags;
@@ -130,7 +134,11 @@ extern void unregister_dmac(struct dma_info *info);
 
 #ifdef CONFIG_SYSFS
 /* arch/sh/drivers/dma/dma-sysfs.c */
-extern int dma_create_sysfs_files(struct dma_channel *);
+extern int dma_create_sysfs_files(struct dma_channel *, struct dma_info *);
+extern void dma_remove_sysfs_files(struct dma_channel *, struct dma_info *);
+#else
+#define dma_create_sysfs_file(channel, info)            do { } while (0)
+#define dma_remove_sysfs_file(channel, info)            do { } while (0)
 #endif
 
 #ifdef CONFIG_PCI
diff --git a/include/asm-sh/freq.h b/include/asm-sh/freq.h
index 2c0fde46a0ed..39c0e091cf58 100644
--- a/include/asm-sh/freq.h
+++ b/include/asm-sh/freq.h
@@ -14,16 +14,5 @@
 
 #include <asm/cpu/freq.h>
 
-/* arch/sh/kernel/time.c */
-extern void get_current_frequency_divisors(unsigned int *ifc, unsigned int *pfc, unsigned int *bfc);
-
-extern unsigned int get_ifc_divisor(unsigned int value);
-extern unsigned int get_ifc_divisor(unsigned int value);
-extern unsigned int get_ifc_divisor(unsigned int value);
-
-extern unsigned int get_ifc_value(unsigned int divisor);
-extern unsigned int get_pfc_value(unsigned int divisor);
-extern unsigned int get_bfc_value(unsigned int divisor);
-
 #endif /* __KERNEL__ */
 #endif /* __ASM_SH_FREQ_H */
diff --git a/include/asm-sh/io.h b/include/asm-sh/io.h
index 6bc343fee7a0..b0b2937b6f83 100644
--- a/include/asm-sh/io.h
+++ b/include/asm-sh/io.h
@@ -11,7 +11,7 @@
  * For read{b,w,l} and write{b,w,l} there are also __raw versions, which
  * do not have a memory barrier after them.
  *
- * In addition, we have 
+ * In addition, we have
  *   ctrl_in{b,w,l}/ctrl_out{b,w,l} for SuperH specific I/O.
  *   which are processor specific.
  */
@@ -23,19 +23,27 @@
  *  inb   by default expands to _inb, but the machine specific code may
  *        define it to __inb if it chooses.
  */
-
+#include <linux/config.h>
 #include <asm/cache.h>
 #include <asm/system.h>
 #include <asm/addrspace.h>
 #include <asm/machvec.h>
-#include <linux/config.h>
+#include <asm/pgtable.h>
+#include <asm-generic/iomap.h>
+
+#ifdef __KERNEL__
 
 /*
  * Depending on which platform we are running on, we need different
  * I/O functions.
  */
+#define __IO_PREFIX     generic
+#include <asm/io_generic.h>
+
+#define maybebadio(port) \
+  printk(KERN_ERR "bad PC-like io %s:%u for port 0x%lx at 0x%08x\n", \
+         __FUNCTION__, __LINE__, (port), (u32)__builtin_return_address(0))
 
-#ifdef __KERNEL__
 /*
  * Since boards are able to define their own set of I/O routines through
  * their respective machine vector, we always wrap through the mv.
@@ -44,113 +52,120 @@
  * a given routine, it will be wrapped to generic code at run-time.
  */
 
-# define __inb(p)       sh_mv.mv_inb((p))
-# define __inw(p)       sh_mv.mv_inw((p))
-# define __inl(p)       sh_mv.mv_inl((p))
-# define __outb(x,p)    sh_mv.mv_outb((x),(p))
-# define __outw(x,p)    sh_mv.mv_outw((x),(p))
-# define __outl(x,p)    sh_mv.mv_outl((x),(p))
-
-# define __inb_p(p)     sh_mv.mv_inb_p((p))
-# define __inw_p(p)     sh_mv.mv_inw_p((p))
-# define __inl_p(p)     sh_mv.mv_inl_p((p))
-# define __outb_p(x,p)  sh_mv.mv_outb_p((x),(p))
-# define __outw_p(x,p)  sh_mv.mv_outw_p((x),(p))
-# define __outl_p(x,p)  sh_mv.mv_outl_p((x),(p))
-
-# define __insb(p,b,c)  sh_mv.mv_insb((p), (b), (c))
-# define __insw(p,b,c)  sh_mv.mv_insw((p), (b), (c))
-# define __insl(p,b,c)  sh_mv.mv_insl((p), (b), (c))
-# define __outsb(p,b,c) sh_mv.mv_outsb((p), (b), (c))
-# define __outsw(p,b,c) sh_mv.mv_outsw((p), (b), (c))
-# define __outsl(p,b,c) sh_mv.mv_outsl((p), (b), (c))
-
-# define __readb(a)     sh_mv.mv_readb((a))
-# define __readw(a)     sh_mv.mv_readw((a))
-# define __readl(a)     sh_mv.mv_readl((a))
-# define __writeb(v,a)  sh_mv.mv_writeb((v),(a))
-# define __writew(v,a)  sh_mv.mv_writew((v),(a))
-# define __writel(v,a)  sh_mv.mv_writel((v),(a))
-
-# define __ioremap(a,s) sh_mv.mv_ioremap((a), (s))
-# define __iounmap(a)   sh_mv.mv_iounmap((a))
-
-# define __isa_port2addr(a)     sh_mv.mv_isa_port2addr(a)
-
-# define inb            __inb
-# define inw            __inw
-# define inl            __inl
-# define outb           __outb
-# define outw           __outw
-# define outl           __outl
-
-# define inb_p          __inb_p
-# define inw_p          __inw_p
-# define inl_p          __inl_p
-# define outb_p         __outb_p
-# define outw_p         __outw_p
-# define outl_p         __outl_p
-
-# define insb           __insb
-# define insw           __insw
-# define insl           __insl
-# define outsb          __outsb
-# define outsw          __outsw
-# define outsl          __outsl
-
-# define __raw_readb    __readb
-# define __raw_readw    __readw
-# define __raw_readl    __readl
-# define __raw_writeb   __writeb
-# define __raw_writew   __writew
-# define __raw_writel   __writel
+#define __inb(p)        sh_mv.mv_inb((p))
+#define __inw(p)        sh_mv.mv_inw((p))
+#define __inl(p)        sh_mv.mv_inl((p))
+#define __outb(x,p)     sh_mv.mv_outb((x),(p))
+#define __outw(x,p)     sh_mv.mv_outw((x),(p))
+#define __outl(x,p)     sh_mv.mv_outl((x),(p))
+
+#define __inb_p(p)      sh_mv.mv_inb_p((p))
+#define __inw_p(p)      sh_mv.mv_inw_p((p))
+#define __inl_p(p)      sh_mv.mv_inl_p((p))
+#define __outb_p(x,p)   sh_mv.mv_outb_p((x),(p))
+#define __outw_p(x,p)   sh_mv.mv_outw_p((x),(p))
+#define __outl_p(x,p)   sh_mv.mv_outl_p((x),(p))
+
+#define __insb(p,b,c)   sh_mv.mv_insb((p), (b), (c))
+#define __insw(p,b,c)   sh_mv.mv_insw((p), (b), (c))
+#define __insl(p,b,c)   sh_mv.mv_insl((p), (b), (c))
+#define __outsb(p,b,c)  sh_mv.mv_outsb((p), (b), (c))
+#define __outsw(p,b,c)  sh_mv.mv_outsw((p), (b), (c))
+#define __outsl(p,b,c)  sh_mv.mv_outsl((p), (b), (c))
+
+#define __readb(a)      sh_mv.mv_readb((a))
+#define __readw(a)      sh_mv.mv_readw((a))
+#define __readl(a)      sh_mv.mv_readl((a))
+#define __writeb(v,a)   sh_mv.mv_writeb((v),(a))
+#define __writew(v,a)   sh_mv.mv_writew((v),(a))
+#define __writel(v,a)   sh_mv.mv_writel((v),(a))
+
+#define inb             __inb
+#define inw             __inw
+#define inl             __inl
+#define outb            __outb
+#define outw            __outw
+#define outl            __outl
+
+#define inb_p           __inb_p
+#define inw_p           __inw_p
+#define inl_p           __inl_p
+#define outb_p          __outb_p
+#define outw_p          __outw_p
+#define outl_p          __outl_p
+
+#define insb            __insb
+#define insw            __insw
+#define insl            __insl
+#define outsb           __outsb
+#define outsw           __outsw
+#define outsl           __outsl
+
+#define __raw_readb(a)          __readb((void __iomem *)(a))
+#define __raw_readw(a)          __readw((void __iomem *)(a))
+#define __raw_readl(a)          __readl((void __iomem *)(a))
+#define __raw_writeb(v, a)      __writeb(v, (void __iomem *)(a))
+#define __raw_writew(v, a)      __writew(v, (void __iomem *)(a))
+#define __raw_writel(v, a)      __writel(v, (void __iomem *)(a))
 
 /*
  * The platform header files may define some of these macros to use
  * the inlined versions where appropriate.  These macros may also be
  * redefined by userlevel programs.
  */
-#ifdef __raw_readb
-# define readb(a)       ({ unsigned long r_ = __raw_readb((unsigned long)a); mb(); r_; })
+#ifdef __readb
+# define readb(a)       ({ unsigned long r_ = __raw_readb(a); mb(); r_; })
 #endif
 #ifdef __raw_readw
-# define readw(a)       ({ unsigned long r_ = __raw_readw((unsigned long)a); mb(); r_; })
+# define readw(a)       ({ unsigned long r_ = __raw_readw(a); mb(); r_; })
 #endif
 #ifdef __raw_readl
-# define readl(a)       ({ unsigned long r_ = __raw_readl((unsigned long)a); mb(); r_; })
+# define readl(a)       ({ unsigned long r_ = __raw_readl(a); mb(); r_; })
 #endif
 
 #ifdef __raw_writeb
-# define writeb(v,a)    ({ __raw_writeb((v),(unsigned long)(a)); mb(); })
+# define writeb(v,a)    ({ __raw_writeb((v),(a)); mb(); })
 #endif
 #ifdef __raw_writew
-# define writew(v,a)    ({ __raw_writew((v),(unsigned long)(a)); mb(); })
+# define writew(v,a)    ({ __raw_writew((v),(a)); mb(); })
 #endif
 #ifdef __raw_writel
-# define writel(v,a)    ({ __raw_writel((v),(unsigned long)(a)); mb(); })
+# define writel(v,a)    ({ __raw_writel((v),(a)); mb(); })
 #endif
 
 #define readb_relaxed(a) readb(a)
 #define readw_relaxed(a) readw(a)
 #define readl_relaxed(a) readl(a)
 
-#define mmiowb()
+/* Simple MMIO */
+#define ioread8(a)              readb(a)
+#define ioread16(a)             readw(a)
+#define ioread16be(a)           be16_to_cpu(__raw_readw((a)))
+#define ioread32(a)             readl(a)
+#define ioread32be(a)           be32_to_cpu(__raw_readl((a)))
 
-/*
- * If the platform has PC-like I/O, this function converts the offset into
- * an address.
- */
-static __inline__ unsigned long isa_port2addr(unsigned long offset)
-{
-        return __isa_port2addr(offset);
-}
+#define iowrite8(v,a)           writeb((v),(a))
+#define iowrite16(v,a)          writew((v),(a))
+#define iowrite16be(v,a)        __raw_writew(cpu_to_be16((v)),(a))
+#define iowrite32(v,a)          writel((v),(a))
+#define iowrite32be(v,a)        __raw_writel(cpu_to_be32((v)),(a))
+
+#define ioread8_rep(a,d,c)      insb((a),(d),(c))
+#define ioread16_rep(a,d,c)     insw((a),(d),(c))
+#define ioread32_rep(a,d,c)     insl((a),(d),(c))
+
+#define iowrite8_rep(a,s,c)     outsb((a),(s),(c))
+#define iowrite16_rep(a,s,c)    outsw((a),(s),(c))
+#define iowrite32_rep(a,s,c)    outsl((a),(s),(c))
+
+#define mmiowb()        wmb()   /* synco on SH-4A, otherwise a nop */
 
 /*
  * This function provides a method for the generic case where a board-specific
- * isa_port2addr simply needs to return the port + some arbitrary port base.
+ * ioport_map simply needs to return the port + some arbitrary port base.
  *
  * We use this at board setup time to implicitly set the port base, and
- * as a result, we can use the generic isa_port2addr.
+ * as a result, we can use the generic ioport_map.
  */
 static inline void __set_io_port_base(unsigned long pbase)
 {
@@ -159,51 +174,52 @@ static inline void __set_io_port_base(unsigned long pbase)
         generic_io_base = pbase;
 }
 
-#define isa_readb(a) readb(isa_port2addr(a))
-#define isa_readw(a) readw(isa_port2addr(a))
-#define isa_readl(a) readl(isa_port2addr(a))
-#define isa_writeb(b,a) writeb(b,isa_port2addr(a))
-#define isa_writew(w,a) writew(w,isa_port2addr(a))
-#define isa_writel(l,a) writel(l,isa_port2addr(a))
+#define isa_readb(a) readb(ioport_map(a, 1))
+#define isa_readw(a) readw(ioport_map(a, 2))
+#define isa_readl(a) readl(ioport_map(a, 4))
+#define isa_writeb(b,a) writeb(b,ioport_map(a, 1))
+#define isa_writew(w,a) writew(w,ioport_map(a, 2))
+#define isa_writel(l,a) writel(l,ioport_map(a, 4))
+
 #define isa_memset_io(a,b,c) \
-  memset((void *)(isa_port2addr((unsigned long)a)),(b),(c))
+  memset((void *)(ioport_map((unsigned long)(a), 1)),(b),(c))
 #define isa_memcpy_fromio(a,b,c) \
-  memcpy((a),(void *)(isa_port2addr((unsigned long)(b))),(c))
+  memcpy((a),(void *)(ioport_map((unsigned long)(b), 1)),(c))
 #define isa_memcpy_toio(a,b,c) \
-  memcpy((void *)(isa_port2addr((unsigned long)(a))),(b),(c))
+  memcpy((void *)(ioport_map((unsigned long)(a), 1)),(b),(c))
 
 /* We really want to try and get these to memcpy etc */
-extern void memcpy_fromio(void *, unsigned long, unsigned long);
-extern void memcpy_toio(unsigned long, const void *, unsigned long);
-extern void memset_io(unsigned long, int, unsigned long);
+extern void memcpy_fromio(void *, volatile void __iomem *, unsigned long);
+extern void memcpy_toio(volatile void __iomem *, const void *, unsigned long);
+extern void memset_io(volatile void __iomem *, int, unsigned long);
 
 /* SuperH on-chip I/O functions */
-static __inline__ unsigned char ctrl_inb(unsigned long addr)
+static inline unsigned char ctrl_inb(unsigned long addr)
 {
         return *(volatile unsigned char*)addr;
 }
 
-static __inline__ unsigned short ctrl_inw(unsigned long addr)
+static inline unsigned short ctrl_inw(unsigned long addr)
 {
         return *(volatile unsigned short*)addr;
 }
 
-static __inline__ unsigned int ctrl_inl(unsigned long addr)
+static inline unsigned int ctrl_inl(unsigned long addr)
 {
         return *(volatile unsigned long*)addr;
 }
 
-static __inline__ void ctrl_outb(unsigned char b, unsigned long addr)
+static inline void ctrl_outb(unsigned char b, unsigned long addr)
 {
         *(volatile unsigned char*)addr = b;
 }
 
-static __inline__ void ctrl_outw(unsigned short b, unsigned long addr)
+static inline void ctrl_outw(unsigned short b, unsigned long addr)
 {
         *(volatile unsigned short*)addr = b;
 }
 
-static __inline__ void ctrl_outl(unsigned int b, unsigned long addr)
+static inline void ctrl_outl(unsigned int b, unsigned long addr)
 {
         *(volatile unsigned long*)addr = b;
 }
@@ -214,12 +230,12 @@ static __inline__ void ctrl_outl(unsigned int b, unsigned long addr)
  * Change virtual addresses to physical addresses and vv.
  * These are trivial on the 1:1 Linux/SuperH mapping
  */
-static __inline__ unsigned long virt_to_phys(volatile void * address)
+static inline unsigned long virt_to_phys(volatile void *address)
 {
         return PHYSADDR(address);
 }
 
-static __inline__ void * phys_to_virt(unsigned long address)
+static inline void *phys_to_virt(unsigned long address)
 {
         return (void *)P1SEGADDR(address);
 }
@@ -234,27 +250,60 @@ static __inline__ void * phys_to_virt(unsigned long address)
  * differently. On the x86 architecture, we just read/write the
  * memory location directly.
  *
- * On SH, we have the whole physical address space mapped at all times
- * (as MIPS does), so "ioremap()" and "iounmap()" do not need to do
- * anything.  (This isn't true for all machines but we still handle
- * these cases with wired TLB entries anyway ...)
+ * On SH, we traditionally have the whole physical address space mapped
+ * at all times (as MIPS does), so "ioremap()" and "iounmap()" do not
+ * need to do anything but place the address in the proper segment. This
+ * is true for P1 and P2 addresses, as well as some P3 ones. However,
+ * most of the P3 addresses and newer cores using extended addressing
+ * need to map through page tables, so the ioremap() implementation
+ * becomes a bit more complicated. See arch/sh/mm/ioremap.c for
+ * additional notes on this.
  *
  * We cheat a bit and always return uncachable areas until we've fixed
- * the drivers to handle caching properly.  
+ * the drivers to handle caching properly.
  */
-static __inline__ void * ioremap(unsigned long offset, unsigned long size)
+#ifdef CONFIG_MMU
+void __iomem *__ioremap(unsigned long offset, unsigned long size,
+                        unsigned long flags);
+void __iounmap(void __iomem *addr);
+#else
+#define __ioremap(offset, size, flags)  ((void __iomem *)(offset))
+#define __iounmap(addr)                 do { } while (0)
+#endif /* CONFIG_MMU */
+
+static inline void __iomem *
+__ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags)
 {
-        return __ioremap(offset, size);
+        unsigned long last_addr = offset + size - 1;
+
+        /*
+         * For P1 and P2 space this is trivial, as everything is already
+         * mapped. Uncached access for P1 addresses are done through P2.
+         * In the P3 case or for addresses outside of the 29-bit space,
+         * mapping must be done by the PMB or by using page tables.
+         */
+        if (likely(PXSEG(offset) < P3SEG && PXSEG(last_addr) < P3SEG)) {
+                if (unlikely(flags & _PAGE_CACHABLE))
+                        return (void __iomem *)P1SEGADDR(offset);
+
+                return (void __iomem *)P2SEGADDR(offset);
+        }
+
+        return __ioremap(offset, size, flags);
 }
 
-static __inline__ void iounmap(void *addr)
-{
-        return __iounmap(addr);
-}
-
-#define ioremap_nocache(off,size) ioremap(off,size)
-
-static __inline__ int check_signature(unsigned long io_addr,
+#define ioremap(offset, size)                           \
+        __ioremap_mode((offset), (size), 0)
+#define ioremap_nocache(offset, size)                   \
+        __ioremap_mode((offset), (size), 0)
+#define ioremap_cache(offset, size)                     \
+        __ioremap_mode((offset), (size), _PAGE_CACHABLE)
+#define p3_ioremap(offset, size, flags)                 \
+        __ioremap((offset), (size), (flags))
+#define iounmap(addr)                                   \
+        __iounmap((addr))
+
+static inline int check_signature(char __iomem *io_addr,
                         const unsigned char *signature, int length)
 {
         int retval = 0;
diff --git a/include/asm-sh/io_generic.h b/include/asm-sh/io_generic.h
index be14587342f7..92fc6070d7b3 100644
--- a/include/asm-sh/io_generic.h
+++ b/include/asm-sh/io_generic.h
@@ -1,51 +1,49 @@
 /*
- * include/asm-sh/io_generic.h
- *
- * Copyright 2000 Stuart Menefy (stuart.menefy@st.com)
- *
- * May be copied or modified under the terms of the GNU General Public
- * License.  See linux/COPYING for more information.
- *
- * Generic IO functions
+ * Trivial I/O routine definitions, intentionally meant to be included
+ * multiple times. Ugly I/O routine concatenation helpers taken from
+ * alpha. Must be included _before_ io.h to avoid preprocessor-induced
+ * routine mismatch.
  */
-
-#ifndef _ASM_SH_IO_GENERIC_H
-#define _ASM_SH_IO_GENERIC_H
-
-extern unsigned long generic_io_base;
-
-extern unsigned char generic_inb(unsigned long port);
-extern unsigned short generic_inw(unsigned long port);
-extern unsigned int generic_inl(unsigned long port);
-
-extern void generic_outb(unsigned char value, unsigned long port);
-extern void generic_outw(unsigned short value, unsigned long port);
-extern void generic_outl(unsigned int value, unsigned long port);
-
-extern unsigned char generic_inb_p(unsigned long port);
-extern unsigned short generic_inw_p(unsigned long port);
-extern unsigned int generic_inl_p(unsigned long port);
-extern void generic_outb_p(unsigned char value, unsigned long port);
-extern void generic_outw_p(unsigned short value, unsigned long port);
-extern void generic_outl_p(unsigned int value, unsigned long port);
-
-extern void generic_insb(unsigned long port, void *addr, unsigned long count);
-extern void generic_insw(unsigned long port, void *addr, unsigned long count);
-extern void generic_insl(unsigned long port, void *addr, unsigned long count);
-extern void generic_outsb(unsigned long port, const void *addr, unsigned long count);
-extern void generic_outsw(unsigned long port, const void *addr, unsigned long count);
-extern void generic_outsl(unsigned long port, const void *addr, unsigned long count);
-
-extern unsigned char generic_readb(unsigned long addr);
-extern unsigned short generic_readw(unsigned long addr);
-extern unsigned int generic_readl(unsigned long addr);
-extern void generic_writeb(unsigned char b, unsigned long addr);
-extern void generic_writew(unsigned short b, unsigned long addr);
-extern void generic_writel(unsigned int b, unsigned long addr);
-
-extern void *generic_ioremap(unsigned long offset, unsigned long size);
-extern void generic_iounmap(void *addr);
-
-extern unsigned long generic_isa_port2addr(unsigned long offset);
-
-#endif /* _ASM_SH_IO_GENERIC_H */
+#define IO_CONCAT(a,b)  _IO_CONCAT(a,b)
+#define _IO_CONCAT(a,b) a ## _ ## b
+
+#ifndef __IO_PREFIX
+#error "Don't include this header without a valid system prefix"
+#endif
+
+u8 IO_CONCAT(__IO_PREFIX,inb)(unsigned long);
+u16 IO_CONCAT(__IO_PREFIX,inw)(unsigned long);
+u32 IO_CONCAT(__IO_PREFIX,inl)(unsigned long);
+
+void IO_CONCAT(__IO_PREFIX,outb)(u8, unsigned long);
+void IO_CONCAT(__IO_PREFIX,outw)(u16, unsigned long);
+void IO_CONCAT(__IO_PREFIX,outl)(u32, unsigned long);
+
+u8 IO_CONCAT(__IO_PREFIX,inb_p)(unsigned long);
+u16 IO_CONCAT(__IO_PREFIX,inw_p)(unsigned long);
+u32 IO_CONCAT(__IO_PREFIX,inl_p)(unsigned long);
+void IO_CONCAT(__IO_PREFIX,outb_p)(u8, unsigned long);
+void IO_CONCAT(__IO_PREFIX,outw_p)(u16, unsigned long);
+void IO_CONCAT(__IO_PREFIX,outl_p)(u32, unsigned long);
+
+void IO_CONCAT(__IO_PREFIX,insb)(unsigned long, void *dst, unsigned long count);
+void IO_CONCAT(__IO_PREFIX,insw)(unsigned long, void *dst, unsigned long count);
+void IO_CONCAT(__IO_PREFIX,insl)(unsigned long, void *dst, unsigned long count);
+void IO_CONCAT(__IO_PREFIX,outsb)(unsigned long, const void *src, unsigned long count);
+void IO_CONCAT(__IO_PREFIX,outsw)(unsigned long, const void *src, unsigned long count);
+void IO_CONCAT(__IO_PREFIX,outsl)(unsigned long, const void *src, unsigned long count);
+
+u8 IO_CONCAT(__IO_PREFIX,readb)(void __iomem *);
+u16 IO_CONCAT(__IO_PREFIX,readw)(void __iomem *);
+u32 IO_CONCAT(__IO_PREFIX,readl)(void __iomem *);
+void IO_CONCAT(__IO_PREFIX,writeb)(u8, void __iomem *);
+void IO_CONCAT(__IO_PREFIX,writew)(u16, void __iomem *);
+void IO_CONCAT(__IO_PREFIX,writel)(u32, void __iomem *);
+
+void *IO_CONCAT(__IO_PREFIX,ioremap)(unsigned long offset, unsigned long size);
+void IO_CONCAT(__IO_PREFIX,iounmap)(void *addr);
+
+void __iomem *IO_CONCAT(__IO_PREFIX,ioport_map)(unsigned long addr, unsigned int size);
+void IO_CONCAT(__IO_PREFIX,ioport_unmap)(void __iomem *addr);
+
+#undef __IO_PREFIX
diff --git a/include/asm-sh/irq-sh7780.h b/include/asm-sh/irq-sh7780.h
new file mode 100644
index 000000000000..8c8ca1281084
--- /dev/null
+++ b/include/asm-sh/irq-sh7780.h
@@ -0,0 +1,349 @@
+#ifndef __ASM_SH_IRQ_SH7780_H
+#define __ASM_SH_IRQ_SH7780_H
+
+/*
+ * linux/include/asm-sh/irq-sh7780.h
+ *
+ * Copyright (C) 2004 Takashi SHUDO <shudo@hitachi-ul.co.jp>
+ */
+
+#ifdef CONFIG_IDE
+# ifndef IRQ_CFCARD
+#  define IRQ_CFCARD    14
+# endif
+# ifndef IRQ_PCMCIA
+#  define IRQ_PCMCIA    15
+# endif
+#endif
+
+#define INTC_BASE       0xffd00000
+#define INTC_ICR0       (INTC_BASE+0x0)
+#define INTC_ICR1       (INTC_BASE+0x1c)
+#define INTC_INTPRI     (INTC_BASE+0x10)
+#define INTC_INTREQ     (INTC_BASE+0x24)
+#define INTC_INTMSK0    (INTC_BASE+0x44)
+#define INTC_INTMSK1    (INTC_BASE+0x48)
+#define INTC_INTMSK2    (INTC_BASE+0x40080)
+#define INTC_INTMSKCLR0 (INTC_BASE+0x64)
+#define INTC_INTMSKCLR1 (INTC_BASE+0x68)
+#define INTC_INTMSKCLR2 (INTC_BASE+0x40084)
+#define INTC_NMIFCR     (INTC_BASE+0xc0)
+#define INTC_USERIMASK  (INTC_BASE+0x30000)
+
+#define INTC_INT2PRI0   (INTC_BASE+0x40000)
+#define INTC_INT2PRI1   (INTC_BASE+0x40004)
+#define INTC_INT2PRI2   (INTC_BASE+0x40008)
+#define INTC_INT2PRI3   (INTC_BASE+0x4000c)
+#define INTC_INT2PRI4   (INTC_BASE+0x40010)
+#define INTC_INT2PRI5   (INTC_BASE+0x40014)
+#define INTC_INT2PRI6   (INTC_BASE+0x40018)
+#define INTC_INT2PRI7   (INTC_BASE+0x4001c)
+#define INTC_INT2A0     (INTC_BASE+0x40030)
+#define INTC_INT2A1     (INTC_BASE+0x40034)
+#define INTC_INT2MSKR   (INTC_BASE+0x40038)
+#define INTC_INT2MSKCR  (INTC_BASE+0x4003c)
+#define INTC_INT2B0     (INTC_BASE+0x40040)
+#define INTC_INT2B1     (INTC_BASE+0x40044)
+#define INTC_INT2B2     (INTC_BASE+0x40048)
+#define INTC_INT2B3     (INTC_BASE+0x4004c)
+#define INTC_INT2B4     (INTC_BASE+0x40050)
+#define INTC_INT2B5     (INTC_BASE+0x40054)
+#define INTC_INT2B6     (INTC_BASE+0x40058)
+#define INTC_INT2B7     (INTC_BASE+0x4005c)
+#define INTC_INT2GPIC   (INTC_BASE+0x40090)
+/*
+  NOTE:
+  *_IRQ = (INTEVT2 - 0x200)/0x20
+*/
+/* IRQ 0-7 line external int*/
+#define IRQ0_IRQ        2
+#define IRQ0_IPR_ADDR   INTC_INTPRI
+#define IRQ0_IPR_POS    7
+#define IRQ0_PRIORITY   2
+
+#define IRQ1_IRQ        4
+#define IRQ1_IPR_ADDR   INTC_INTPRI
+#define IRQ1_IPR_POS    6
+#define IRQ1_PRIORITY   2
+
+#define IRQ2_IRQ        6
+#define IRQ2_IPR_ADDR   INTC_INTPRI
+#define IRQ2_IPR_POS    5
+#define IRQ2_PRIORITY   2
+
+#define IRQ3_IRQ        8
+#define IRQ3_IPR_ADDR   INTC_INTPRI
+#define IRQ3_IPR_POS    4
+#define IRQ3_PRIORITY   2
+
+#define IRQ4_IRQ        10
+#define IRQ4_IPR_ADDR   INTC_INTPRI
+#define IRQ4_IPR_POS    3
+#define IRQ4_PRIORITY   2
+
+#define IRQ5_IRQ        12
+#define IRQ5_IPR_ADDR   INTC_INTPRI
+#define IRQ5_IPR_POS    2
+#define IRQ5_PRIORITY   2
+
+#define IRQ6_IRQ        14
+#define IRQ6_IPR_ADDR   INTC_INTPRI
+#define IRQ6_IPR_POS    1
+#define IRQ6_PRIORITY   2
+
+#define IRQ7_IRQ        0
+#define IRQ7_IPR_ADDR   INTC_INTPRI
+#define IRQ7_IPR_POS    0
+#define IRQ7_PRIORITY   2
+
+/* TMU */
+/* ch0 */
+#define TMU_IRQ         28
+#define TMU_IPR_ADDR    INTC_INT2PRI0
+#define TMU_IPR_POS     3
+#define TMU_PRIORITY    2
+
+#define TIMER_IRQ       28
+#define TIMER_IPR_ADDR  INTC_INT2PRI0
+#define TIMER_IPR_POS   3
+#define TIMER_PRIORITY  2
+
+/* ch 1*/
+#define TMU_CH1_IRQ             29
+#define TMU_CH1_IPR_ADDR        INTC_INT2PRI0
+#define TMU_CH1_IPR_POS         2
+#define TMU_CH1_PRIORITY        2
+
+#define TIMER1_IRQ      29
+#define TIMER1_IPR_ADDR INTC_INT2PRI0
+#define TIMER1_IPR_POS  2
+#define TIMER1_PRIORITY 2
+
+/* ch 2*/
+#define TMU_CH2_IRQ             30
+#define TMU_CH2_IPR_ADDR        INTC_INT2PRI0
+#define TMU_CH2_IPR_POS         1
+#define TMU_CH2_PRIORITY        2
+/* ch 2 Input capture */
+#define TMU_CH2IC_IRQ           31
+#define TMU_CH2IC_IPR_ADDR      INTC_INT2PRI0
+#define TMU_CH2IC_IPR_POS       0
+#define TMU_CH2IC_PRIORITY      2
+/* ch 3 */
+#define TMU_CH3_IRQ             96
+#define TMU_CH3_IPR_ADDR        INTC_INT2PRI1
+#define TMU_CH3_IPR_POS         3
+#define TMU_CH3_PRIORITY        2
+/* ch 4 */
+#define TMU_CH4_IRQ             97
+#define TMU_CH4_IPR_ADDR        INTC_INT2PRI1
+#define TMU_CH4_IPR_POS         2
+#define TMU_CH4_PRIORITY        2
+/* ch 5*/
+#define TMU_CH5_IRQ             98
+#define TMU_CH5_IPR_ADDR        INTC_INT2PRI1
+#define TMU_CH5_IPR_POS         1
+#define TMU_CH5_PRIORITY        2
+
+#define RTC_IRQ         22
+#define RTC_IPR_ADDR    INTC_INT2PRI1
+#define RTC_IPR_POS     0
+#define RTC_PRIORITY    TIMER_PRIORITY
+
+/* SCIF0 */
+#define SCIF0_ERI_IRQ   40
+#define SCIF0_RXI_IRQ   41
+#define SCIF0_BRI_IRQ   42
+#define SCIF0_TXI_IRQ   43
+#define SCIF0_IPR_ADDR  INTC_INT2PRI2
+#define SCIF0_IPR_POS   3
+#define SCIF0_PRIORITY  3
+
+/* SCIF1 */
+#define SCIF1_ERI_IRQ   76
+#define SCIF1_RXI_IRQ   77
+#define SCIF1_BRI_IRQ   78
+#define SCIF1_TXI_IRQ   79
+#define SCIF1_IPR_ADDR  INTC_INT2PRI2
+#define SCIF1_IPR_POS   2
+#define SCIF1_PRIORITY  3
+
+#define WDT_IRQ         27
+#define WDT_IPR_ADDR    INTC_INT2PRI2
+#define WDT_IPR_POS     1
+#define WDT_PRIORITY    2
+
+/* DMAC(0) */
+#define DMINT0_IRQ      34
+#define DMINT1_IRQ      35
+#define DMINT2_IRQ      36
+#define DMINT3_IRQ      37
+#define DMINT4_IRQ      44
+#define DMINT5_IRQ      45
+#define DMINT6_IRQ      46
+#define DMINT7_IRQ      47
+#define DMAE_IRQ        38
+#define DMA0_IPR_ADDR   INTC_INT2PRI3
+#define DMA0_IPR_POS    2
+#define DMA0_PRIORITY   7
+
+/* DMAC(1) */
+#define DMINT8_IRQ      92
+#define DMINT9_IRQ      93
+#define DMINT10_IRQ     94
+#define DMINT11_IRQ     95
+#define DMA1_IPR_ADDR   INTC_INT2PRI3
+#define DMA1_IPR_POS    1
+#define DMA1_PRIORITY   7
+
+#define DMTE0_IRQ       DMINT0_IRQ
+#define DMTE4_IRQ       DMINT4_IRQ
+#define DMA_IPR_ADDR    DMA0_IPR_ADDR
+#define DMA_IPR_POS     DMA0_IPR_POS
+#define DMA_PRIORITY    DMA0_PRIORITY
+
+/* CMT */
+#define CMT_IRQ         56
+#define CMT_IPR_ADDR    INTC_INT2PRI4
+#define CMT_IPR_POS     3
+#define CMT_PRIORITY    0
+
+/* HAC */
+#define HAC_IRQ         60
+#define HAC_IPR_ADDR    INTC_INT2PRI4
+#define HAC_IPR_POS     2
+#define CMT_PRIORITY    0
+
+/* PCIC(0) */
+#define PCIC0_IRQ       64
+#define PCIC0_IPR_ADDR  INTC_INT2PRI4
+#define PCIC0_IPR_POS   1
+#define PCIC0_PRIORITY  2
+
+/* PCIC(1) */
+#define PCIC1_IRQ       65
+#define PCIC1_IPR_ADDR  INTC_INT2PRI4
+#define PCIC1_IPR_POS   0
+#define PCIC1_PRIORITY  2
+
+/* PCIC(2) */
+#define PCIC2_IRQ       66
+#define PCIC2_IPR_ADDR  INTC_INT2PRI5
+#define PCIC2_IPR_POS   3
+#define PCIC2_PRIORITY  2
+
+/* PCIC(3) */
+#define PCIC3_IRQ       67
+#define PCIC3_IPR_ADDR  INTC_INT2PRI5
+#define PCIC3_IPR_POS   2
+#define PCIC3_PRIORITY  2
+
+/* PCIC(4) */
+#define PCIC4_IRQ       68
+#define PCIC4_IPR_ADDR  INTC_INT2PRI5
+#define PCIC4_IPR_POS   1
+#define PCIC4_PRIORITY  2
+
+/* PCIC(5) */
+#define PCICERR_IRQ     69
+#define PCICPWD3_IRQ    70
+#define PCICPWD2_IRQ    71
+#define PCICPWD1_IRQ    72
+#define PCICPWD0_IRQ    73
+#define PCIC5_IPR_ADDR  INTC_INT2PRI5
+#define PCIC5_IPR_POS   0
+#define PCIC5_PRIORITY  2
+
+/* SIOF */
+#define SIOF_IRQ        80
+#define SIOF_IPR_ADDR   INTC_INT2PRI6
+#define SIOF_IPR_POS    3
+#define SIOF_PRIORITY   3
+
+/* HSPI */
+#define HSPI_IRQ        84
+#define HSPI_IPR_ADDR   INTC_INT2PRI6
+#define HSPI_IPR_POS    2
+#define HSPI_PRIORITY   3
+
+/* MMCIF */
+#define MMCIF_FSTAT_IRQ 88
+#define MMCIF_TRAN_IRQ  89
+#define MMCIF_ERR_IRQ   90
+#define MMCIF_FRDY_IRQ  91
+#define MMCIF_IPR_ADDR  INTC_INT2PRI6
+#define MMCIF_IPR_POS   1
+#define HSPI_PRIORITY   3
+
+/* SSI */
+#define SSI_IRQ         100
+#define SSI_IPR_ADDR    INTC_INT2PRI6
+#define SSI_IPR_POS     0
+#define SSI_PRIORITY    3
+
+/* FLCTL */
+#define FLCTL_FLSTE_IRQ         104
+#define FLCTL_FLTEND_IRQ        105
+#define FLCTL_FLTRQ0_IRQ        106
+#define FLCTL_FLTRQ1_IRQ        107
+#define FLCTL_IPR_ADDR          INTC_INT2PRI7
+#define FLCTL_IPR_POS           3
+#define FLCTL_PRIORITY          3
+
+/* GPIO */
+#define GPIO0_IRQ       108
+#define GPIO1_IRQ       109
+#define GPIO2_IRQ       110
+#define GPIO3_IRQ       111
+#define GPIO_IPR_ADDR   INTC_INT2PRI7
+#define GPIO_IPR_POS    2
+#define GPIO_PRIORITY   3
+
+/* ONCHIP_NR_IRQS */
+#define NR_IRQS 150     /* 111 + 16 */
+
+/* In a generic kernel, NR_IRQS is an upper bound, and we should use
+ * ACTUAL_NR_IRQS (which uses the machine vector) to get the correct value.
+ */
+#define ACTUAL_NR_IRQS NR_IRQS
+
+extern void disable_irq(unsigned int);
+extern void disable_irq_nosync(unsigned int);
+extern void enable_irq(unsigned int);
+
+/*
+ * Simple Mask Register Support
+ */
+extern void make_maskreg_irq(unsigned int irq);
+extern unsigned short *irq_mask_register;
+
+/*
+ * Function for "on chip support modules".
+ */
+extern void make_imask_irq(unsigned int irq);
+
+#define INTC_TMU0_MSK   0
+#define INTC_TMU3_MSK   1
+#define INTC_RTC_MSK    2
+#define INTC_SCIF0_MSK  3
+#define INTC_SCIF1_MSK  4
+#define INTC_WDT_MSK    5
+#define INTC_HUID_MSK   7
+#define INTC_DMAC0_MSK  8
+#define INTC_DMAC1_MSK  9
+#define INTC_CMT_MSK    12
+#define INTC_HAC_MSK    13
+#define INTC_PCIC0_MSK  14
+#define INTC_PCIC1_MSK  15
+#define INTC_PCIC2_MSK  16
+#define INTC_PCIC3_MSK  17
+#define INTC_PCIC4_MSK  18
+#define INTC_PCIC5_MSK  19
+#define INTC_SIOF_MSK   20
+#define INTC_HSPI_MSK   21
+#define INTC_MMCIF_MSK  22
+#define INTC_SSI_MSK    23
+#define INTC_FLCTL_MSK  24
+#define INTC_GPIO_MSK   25
+
+#endif /* __ASM_SH_IRQ_SH7780_H */
diff --git a/include/asm-sh/irq.h b/include/asm-sh/irq.h
index 614a8c13b721..060ec3c27207 100644
--- a/include/asm-sh/irq.h
+++ b/include/asm-sh/irq.h
@@ -15,13 +15,20 @@
 #include <asm/machvec.h>
 #include <asm/ptrace.h>         /* for pt_regs */
 
-#if defined(CONFIG_SH_HP600) || \
+#if defined(CONFIG_SH_HP6XX) || \
     defined(CONFIG_SH_RTS7751R2D) || \
     defined(CONFIG_SH_HS7751RVOIP) || \
-    defined(CONFIG_SH_SH03)
+    defined(CONFIG_SH_HS7751RVOIP) || \
+    defined(CONFIG_SH_SH03) || \
+    defined(CONFIG_SH_R7780RP) || \
+    defined(CONFIG_SH_LANDISK)
 #include <asm/mach/ide.h>
 #endif
 
+#ifndef CONFIG_CPU_SUBTYPE_SH7780
+
+#define INTC_DMAC0_MSK  0
+
 #if defined(CONFIG_CPU_SH3)
 #define INTC_IPRA       0xfffffee2UL
 #define INTC_IPRB       0xfffffee4UL
@@ -235,8 +242,9 @@
 #define SCIF1_IPR_ADDR  INTC_IPRB
 #define SCIF1_IPR_POS   1
 #define SCIF1_PRIORITY  3
-#endif
-#endif
+#endif /* ST40STB1 */
+
+#endif /* 775x / SH4-202 / ST40STB1 */
 
 /* NR_IRQS is made from three components:
  *   1. ONCHIP_NR_IRQS - number of IRLS + on-chip peripherial modules
@@ -245,37 +253,35 @@
  */
 
 /* 1. ONCHIP_NR_IRQS */
-#ifdef CONFIG_SH_GENERIC
+#if defined(CONFIG_CPU_SUBTYPE_SH7604)
+# define ONCHIP_NR_IRQS 24      // Actually 21
+#elif defined(CONFIG_CPU_SUBTYPE_SH7707)
+# define ONCHIP_NR_IRQS 64
+# define PINT_NR_IRQS   16
+#elif defined(CONFIG_CPU_SUBTYPE_SH7708)
+# define ONCHIP_NR_IRQS 32
+#elif defined(CONFIG_CPU_SUBTYPE_SH7709) || \
+      defined(CONFIG_CPU_SUBTYPE_SH7705)
+# define ONCHIP_NR_IRQS 64      // Actually 61
+# define PINT_NR_IRQS   16
+#elif defined(CONFIG_CPU_SUBTYPE_SH7750)
+# define ONCHIP_NR_IRQS 48      // Actually 44
+#elif defined(CONFIG_CPU_SUBTYPE_SH7751)
+# define ONCHIP_NR_IRQS 72
+#elif defined(CONFIG_CPU_SUBTYPE_SH7760)
+# define ONCHIP_NR_IRQS 112     /* XXX */
+#elif defined(CONFIG_CPU_SUBTYPE_SH4_202)
+# define ONCHIP_NR_IRQS 72
+#elif defined(CONFIG_CPU_SUBTYPE_ST40STB1)
+# define ONCHIP_NR_IRQS 144
+#elif defined(CONFIG_CPU_SUBTYPE_SH7300)
+# define ONCHIP_NR_IRQS 109
+#elif defined(CONFIG_SH_UNKNOWN)        /* Most be last */
 # define ONCHIP_NR_IRQS 144
-#else
-# if defined(CONFIG_CPU_SUBTYPE_SH7604)
-#  define ONCHIP_NR_IRQS 24     // Actually 21
-# elif defined(CONFIG_CPU_SUBTYPE_SH7707)
-#  define ONCHIP_NR_IRQS 64
-#  define PINT_NR_IRQS   16
-# elif defined(CONFIG_CPU_SUBTYPE_SH7708)
-#  define ONCHIP_NR_IRQS 32
-# elif defined(CONFIG_CPU_SUBTYPE_SH7709) || \
-       defined(CONFIG_CPU_SUBTYPE_SH7705)
-#  define ONCHIP_NR_IRQS 64     // Actually 61
-#  define PINT_NR_IRQS   16
-# elif defined(CONFIG_CPU_SUBTYPE_SH7750)
-#  define ONCHIP_NR_IRQS 48     // Actually 44
-# elif defined(CONFIG_CPU_SUBTYPE_SH7751)
-#  define ONCHIP_NR_IRQS 72
-# elif defined(CONFIG_CPU_SUBTYPE_SH7760)
-#  define ONCHIP_NR_IRQS 110
-# elif defined(CONFIG_CPU_SUBTYPE_SH4_202)
-#  define ONCHIP_NR_IRQS 72
-# elif defined(CONFIG_CPU_SUBTYPE_ST40STB1)
-#  define ONCHIP_NR_IRQS 144
-# elif defined(CONFIG_CPU_SUBTYPE_SH7300)
-#  define ONCHIP_NR_IRQS 109
-# endif
 #endif
 
 /* 2. PINT_NR_IRQS */
-#ifdef CONFIG_SH_GENERIC
+#ifdef CONFIG_SH_UNKNOWN
 # define PINT_NR_IRQS 16
 #else
 # ifndef PINT_NR_IRQS
@@ -288,22 +294,22 @@
 #endif
 
 /* 3. OFFCHIP_NR_IRQS */
-#ifdef CONFIG_SH_GENERIC
+#if defined(CONFIG_HD64461)
+# define OFFCHIP_NR_IRQS 18
+#elif defined (CONFIG_SH_BIGSUR) /* must be before CONFIG_HD64465 */
+# define OFFCHIP_NR_IRQS 48
+#elif defined(CONFIG_HD64465)
 # define OFFCHIP_NR_IRQS 16
+#elif defined (CONFIG_SH_EC3104)
+# define OFFCHIP_NR_IRQS 16
+#elif defined (CONFIG_SH_DREAMCAST)
+# define OFFCHIP_NR_IRQS 96
+#elif defined (CONFIG_SH_TITAN)
+# define OFFCHIP_NR_IRQS 4
+#elif defined(CONFIG_SH_UNKNOWN)
+# define OFFCHIP_NR_IRQS 16     /* Must also be last */
 #else
-# if defined(CONFIG_HD64461)
-#  define OFFCHIP_NR_IRQS 18
-# elif defined (CONFIG_SH_BIGSUR) /* must be before CONFIG_HD64465 */
-#  define OFFCHIP_NR_IRQS 48
-# elif defined(CONFIG_HD64465)
-#  define OFFCHIP_NR_IRQS 16
-# elif defined (CONFIG_SH_EC3104)
-#  define OFFCHIP_NR_IRQS 16
-# elif defined (CONFIG_SH_DREAMCAST)
-#  define OFFCHIP_NR_IRQS 96
-# else
-#  define OFFCHIP_NR_IRQS 0
-# endif
+# define OFFCHIP_NR_IRQS 0
 #endif
 
 #if OFFCHIP_NR_IRQS > 0
@@ -313,16 +319,6 @@
 /* NR_IRQS. 1+2+3 */
 #define NR_IRQS (ONCHIP_NR_IRQS + PINT_NR_IRQS + OFFCHIP_NR_IRQS)
 
-/* In a generic kernel, NR_IRQS is an upper bound, and we should use
- * ACTUAL_NR_IRQS (which uses the machine vector) to get the correct value.
- */
-#ifdef CONFIG_SH_GENERIC
-# define ACTUAL_NR_IRQS (sh_mv.mv_nr_irqs)
-#else
-# define ACTUAL_NR_IRQS NR_IRQS
-#endif
-
-
 extern void disable_irq(unsigned int);
 extern void disable_irq_nosync(unsigned int);
 extern void enable_irq(unsigned int);
@@ -542,9 +538,6 @@ extern int ipr_irq_demux(int irq);
 
 extern int ipr_irq_demux(int irq);
 #define __irq_demux(irq) ipr_irq_demux(irq)
-
-#else
-#define __irq_demux(irq) irq
 #endif /* CONFIG_CPU_SUBTYPE_SH7707 || CONFIG_CPU_SUBTYPE_SH7709 */
 
 #if defined(CONFIG_CPU_SUBTYPE_SH7750) || defined(CONFIG_CPU_SUBTYPE_SH7751) || \
@@ -557,18 +550,35 @@ extern int ipr_irq_demux(int irq);
 #define INTC_ICR_IRLM   (1<<7)
 #endif
 
-#ifdef CONFIG_CPU_SUBTYPE_ST40STB1
+#else
+#include <asm/irq-sh7780.h>
+#endif
 
+/* SH with INTC2-style interrupts */
+#ifdef CONFIG_CPU_HAS_INTC2_IRQ
+#if defined(CONFIG_CPU_SUBTYPE_ST40STB1)
+#define INTC2_BASE      0xfe080000
 #define INTC2_FIRST_IRQ 64
-#define NR_INTC2_IRQS 25
-
+#define INTC2_INTREQ_OFFSET     0x20
+#define INTC2_INTMSK_OFFSET     0x40
+#define INTC2_INTMSKCLR_OFFSET  0x60
+#define NR_INTC2_IRQS   25
+#elif defined(CONFIG_CPU_SUBTYPE_SH7760)
 #define INTC2_BASE      0xfe080000
-#define INTC2_INTC2MODE (INTC2_BASE+0x80)
-
-#define INTC2_INTPRI_OFFSET     0x00
+#define INTC2_FIRST_IRQ 48      /* INTEVT 0x800 */
 #define INTC2_INTREQ_OFFSET     0x20
 #define INTC2_INTMSK_OFFSET     0x40
 #define INTC2_INTMSKCLR_OFFSET  0x60
+#define NR_INTC2_IRQS   64
+#elif defined(CONFIG_CPU_SUBTYPE_SH7780)
+#define INTC2_BASE      0xffd40000
+#define INTC2_FIRST_IRQ 22
+#define INTC2_INTMSK_OFFSET     (0x38)
+#define INTC2_INTMSKCLR_OFFSET  (0x3c)
+#define NR_INTC2_IRQS   60
+#endif
+
+#define INTC2_INTPRI_OFFSET     0x00
 
 void make_intc2_irq(unsigned int irq,
                     unsigned int ipr_offset, unsigned int ipr_shift,
@@ -577,13 +587,16 @@ void make_intc2_irq(unsigned int irq,
 void init_IRQ_intc2(void);
 void intc2_add_clear_irq(int irq, int (*fn)(int));
 
-#endif  /* CONFIG_CPU_SUBTYPE_ST40STB1 */
+#endif
 
 static inline int generic_irq_demux(int irq)
 {
         return irq;
 }
 
+#ifndef __irq_demux
+#define __irq_demux(irq)        (irq)
+#endif
 #define irq_canonicalize(irq)   (irq)
 #define irq_demux(irq)          __irq_demux(sh_mv.mv_irq_demux(irq))
 
diff --git a/include/asm-sh/kexec.h b/include/asm-sh/kexec.h
new file mode 100644
index 000000000000..9dfe59f6fcb5
--- /dev/null
+++ b/include/asm-sh/kexec.h
@@ -0,0 +1,33 @@
+#ifndef _SH_KEXEC_H
+#define _SH_KEXEC_H
+
+/*
+ * KEXEC_SOURCE_MEMORY_LIMIT maximum page get_free_page can return.
+ * I.e. Maximum page that is mapped directly into kernel memory,
+ * and kmap is not required.
+ *
+ * Someone correct me if FIXADDR_START - PAGEOFFSET is not the correct
+ * calculation for the amount of memory directly mappable into the
+ * kernel memory space.
+ */
+
+/* Maximum physical address we can use pages from */
+#define KEXEC_SOURCE_MEMORY_LIMIT (-1UL)
+/* Maximum address we can reach in physical address mode */
+#define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)
+/* Maximum address we can use for the control code buffer */
+#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE
+
+#define KEXEC_CONTROL_CODE_SIZE 4096
+
+/* The native architecture */
+#define KEXEC_ARCH KEXEC_ARCH_SH
+
+#ifndef __ASSEMBLY__
+
+extern void machine_shutdown(void);
+extern void *crash_notes;
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* _SH_KEXEC_H */
diff --git a/include/asm-sh/machvec.h b/include/asm-sh/machvec.h
index 3f18aa180516..550c50a7359e 100644
--- a/include/asm-sh/machvec.h
+++ b/include/asm-sh/machvec.h
@@ -18,44 +18,37 @@
 #include <asm/machvec_init.h>
 
 struct device;
-struct timeval;
 
-struct sh_machine_vector
-{
+struct sh_machine_vector {
         int mv_nr_irqs;
 
-        unsigned char (*mv_inb)(unsigned long);
-        unsigned short (*mv_inw)(unsigned long);
-        unsigned int (*mv_inl)(unsigned long);
-        void (*mv_outb)(unsigned char, unsigned long);
-        void (*mv_outw)(unsigned short, unsigned long);
-        void (*mv_outl)(unsigned int, unsigned long);
-
-        unsigned char (*mv_inb_p)(unsigned long);
-        unsigned short (*mv_inw_p)(unsigned long);
-        unsigned int (*mv_inl_p)(unsigned long);
-        void (*mv_outb_p)(unsigned char, unsigned long);
-        void (*mv_outw_p)(unsigned short, unsigned long);
-        void (*mv_outl_p)(unsigned int, unsigned long);
-
-        void (*mv_insb)(unsigned long port, void *addr, unsigned long count);
-        void (*mv_insw)(unsigned long port, void *addr, unsigned long count);
-        void (*mv_insl)(unsigned long port, void *addr, unsigned long count);
-        void (*mv_outsb)(unsigned long port, const void *addr, unsigned long count);
-        void (*mv_outsw)(unsigned long port, const void *addr, unsigned long count);
-        void (*mv_outsl)(unsigned long port, const void *addr, unsigned long count);
-
-        unsigned char (*mv_readb)(unsigned long);
-        unsigned short (*mv_readw)(unsigned long);
-        unsigned int (*mv_readl)(unsigned long);
-        void (*mv_writeb)(unsigned char, unsigned long);
-        void (*mv_writew)(unsigned short, unsigned long);
-        void (*mv_writel)(unsigned int, unsigned long);
-
-        void* (*mv_ioremap)(unsigned long offset, unsigned long size);
-        void (*mv_iounmap)(void *addr);
-
-        unsigned long (*mv_isa_port2addr)(unsigned long offset);
+        u8 (*mv_inb)(unsigned long);
+        u16 (*mv_inw)(unsigned long);
+        u32 (*mv_inl)(unsigned long);
+        void (*mv_outb)(u8, unsigned long);
+        void (*mv_outw)(u16, unsigned long);
+        void (*mv_outl)(u32, unsigned long);
+
+        u8 (*mv_inb_p)(unsigned long);
+        u16 (*mv_inw_p)(unsigned long);
+        u32 (*mv_inl_p)(unsigned long);
+        void (*mv_outb_p)(u8, unsigned long);
+        void (*mv_outw_p)(u16, unsigned long);
+        void (*mv_outl_p)(u32, unsigned long);
+
+        void (*mv_insb)(unsigned long, void *dst, unsigned long count);
+        void (*mv_insw)(unsigned long, void *dst, unsigned long count);
+        void (*mv_insl)(unsigned long, void *dst, unsigned long count);
+        void (*mv_outsb)(unsigned long, const void *src, unsigned long count);
+        void (*mv_outsw)(unsigned long, const void *src, unsigned long count);
+        void (*mv_outsl)(unsigned long, const void *src, unsigned long count);
+
+        u8 (*mv_readb)(void __iomem *);
+        u16 (*mv_readw)(void __iomem *);
+        u32 (*mv_readl)(void __iomem *);
+        void (*mv_writeb)(u8, void __iomem *);
+        void (*mv_writew)(u16, void __iomem *);
+        void (*mv_writel)(u32, void __iomem *);
 
         int (*mv_irq_demux)(int irq);
 
@@ -66,6 +59,9 @@ struct sh_machine_vector
 
         void *(*mv_consistent_alloc)(struct device *, size_t, dma_addr_t *, gfp_t);
         int (*mv_consistent_free)(struct device *, size_t, void *, dma_addr_t);
+
+        void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size);
+        void (*mv_ioport_unmap)(void __iomem *);
 };
 
 extern struct sh_machine_vector sh_mv;
diff --git a/include/asm-sh/timer.h b/include/asm-sh/timer.h
new file mode 100644
index 000000000000..dd6579c0b04c
--- /dev/null
+++ b/include/asm-sh/timer.h
@@ -0,0 +1,42 @@
+#ifndef __ASM_SH_TIMER_H
+#define __ASM_SH_TIMER_H
+
+#include <linux/sysdev.h>
+#include <asm/cpu/timer.h>
+
+struct sys_timer_ops {
+        int (*init)(void);
+        unsigned long (*get_offset)(void);
+        unsigned long (*get_frequency)(void);
+};
+
+struct sys_timer {
+        const char              *name;
+
+        struct sys_device       dev;
+        struct sys_timer_ops    *ops;
+};
+
+#define TICK_SIZE (tick_nsec / 1000)
+
+extern struct sys_timer tmu_timer;
+extern struct sys_timer *sys_timer;
+
+static inline unsigned long get_timer_offset(void)
+{
+        return sys_timer->ops->get_offset();
+}
+
+static inline unsigned long get_timer_frequency(void)
+{
+        return sys_timer->ops->get_frequency();
+}
+
+/* arch/sh/kernel/timers/timer.c */
+struct sys_timer *get_sys_timer(void);
+
+/* arch/sh/kernel/time.c */
+void handle_timer_tick(struct pt_regs *);
+
+#endif /* __ASM_SH_TIMER_H */
+
diff --git a/include/asm-x86_64/ia32.h b/include/asm-x86_64/ia32.h
index c7bc9c0525ba..e6b7f2234e43 100644
--- a/include/asm-x86_64/ia32.h
+++ b/include/asm-x86_64/ia32.h
@@ -169,6 +169,8 @@ int ia32_child_tls(struct task_struct *p, struct pt_regs *childregs);
 struct linux_binprm;
 extern int ia32_setup_arg_pages(struct linux_binprm *bprm,
                                 unsigned long stack_top, int exec_stack);
+struct mm_struct;
+extern void ia32_pick_mmap_layout(struct mm_struct *mm);
 
 #endif
 
diff --git a/include/asm-x86_64/irq.h b/include/asm-x86_64/irq.h
index fb724ba37ae6..9db5a1b4f7b1 100644
--- a/include/asm-x86_64/irq.h
+++ b/include/asm-x86_64/irq.h
@@ -36,7 +36,7 @@
 #define NR_IRQ_VECTORS NR_IRQS
 #else
 #define NR_IRQS 224
-#define NR_IRQ_VECTORS 1024
+#define NR_IRQ_VECTORS (32 * NR_CPUS)
 #endif
 
 static __inline__ int irq_canonicalize(int irq)
diff --git a/include/asm-x86_64/page.h b/include/asm-x86_64/page.h
index dcbb4fcd9a18..615e3e494929 100644
--- a/include/asm-x86_64/page.h
+++ b/include/asm-x86_64/page.h
@@ -26,6 +26,13 @@
 #define IRQSTACK_ORDER 2
 #define IRQSTACKSIZE (PAGE_SIZE << IRQSTACK_ORDER)
 
+#define STACKFAULT_STACK 1
+#define DOUBLEFAULT_STACK 2
+#define NMI_STACK 3
+#define DEBUG_STACK 4
+#define MCE_STACK 5
+#define N_EXCEPTION_STACKS 5  /* hw limit: 7 */
+
 #define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1))
 #define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)
 
diff --git a/include/asm-x86_64/processor.h b/include/asm-x86_64/processor.h
index 87a282b1043a..8c8d88c036ed 100644
--- a/include/asm-x86_64/processor.h
+++ b/include/asm-x86_64/processor.h
@@ -273,13 +273,6 @@ struct thread_struct {
 #define INIT_MMAP \
 { &init_mm, 0, 0, NULL, PAGE_SHARED, VM_READ | VM_WRITE | VM_EXEC, 1, NULL, NULL }
 
-#define STACKFAULT_STACK 1
-#define DOUBLEFAULT_STACK 2 
-#define NMI_STACK 3 
-#define DEBUG_STACK 4 
-#define MCE_STACK 5
-#define N_EXCEPTION_STACKS 5  /* hw limit: 7 */
-
 #define start_thread(regs,new_rip,new_rsp) do { \
         asm volatile("movl %0,%%fs; movl %0,%%es; movl %0,%%ds": :"r" (0));      \
         load_gs_index(0);                                                       \
@@ -484,4 +477,6 @@ extern unsigned long boot_option_idle_override;
 /* Boot loader type from the setup header */
 extern int bootloader_type;
 
+#define HAVE_ARCH_PICK_MMAP_LAYOUT 1
+
 #endif /* __ASM_X86_64_PROCESSOR_H */
diff --git a/include/asm-x86_64/system.h b/include/asm-x86_64/system.h
index 0eacbefb7dd0..a73f0c789d8b 100644
--- a/include/asm-x86_64/system.h
+++ b/include/asm-x86_64/system.h
@@ -354,11 +354,6 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
 #define local_irq_disable()     __asm__ __volatile__("cli": : :"memory")
 #define local_irq_enable()      __asm__ __volatile__("sti": : :"memory")
 
-/* used in the idle loop; sti takes one instruction cycle to complete */
-#define safe_halt()             __asm__ __volatile__("sti; hlt": : :"memory")
-/* used when interrupts are already enabled or to shutdown the processor */
-#define halt()                  __asm__ __volatile__("hlt": : :"memory")
-
 #define irqs_disabled()                 \
 ({                                      \
         unsigned long flags;            \
@@ -370,6 +365,11 @@ static inline unsigned long __cmpxchg(volatile void *ptr, unsigned long old,
 #define local_irq_save(x)       do { warn_if_not_ulong(x); __asm__ __volatile__("# local_irq_save \n\t pushfq ; popq %0 ; cli":"=g" (x): /* no input */ :"memory"); } while (0)
 #endif
 
+/* used in the idle loop; sti takes one instruction cycle to complete */
+#define safe_halt()             __asm__ __volatile__("sti; hlt": : :"memory")
+/* used when interrupts are already enabled or to shutdown the processor */
+#define halt()                  __asm__ __volatile__("hlt": : :"memory")
+
 void cpu_idle_wait(void);
 
 extern unsigned long arch_align_stack(unsigned long sp);
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 552cedfa6064..b77f2608eef9 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1290,6 +1290,9 @@ extern void mnt_set_mountpoint(struct vfsmount *, struct dentry *,
 
 extern int vfs_statfs(struct super_block *, struct kstatfs *);
 
+/* /sys/fs */
+extern struct subsystem fs_subsys;
+
 #define FLOCK_VERIFY_READ  1
 #define FLOCK_VERIFY_WRITE 2
 
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 6ff2d365895f..474c8f4f5d4f 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -104,6 +104,10 @@
 #define I2C_DRIVERID_AKITAIOEXP 74      /* IO Expander on Sharp SL-C1000 */
 #define I2C_DRIVERID_INFRARED   75      /* I2C InfraRed on Video boards */
 #define I2C_DRIVERID_TVP5150    76      /* TVP5150 video decoder        */
+#define I2C_DRIVERID_WM8739     77      /* wm8739 audio processor       */
+#define I2C_DRIVERID_UPD64083   78      /* upd64083 video processor     */
+#define I2C_DRIVERID_UPD64031A  79      /* upd64031a video processor    */
+#define I2C_DRIVERID_SAA717X    80      /* saa717x video encoder        */
 
 #define I2C_DRIVERID_I2CDEV     900
 #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */
diff --git a/include/linux/init.h b/include/linux/init.h
index 59008c3826cf..ff8d8b8632f4 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -241,6 +241,18 @@ void __init parse_early_param(void);
 #define __cpuexitdata   __exitdata
 #endif
 
+#ifdef CONFIG_MEMORY_HOTPLUG
+#define __meminit
+#define __meminitdata
+#define __memexit
+#define __memexitdata
+#else
+#define __meminit       __init
+#define __meminitdata __initdata
+#define __memexit __exit
+#define __memexitdata   __exitdata
+#endif
+
 /* Functions marked as __devexit may be discarded at kernel link time, depending
    on config options.  Newer versions of binutils detect references from
    retained sections to discarded sections and flag an error.  Pointers to
diff --git a/include/linux/kexec.h b/include/linux/kexec.h
index 94abc07cb164..a311f58c8a7c 100644
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
@@ -119,6 +119,7 @@ extern struct kimage *kexec_image;
 #define KEXEC_ARCH_PPC64   (21 << 16)
 #define KEXEC_ARCH_IA_64   (50 << 16)
 #define KEXEC_ARCH_S390    (22 << 16)
+#define KEXEC_ARCH_SH      (42 << 16)
 
 #define KEXEC_FLAGS    (KEXEC_ON_CRASH)  /* List of defined/legal kexec flags */
 
diff --git a/include/media/tuner-types.h b/include/media/tuner-types.h
new file mode 100644
index 000000000000..15821ab14a9e
--- /dev/null
+++ b/include/media/tuner-types.h
@@ -0,0 +1,55 @@
+/*
+ * descriptions for simple tuners.
+ */
+
+#ifndef __TUNER_TYPES_H__
+#define __TUNER_TYPES_H__
+
+enum param_type {
+        TUNER_PARAM_TYPE_RADIO, \
+        TUNER_PARAM_TYPE_PAL, \
+        TUNER_PARAM_TYPE_SECAM, \
+        TUNER_PARAM_TYPE_NTSC
+};
+
+struct tuner_range {
+        unsigned short limit;
+        unsigned char cb;
+};
+
+struct tuner_params {
+        enum param_type type;
+        /* Many Philips based tuners have a comment like this in their
+         * datasheet:
+         *
+         *   For channel selection involving band switching, and to ensure
+         *   smooth tuning to the desired channel without causing
+         *   unnecessary charge pump action, it is recommended to consider
+         *   the difference between wanted channel frequency and the
+         *   current channel frequency.  Unnecessary charge pump action
+         *   will result in very low tuning voltage which may drive the
+         *   oscillator to extreme conditions.
+         *
+         * Set cb_first_if_lower_freq to 1, if this check is
+         * required for this tuner.
+         *
+         * I tested this for PAL by first setting the TV frequency to
+         * 203 MHz and then switching to 96.6 MHz FM radio. The result was
+         * static unless the control byte was sent first.
+         */
+        unsigned int cb_first_if_lower_freq:1;
+        unsigned char config; /* to be moved into struct tuner_range for dvb-pll merge */
+
+        unsigned int count;
+        struct tuner_range *ranges;
+};
+
+struct tunertype {
+        char *name;
+        struct tuner_params *params;
+};
+
+extern struct tunertype tuners[];
+extern unsigned const int tuner_count;
+
+#endif
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 27cbf08c931d..a5beeac495c7 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -23,6 +23,7 @@
 #define _TUNER_H
 
 #include <linux/videodev2.h>
+#include <media/tuner-types.h>
 
 #define ADDR_UNSET (255)
 
@@ -114,6 +115,7 @@
 
 #define TUNER_PHILIPS_TUV1236D          68      /* ATI HDTV Wonder */
 #define TUNER_TNF_5335MF                69      /* Sabrent Bt848   */
+#define TUNER_SAMSUNG_TCPN_2121P30A     70      /* Hauppauge PVR-500MCE NTSC */
 
 /* tv card specific */
 #define TDA9887_PRESENT                 (1<<0)
@@ -177,7 +179,9 @@ struct tuner {
         unsigned int mode;
         unsigned int mode_mask; /* Combination of allowable modes */
 
-        unsigned int freq;      /* keep track of the current settings */
+        unsigned int tv_freq;   /* keep track of the current settings */
+        unsigned int radio_freq;
+        u16          last_div;
         unsigned int audmode;
         v4l2_std_id  std;
 
@@ -195,8 +199,8 @@ struct tuner {
         unsigned int sgIF;
 
         /* function ptrs */
-        void (*tv_freq)(struct i2c_client *c, unsigned int freq);
-        void (*radio_freq)(struct i2c_client *c, unsigned int freq);
+        void (*set_tv_freq)(struct i2c_client *c, unsigned int freq);
+        void (*set_radio_freq)(struct i2c_client *c, unsigned int freq);
         int  (*has_signal)(struct i2c_client *c);
         int  (*is_stereo)(struct i2c_client *c);
         void (*standby)(struct i2c_client *c);
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index c74052abb189..d4030a7e16e0 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -120,6 +120,13 @@ enum v4l2_chip_ident {
 /* select from TV,radio,extern,MUTE */
 #define AUDC_SET_INPUT        _IOW('d',89,int)
 
+/* msp3400 ioctl: will be removed in the near future */
+struct msp_matrix {
+  int input;
+  int output;
+};
+#define MSP_SET_MATRIX     _IOW('m',17,struct msp_matrix)
+
 /* tuner ioctls */
 /* Sets tuner type and its I2C addr */
 #define TUNER_SET_TYPE_ADDR          _IOW('d',90,int)