MIPS: PowerTV: Correct ASIC device register names and locations

Correct ASIC device register names and addresses for USB devices.

Signed-off-by: David VomLehn <dvomlehn@cisco.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/1258/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/include/asm/mach-powertv/asic_reg_map.h b/arch/mips/include/asm/mach-powertv/asic_reg_map.h
index 6f26cb09828ed4aecf4574e5451ecbc331ad8e05..20348e817b0930cab7b3243b28d63449ab4c8e00 100644 (file)
--- a/arch/mips/include/asm/mach-powertv/asic_reg_map.h
+++ b/arch/mips/include/asm/mach-powertv/asic_reg_map.h
@@ -64,7 +64,7 @@ REGISTER_MAP_ELEMENT(int_level_0_1)
 REGISTER_MAP_ELEMENT(int_level_0_0)
 REGISTER_MAP_ELEMENT(int_docsis_en)
 REGISTER_MAP_ELEMENT(mips_pll_setup)
-REGISTER_MAP_ELEMENT(usb_fs)
+REGISTER_MAP_ELEMENT(fs432x4b4_usb_ctl)
 REGISTER_MAP_ELEMENT(test_bus)
 REGISTER_MAP_ELEMENT(crt_spare)
 REGISTER_MAP_ELEMENT(usb2_ohci_int_mask)

diff --git a/arch/mips/powertv/asic/asic-calliope.c b/arch/mips/powertv/asic/asic-calliope.c
index 1ae6623444b2d5c6d3cf21f51c47b58f17f83224..0a170e0ffeaae4ea84e0d5bfe1480203e69524be 100644 (file)
--- a/arch/mips/powertv/asic/asic-calliope.c
+++ b/arch/mips/powertv/asic/asic-calliope.c
@@ -77,7 +77,7 @@ const struct register_map calliope_register_map __initdata = {
        .int_docsis_en = {.phys = CALLIOPE_ADDR(0xA028F4)},
 
        .mips_pll_setup = {.phys = CALLIOPE_ADDR(0x980000)},
-       .usb_fs = {.phys = CALLIOPE_ADDR(0x980030)},
+       .fs432x4b4_usb_ctl = {.phys = CALLIOPE_ADDR(0x980030)},
        .test_bus = {.phys = CALLIOPE_ADDR(0x9800CC)},
        .crt_spare = {.phys = CALLIOPE_ADDR(0x9800d4)},
        .usb2_ohci_int_mask = {.phys = CALLIOPE_ADDR(0x9A000c)},

diff --git a/arch/mips/powertv/asic/asic-cronus.c b/arch/mips/powertv/asic/asic-cronus.c
index 5bb64bfb508b1e83e5f81dab74351d76d9413639..bbc0c122be5ee34c3ece4cb2fdee9ddf8efef384 100644 (file)
--- a/arch/mips/powertv/asic/asic-cronus.c
+++ b/arch/mips/powertv/asic/asic-cronus.c
@@ -77,13 +77,13 @@ const struct register_map cronus_register_map __initdata = {
        .int_docsis_en = {.phys = CRONUS_ADDR(0x2A28F4)},
 
        .mips_pll_setup = {.phys = CRONUS_ADDR(0x1C0000)},
-       .usb_fs = {.phys = CRONUS_ADDR(0x1C0018)},
+       .fs432x4b4_usb_ctl = {.phys = CRONUS_ADDR(0x1C0028)},
        .test_bus = {.phys = CRONUS_ADDR(0x1C00CC)},
        .crt_spare = {.phys = CRONUS_ADDR(0x1c00d4)},
        .usb2_ohci_int_mask = {.phys = CRONUS_ADDR(0x20000C)},
        .usb2_strap = {.phys = CRONUS_ADDR(0x200014)},
        .ehci_hcapbase = {.phys = CRONUS_ADDR(0x21FE00)},
-       .ohci_hc_revision = {.phys = CRONUS_ADDR(0x1E0000)},
+       .ohci_hc_revision = {.phys = CRONUS_ADDR(0x21fc00)},
        .bcm1_bs_lmi_steer = {.phys = CRONUS_ADDR(0x2E0008)},
        .usb2_control = {.phys = CRONUS_ADDR(0x2E004C)},
        .usb2_stbus_obc = {.phys = CRONUS_ADDR(0x21FF00)},

diff --git a/arch/mips/powertv/asic/asic-zeus.c b/arch/mips/powertv/asic/asic-zeus.c
index 095cbe10ebb90e92833ea4517df7bec9c81f3f21..4a05bb096476a1ef7751f528c16d9ea9015827a9 100644 (file)
--- a/arch/mips/powertv/asic/asic-zeus.c
+++ b/arch/mips/powertv/asic/asic-zeus.c
@@ -77,7 +77,7 @@ const struct register_map zeus_register_map __initdata = {
        .int_docsis_en = {.phys = ZEUS_ADDR(0x2828F4)},
 
        .mips_pll_setup = {.phys = ZEUS_ADDR(0x1a0000)},
-       .usb_fs = {.phys = ZEUS_ADDR(0x1a0018)},
+       .fs432x4b4_usb_ctl = {.phys = ZEUS_ADDR(0x1a0018)},
        .test_bus = {.phys = ZEUS_ADDR(0x1a0238)},
        .crt_spare = {.phys = ZEUS_ADDR(0x1a0090)},
        .usb2_ohci_int_mask = {.phys = ZEUS_ADDR(0x1e000c)},

diff --git a/arch/mips/powertv/asic/asic_devices.c b/arch/mips/powertv/asic/asic_devices.c
index c81dd497ed7ba1895f87ec14e56a2d298f4bca8a..006285c30648c78ce2fafccfa7a3ae02e872ee37 100644 (file)
--- a/arch/mips/powertv/asic/asic_devices.c
+++ b/arch/mips/powertv/asic/asic_devices.c
@@ -180,9 +180,9 @@ static void __init fs_update(int pe, int md, int sdiv, int disable_div_by_3)
        val = ((sdiv << 29) | (md << 24) | (pe<<8) | (sout<<3) | (byp<<2) |
                (nsb<<1) | (disable_div_by_3<<5));
 
-       asic_write(val, usb_fs);
-       asic_write(val | (en_prg<<4), usb_fs);
-       asic_write(val | (en_prg<<4) | pwr, usb_fs);
+       asic_write(val, fs432x4b4_usb_ctl);
+       asic_write(val | (en_prg<<4), fs432x4b4_usb_ctl);
+       asic_write(val | (en_prg<<4) | pwr, fs432x4b4_usb_ctl);
 }
 
 /*