Commit 28d7d213a1ba4f1891eebb680f8a16a731d7a72a
Committed by
Ralf Baechle
Ralf Baechle
1 parent
93871603a7
Exists in
master
and in
39 other branches
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>
Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff
arch/mips/powertv/asic/asic_devices.c
| ... | ... | @@ -472,6 +472,9 @@ |
| 472 | 472 | * it*/ |
| 473 | 473 | platform_features = FFS_CAPABLE | DISPLAY_CAPABLE; |
| 474 | 474 | |
| 475 | + /* Cronus and Cronus Lite have the same register map */ | |
| 476 | + set_register_map(CRONUS_IO_BASE, &cronus_register_map); | |
| 477 | + | |
| 475 | 478 | /* ASIC version will determine if this is a real CronusLite or |
| 476 | 479 | * Castrati(Cronus) */ |
| 477 | 480 | chipversion = asic_read(chipver3) << 24; |
| ... | ... | @@ -484,8 +487,6 @@ |
| 484 | 487 | else |
| 485 | 488 | asic = ASIC_CRONUSLITE; |
| 486 | 489 | |
| 487 | - /* Cronus and Cronus Lite have the same register map */ | |
| 488 | - set_register_map(CRONUS_IO_BASE, &cronus_register_map); | |
| 489 | 490 | gp_resources = non_dvr_cronuslite_resources; |
| 490 | 491 | pr_info("Platform: 4600 - %s, NON_DVR_CAPABLE, " |
| 491 | 492 | "chipversion=0x%08X\n", |