diff options
author | David VomLehn <dvomlehn@cisco.com> | 2010-08-02 14:44:00 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-08-05 08:26:31 -0400 |
commit | 51f1336d4dbd0935d873761f7f267c3f5abc9bd6 (patch) | |
tree | 69a3e28b32624280e84527588c49242c67b54554 /arch/mips/include | |
parent | 47a348614492987ef307aad299c09163344e4eaf (diff) |
MIPS: PowerTV: Add Gaia platform definitions.
Define ASIC address, memory preallocations, and initialization code for the
Gaia platform.
Signed-off-by: David VomLehn <dvomlehn@cisco.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/1519/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include')
-rw-r--r-- | arch/mips/include/asm/mach-powertv/asic.h | 4 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-powertv/asic_regs.h | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/mips/include/asm/mach-powertv/asic.h b/arch/mips/include/asm/mach-powertv/asic.h index bcad43a93ebf..df33d93e4f56 100644 --- a/arch/mips/include/asm/mach-powertv/asic.h +++ b/arch/mips/include/asm/mach-powertv/asic.h | |||
@@ -40,19 +40,23 @@ enum family_type { | |||
40 | FAMILY_8600VZB, | 40 | FAMILY_8600VZB, |
41 | FAMILY_1500VZE, | 41 | FAMILY_1500VZE, |
42 | FAMILY_1500VZF, | 42 | FAMILY_1500VZF, |
43 | FAMILY_8700, | ||
43 | FAMILIES | 44 | FAMILIES |
44 | }; | 45 | }; |
45 | 46 | ||
46 | /* Register maps for each ASIC */ | 47 | /* Register maps for each ASIC */ |
47 | extern const struct register_map calliope_register_map; | 48 | extern const struct register_map calliope_register_map; |
48 | extern const struct register_map cronus_register_map; | 49 | extern const struct register_map cronus_register_map; |
50 | extern const struct register_map gaia_register_map; | ||
49 | extern const struct register_map zeus_register_map; | 51 | extern const struct register_map zeus_register_map; |
50 | 52 | ||
51 | extern struct resource dvr_cronus_resources[]; | 53 | extern struct resource dvr_cronus_resources[]; |
54 | extern struct resource dvr_gaia_resources[]; | ||
52 | extern struct resource dvr_zeus_resources[]; | 55 | extern struct resource dvr_zeus_resources[]; |
53 | extern struct resource non_dvr_calliope_resources[]; | 56 | extern struct resource non_dvr_calliope_resources[]; |
54 | extern struct resource non_dvr_cronus_resources[]; | 57 | extern struct resource non_dvr_cronus_resources[]; |
55 | extern struct resource non_dvr_cronuslite_resources[]; | 58 | extern struct resource non_dvr_cronuslite_resources[]; |
59 | extern struct resource non_dvr_gaia_resources[]; | ||
56 | extern struct resource non_dvr_vz_calliope_resources[]; | 60 | extern struct resource non_dvr_vz_calliope_resources[]; |
57 | extern struct resource non_dvr_vze_calliope_resources[]; | 61 | extern struct resource non_dvr_vze_calliope_resources[]; |
58 | extern struct resource non_dvr_vzf_calliope_resources[]; | 62 | extern struct resource non_dvr_vzf_calliope_resources[]; |
diff --git a/arch/mips/include/asm/mach-powertv/asic_regs.h b/arch/mips/include/asm/mach-powertv/asic_regs.h index 1e11236c6dbc..2657ae6a7ec7 100644 --- a/arch/mips/include/asm/mach-powertv/asic_regs.h +++ b/arch/mips/include/asm/mach-powertv/asic_regs.h | |||
@@ -27,7 +27,8 @@ enum asic_type { | |||
27 | ASIC_CALLIOPE, | 27 | ASIC_CALLIOPE, |
28 | ASIC_CRONUS, | 28 | ASIC_CRONUS, |
29 | ASIC_CRONUSLITE, | 29 | ASIC_CRONUSLITE, |
30 | ASICS | 30 | ASIC_GAIA, |
31 | ASICS /* Number of supported ASICs */ | ||
31 | }; | 32 | }; |
32 | 33 | ||
33 | /* hardcoded values read from Chip Version registers */ | 34 | /* hardcoded values read from Chip Version registers */ |
@@ -37,6 +38,7 @@ enum asic_type { | |||
37 | 38 | ||
38 | #define NAND_FLASH_BASE 0x03000000 | 39 | #define NAND_FLASH_BASE 0x03000000 |
39 | #define CALLIOPE_IO_BASE 0x08000000 | 40 | #define CALLIOPE_IO_BASE 0x08000000 |
41 | #define GAIA_IO_BASE 0x09000000 | ||
40 | #define CRONUS_IO_BASE 0x09000000 | 42 | #define CRONUS_IO_BASE 0x09000000 |
41 | #define ZEUS_IO_BASE 0x09000000 | 43 | #define ZEUS_IO_BASE 0x09000000 |
42 | 44 | ||