linux-mips
[Top] [All Lists]

[PATCH][MIPS] powertv: move device address setup before use

To: linux-mips@linux-mips.org
Subject: [PATCH][MIPS] powertv: move device address setup before use
From: David VomLehn <dvomlehn@cisco.com>
Date: Fri, 18 Jun 2010 16:51:49 -0700
Authentication-results: sj-iport-6.cisco.com; dkim=neutral (message not signed) header.i=none
Cc: ralf@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.18 (2008-05-17)
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>
---
 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 2276c18..006285c 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",

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH][MIPS] powertv: move device address setup before use, David VomLehn <=