diff options
| author | David VomLehn <dvomlehn@cisco.com> | 2010-06-18 16:51:49 -0700 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2010-07-26 19:08:16 +0100 |
| commit | 28d7d213a1ba4f1891eebb680f8a16a731d7a72a (patch) | |
| tree | 6f6f4f93967baae2c0ebad72680acea2b4a2e096 /arch | |
| parent | 93871603a74563b3683d09ef13da954670829c45 (diff) | |
| download | linux-3.10-28d7d213a1ba4f1891eebb680f8a16a731d7a72a.tar.gz linux-3.10-28d7d213a1ba4f1891eebb680f8a16a731d7a72a.tar.bz2 linux-3.10-28d7d213a1ba4f1891eebb680f8a16a731d7a72a.zip | |
MIPS: PowerTV: Move register setup to before reading registers.
The 4600 family code reads registers to differentiate between two ASIC
variants, but this was being done prior to the register setup. This moves
register setup before the reading code.
Signed-off-by: David VomLehn <dvomlehn@cisco.com>
To: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1392/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/powertv/asic/asic_devices.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/powertv/asic/asic_devices.c b/arch/mips/powertv/asic/asic_devices.c index 8ee77887306..9ec523e4dd0 100644 --- a/arch/mips/powertv/asic/asic_devices.c +++ b/arch/mips/powertv/asic/asic_devices.c @@ -472,6 +472,9 @@ void __init configure_platform(void) * it*/ platform_features = FFS_CAPABLE | DISPLAY_CAPABLE; + /* Cronus and Cronus Lite have the same register map */ + set_register_map(CRONUS_IO_BASE, &cronus_register_map); + /* ASIC version will determine if this is a real CronusLite or * Castrati(Cronus) */ chipversion = asic_read(chipver3) << 24; @@ -484,8 +487,6 @@ void __init configure_platform(void) else asic = ASIC_CRONUSLITE; - /* Cronus and Cronus Lite have the same register map */ - set_register_map(CRONUS_IO_BASE, &cronus_register_map); gp_resources = non_dvr_cronuslite_resources; pr_info("Platform: 4600 - %s, NON_DVR_CAPABLE, " "chipversion=0x%08X\n", |