diff options
Diffstat (limited to 'arch/mips/powertv/asic/asic_devices.c')
-rw-r--r-- | arch/mips/powertv/asic/asic_devices.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/arch/mips/powertv/asic/asic_devices.c b/arch/mips/powertv/asic/asic_devices.c index 006285c30648..095a887df39c 100644 --- a/arch/mips/powertv/asic/asic_devices.c +++ b/arch/mips/powertv/asic/asic_devices.c | |||
@@ -1,7 +1,6 @@ | |||
1 | /* | 1 | /* |
2 | * ASIC Device List Intialization | ||
3 | * | 2 | * |
4 | * Description: Defines the platform resources for the SA settop. | 3 | * Description: Defines the platform resources for Gaia-based settops. |
5 | * | 4 | * |
6 | * Copyright (C) 2005-2009 Scientific-Atlanta, Inc. | 5 | * Copyright (C) 2005-2009 Scientific-Atlanta, Inc. |
7 | * | 6 | * |
@@ -19,11 +18,6 @@ | |||
19 | * along with this program; if not, write to the Free Software | 18 | * along with this program; if not, write to the Free Software |
20 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 19 | * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
21 | * | 20 | * |
22 | * Author: Ken Eppinett | ||
23 | * David Schleef <ds@schleef.org> | ||
24 | * | ||
25 | * Description: Defines the platform resources for the SA settop. | ||
26 | * | ||
27 | * NOTE: The bootloader allocates persistent memory at an address which is | 21 | * NOTE: The bootloader allocates persistent memory at an address which is |
28 | * 16 MiB below the end of the highest address in KSEG0. All fixed | 22 | * 16 MiB below the end of the highest address in KSEG0. All fixed |
29 | * address memory reservations must avoid this region. | 23 | * address memory reservations must avoid this region. |
@@ -289,6 +283,9 @@ static __init noinline void platform_set_family(void) | |||
289 | case BOOTLDRFAMILY('F', '1'): | 283 | case BOOTLDRFAMILY('F', '1'): |
290 | platform_family = FAMILY_1500VZF; | 284 | platform_family = FAMILY_1500VZF; |
291 | break; | 285 | break; |
286 | case BOOTLDRFAMILY('8', '7'): | ||
287 | platform_family = FAMILY_8700; | ||
288 | break; | ||
292 | default: | 289 | default: |
293 | platform_family = -1; | 290 | platform_family = -1; |
294 | } | 291 | } |
@@ -526,6 +523,15 @@ void __init configure_platform(void) | |||
526 | "DVR_CAPABLE\n"); | 523 | "DVR_CAPABLE\n"); |
527 | break; | 524 | break; |
528 | 525 | ||
526 | case FAMILY_8700: | ||
527 | platform_features = FFS_CAPABLE | PCIE_CAPABLE; | ||
528 | asic = ASIC_GAIA; | ||
529 | set_register_map(GAIA_IO_BASE, &gaia_register_map); | ||
530 | gp_resources = dvr_gaia_resources; | ||
531 | |||
532 | pr_info("Platform: 8700 - GAIA, DVR_CAPABLE\n"); | ||
533 | break; | ||
534 | |||
529 | default: | 535 | default: |
530 | pr_crit("Platform: UNKNOWN PLATFORM\n"); | 536 | pr_crit("Platform: UNKNOWN PLATFORM\n"); |
531 | break; | 537 | break; |