2 files changed, 84 insertions, 0 deletions

diff --git a/arch/avr32/mach-at32ap/include/mach/at32ap700x.h b/arch/avr32/mach-at32ap/include/mach/at32ap700x.h
index 31b44e13ec32..1e9852d65cca 100644
--- a/arch/avr32/mach-at32ap/include/mach/at32ap700x.h
+++ b/arch/avr32/mach-at32ap/include/mach/at32ap700x.h
@@ -46,6 +46,35 @@
 #define DMAC_DMAREQ_2           9
 #define DMAC_DMAREQ_3           10
 
+/* HSB master IDs */
+#define HMATRIX_MASTER_CPU_DCACHE               0
+#define HMATRIX_MASTER_CPU_ICACHE               1
+#define HMATRIX_MASTER_PDC                      2
+#define HMATRIX_MASTER_ISI                      3
+#define HMATRIX_MASTER_USBA                     4
+#define HMATRIX_MASTER_LCDC                     5
+#define HMATRIX_MASTER_MACB0                    6
+#define HMATRIX_MASTER_MACB1                    7
+#define HMATRIX_MASTER_DMACA_M0                 8
+#define HMATRIX_MASTER_DMACA_M1                 9
+
+/* HSB slave IDs */
+#define HMATRIX_SLAVE_SRAM0                     0
+#define HMATRIX_SLAVE_SRAM1                     1
+#define HMATRIX_SLAVE_PBA                       2
+#define HMATRIX_SLAVE_PBB                       3
+#define HMATRIX_SLAVE_EBI                       4
+#define HMATRIX_SLAVE_USBA                      5
+#define HMATRIX_SLAVE_LCDC                      6
+#define HMATRIX_SLAVE_DMACA                     7
+
+/* Bits in HMATRIX SFR4 (EBI) */
+#define HMATRIX_EBI_SDRAM_ENABLE                (1 << 1)
+#define HMATRIX_EBI_NAND_ENABLE                 (1 << 3)
+#define HMATRIX_EBI_CF0_ENABLE                  (1 << 4)
+#define HMATRIX_EBI_CF1_ENABLE                  (1 << 5)
+#define HMATRIX_EBI_PULLUP_DISABLE              (1 << 8)
+
 /*
  * Base addresses of controllers that may be accessed early by
  * platform code.
diff --git a/arch/avr32/mach-at32ap/include/mach/hmatrix.h b/arch/avr32/mach-at32ap/include/mach/hmatrix.h
new file mode 100644
index 000000000000..7a368f227ebc
--- /dev/null
+++ b/arch/avr32/mach-at32ap/include/mach/hmatrix.h
@@ -0,0 +1,55 @@
+/*
+ * High-Speed Bus Matrix configuration registers
+ *
+ * Copyright (C) 2008 Atmel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __HMATRIX_H
+#define __HMATRIX_H
+
+extern struct clk at32_hmatrix_clk;
+
+void hmatrix_write_reg(unsigned long offset, u32 value);
+u32 hmatrix_read_reg(unsigned long offset);
+
+void hmatrix_sfr_set_bits(unsigned int slave_id, u32 mask);
+void hmatrix_sfr_clear_bits(unsigned int slave_id, u32 mask);
+
+/* Master Configuration register */
+#define HMATRIX_MCFG(m)                 (0x0000 + 4 * (m))
+/* Undefined length burst limit */
+# define HMATRIX_MCFG_ULBT_INFINITE     0       /* Infinite length */
+# define HMATRIX_MCFG_ULBT_SINGLE       1       /* Single Access */
+# define HMATRIX_MCFG_ULBT_FOUR_BEAT    2       /* Four beat */
+# define HMATRIX_MCFG_ULBT_EIGHT_BEAT   3       /* Eight beat */
+# define HMATRIX_MCFG_ULBT_SIXTEEN_BEAT 4       /* Sixteen beat */
+
+/* Slave Configuration register */
+#define HMATRIX_SCFG(s)                 (0x0040 + 4 * (s))
+# define HMATRIX_SCFG_SLOT_CYCLE(x)     ((x) <<  0)     /* Max burst cycles */
+# define HMATRIX_SCFG_DEFMSTR_NONE      (  0 << 16)     /* No default master */
+# define HMATRIX_SCFG_DEFMSTR_LAST      (  1 << 16)     /* Last def master */
+# define HMATRIX_SCFG_DEFMSTR_FIXED     (  2 << 16)     /* Fixed def master */
+# define HMATRIX_SCFG_FIXED_DEFMSTR(m)  ((m) << 18)     /* Fixed master ID */
+# define HMATRIX_SCFG_ARBT_ROUND_ROBIN  (  0 << 24)     /* RR arbitration */
+# define HMATRIX_SCFG_ARBT_FIXED_PRIO   (  1 << 24)     /* Fixed priority */
+
+/* Slave Priority register A (master 0..7) */
+#define HMATRIX_PRAS(s)                 (0x0080 + 8 * (s))
+# define HMATRIX_PRAS_PRIO(m, p)        ((p) << ((m) * 4))
+
+/* Slave Priority register A (master 8..15) */
+#define HMATRIX_PRBS(s)                 (0x0084 + 8 * (s))
+# define HMATRIX_PRBS_PRIO(m, p)        ((p) << (((m) - 8) * 4))
+
+/* Master Remap Control Register */
+#define HMATRIX_MRCR                            0x0100
+# define HMATRIX_MRCR_REMAP(m)          (  1 << (m))    /* Remap master m */
+
+/* Special Function Register. Bit definitions are chip-specific */
+#define HMATRIX_SFR(s)                  (0x0110 + 4 * (s))
+
+#endif /* __HMATRIX_H */