aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/powertv
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/powertv')
-rw-r--r--arch/mips/powertv/asic/asic-calliope.c10
-rw-r--r--arch/mips/powertv/asic/asic-cronus.c6
-rw-r--r--arch/mips/powertv/asic/asic-gaia.c2
-rw-r--r--arch/mips/powertv/asic/asic-zeus.c6
-rw-r--r--arch/mips/powertv/asic/asic_devices.c8
-rw-r--r--arch/mips/powertv/asic/asic_int.c4
-rw-r--r--arch/mips/powertv/asic/irq_asic.c4
-rw-r--r--arch/mips/powertv/asic/prealloc-calliope.c10
-rw-r--r--arch/mips/powertv/asic/prealloc-cronus.c12
-rw-r--r--arch/mips/powertv/asic/prealloc-cronuslite.c8
-rw-r--r--arch/mips/powertv/asic/prealloc-gaia.c382
-rw-r--r--arch/mips/powertv/asic/prealloc-zeus.c10
-rw-r--r--arch/mips/powertv/init.c2
-rw-r--r--arch/mips/powertv/ioremap.c4
-rw-r--r--arch/mips/powertv/memory.c2
-rw-r--r--arch/mips/powertv/powertv-usb.c46
16 files changed, 258 insertions, 258 deletions
diff --git a/arch/mips/powertv/asic/asic-calliope.c b/arch/mips/powertv/asic/asic-calliope.c
index 7773f3d956b0..2f539b43f56b 100644
--- a/arch/mips/powertv/asic/asic-calliope.c
+++ b/arch/mips/powertv/asic/asic-calliope.c
@@ -17,10 +17,10 @@
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19 * 19 *
20 * Author: Ken Eppinett 20 * Author: Ken Eppinett
21 * David Schleef <ds@schleef.org> 21 * David Schleef <ds@schleef.org>
22 * 22 *
23 * Description: Defines the platform resources for the SA settop. 23 * Description: Defines the platform resources for the SA settop.
24 */ 24 */
25 25
26#include <linux/init.h> 26#include <linux/init.h>
@@ -90,12 +90,12 @@ const struct register_map calliope_register_map __initconst = {
90 .usb2_stbus_mess_size = {.phys = CALLIOPE_ADDR(0x9BFF04)}, 90 .usb2_stbus_mess_size = {.phys = CALLIOPE_ADDR(0x9BFF04)},
91 .usb2_stbus_chunk_size = {.phys = CALLIOPE_ADDR(0x9BFF08)}, 91 .usb2_stbus_chunk_size = {.phys = CALLIOPE_ADDR(0x9BFF08)},
92 92
93 .pcie_regs = {.phys = 0x000000}, /* -doesn't exist- */ 93 .pcie_regs = {.phys = 0x000000}, /* -doesn't exist- */
94 .tim_ch = {.phys = CALLIOPE_ADDR(0xA02C10)}, 94 .tim_ch = {.phys = CALLIOPE_ADDR(0xA02C10)},
95 .tim_cl = {.phys = CALLIOPE_ADDR(0xA02C14)}, 95 .tim_cl = {.phys = CALLIOPE_ADDR(0xA02C14)},
96 .gpio_dout = {.phys = CALLIOPE_ADDR(0xA02c20)}, 96 .gpio_dout = {.phys = CALLIOPE_ADDR(0xA02c20)},
97 .gpio_din = {.phys = CALLIOPE_ADDR(0xA02c24)}, 97 .gpio_din = {.phys = CALLIOPE_ADDR(0xA02c24)},
98 .gpio_dir = {.phys = CALLIOPE_ADDR(0xA02c2C)}, 98 .gpio_dir = {.phys = CALLIOPE_ADDR(0xA02c2C)},
99 .watchdog = {.phys = CALLIOPE_ADDR(0xA02c30)}, 99 .watchdog = {.phys = CALLIOPE_ADDR(0xA02c30)},
100 .front_panel = {.phys = 0x000000}, /* -not used- */ 100 .front_panel = {.phys = 0x000000}, /* -not used- */
101}; 101};
diff --git a/arch/mips/powertv/asic/asic-cronus.c b/arch/mips/powertv/asic/asic-cronus.c
index da076db7b7ed..7f8f3429b35a 100644
--- a/arch/mips/powertv/asic/asic-cronus.c
+++ b/arch/mips/powertv/asic/asic-cronus.c
@@ -17,10 +17,10 @@
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19 * 19 *
20 * Author: Ken Eppinett 20 * Author: Ken Eppinett
21 * David Schleef <ds@schleef.org> 21 * David Schleef <ds@schleef.org>
22 * 22 *
23 * Description: Defines the platform resources for the SA settop. 23 * Description: Defines the platform resources for the SA settop.
24 */ 24 */
25 25
26#include <linux/init.h> 26#include <linux/init.h>
diff --git a/arch/mips/powertv/asic/asic-gaia.c b/arch/mips/powertv/asic/asic-gaia.c
index 47683b370e74..1265b49012e6 100644
--- a/arch/mips/powertv/asic/asic-gaia.c
+++ b/arch/mips/powertv/asic/asic-gaia.c
@@ -17,7 +17,7 @@
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19 * 19 *
20 * Author: David VomLehn 20 * Author: David VomLehn
21 */ 21 */
22 22
23#include <linux/init.h> 23#include <linux/init.h>
diff --git a/arch/mips/powertv/asic/asic-zeus.c b/arch/mips/powertv/asic/asic-zeus.c
index 6ff4b10f09da..14e7de137e03 100644
--- a/arch/mips/powertv/asic/asic-zeus.c
+++ b/arch/mips/powertv/asic/asic-zeus.c
@@ -17,10 +17,10 @@
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19 * 19 *
20 * Author: Ken Eppinett 20 * Author: Ken Eppinett
21 * David Schleef <ds@schleef.org> 21 * David Schleef <ds@schleef.org>
22 * 22 *
23 * Description: Defines the platform resources for the SA settop. 23 * Description: Defines the platform resources for the SA settop.
24 */ 24 */
25 25
26#include <linux/init.h> 26#include <linux/init.h>
diff --git a/arch/mips/powertv/asic/asic_devices.c b/arch/mips/powertv/asic/asic_devices.c
index bce1872249ba..d38b095fd0d0 100644
--- a/arch/mips/powertv/asic/asic_devices.c
+++ b/arch/mips/powertv/asic/asic_devices.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * 2 *
3 * Description: Defines the platform resources for Gaia-based settops. 3 * Description: Defines the platform resources for Gaia-based settops.
4 * 4 *
5 * Copyright (C) 2005-2009 Scientific-Atlanta, Inc. 5 * Copyright (C) 2005-2009 Scientific-Atlanta, Inc.
6 * 6 *
@@ -90,12 +90,12 @@ struct resource asic_resource = {
90 90
91/* 91/*
92 * Allow override of bootloader-specified model 92 * Allow override of bootloader-specified model
93 * Returns zero on success, a negative errno value on failure. This parameter 93 * Returns zero on success, a negative errno value on failure. This parameter
94 * allows overriding of the bootloader-specified model. 94 * allows overriding of the bootloader-specified model.
95 */ 95 */
96static char __initdata cmdline[COMMAND_LINE_SIZE]; 96static char __initdata cmdline[COMMAND_LINE_SIZE];
97 97
98#define FORCEFAMILY_PARAM "forcefamily" 98#define FORCEFAMILY_PARAM "forcefamily"
99 99
100/* 100/*
101 * check_forcefamily - check for, and parse, forcefamily command line parameter 101 * check_forcefamily - check for, and parse, forcefamily command line parameter
@@ -486,7 +486,7 @@ static void __init pmem_setup_resource(void)
486 resource->start = phys_to_dma(pmemaddr - 0x80000000); 486 resource->start = phys_to_dma(pmemaddr - 0x80000000);
487 resource->end = resource->start + pmemlen - 1; 487 resource->end = resource->start + pmemlen - 1;
488 488
489 pr_info("persistent memory: start=0x%x end=0x%x\n", 489 pr_info("persistent memory: start=0x%x end=0x%x\n",
490 resource->start, resource->end); 490 resource->start, resource->end);
491 } 491 }
492} 492}
diff --git a/arch/mips/powertv/asic/asic_int.c b/arch/mips/powertv/asic/asic_int.c
index 99d82e10000b..f44cd9295cae 100644
--- a/arch/mips/powertv/asic/asic_int.c
+++ b/arch/mips/powertv/asic/asic_int.c
@@ -2,7 +2,7 @@
2 * Carsten Langgaard, carstenl@mips.com 2 * Carsten Langgaard, carstenl@mips.com
3 * Copyright (C) 2000, 2001, 2004 MIPS Technologies, Inc. 3 * Copyright (C) 2000, 2001, 2004 MIPS Technologies, Inc.
4 * Copyright (C) 2001 Ralf Baechle 4 * Copyright (C) 2001 Ralf Baechle
5 * Portions copyright (C) 2009 Cisco Systems, Inc. 5 * Portions copyright (C) 2009 Cisco Systems, Inc.
6 * 6 *
7 * This program is free software; you can distribute it and/or modify it 7 * This program is free software; you can distribute it and/or modify it
8 * under the terms of the GNU General Public License (Version 2) as 8 * under the terms of the GNU General Public License (Version 2) as
@@ -64,7 +64,7 @@ static void asic_irqdispatch(void)
64 64
65 irq = get_int(); 65 irq = get_int();
66 if (irq < 0) 66 if (irq < 0)
67 return; /* interrupt has already been cleared */ 67 return; /* interrupt has already been cleared */
68 68
69 do_IRQ(irq); 69 do_IRQ(irq);
70} 70}
diff --git a/arch/mips/powertv/asic/irq_asic.c b/arch/mips/powertv/asic/irq_asic.c
index fa9ae9584710..9344902dc586 100644
--- a/arch/mips/powertv/asic/irq_asic.c
+++ b/arch/mips/powertv/asic/irq_asic.c
@@ -5,8 +5,8 @@
5 * Modified from arch/mips/kernel/irq-rm7000.c: 5 * Modified from arch/mips/kernel/irq-rm7000.c:
6 * Copyright (C) 2003 Ralf Baechle 6 * Copyright (C) 2003 Ralf Baechle
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify it 8 * This program is free software; you can redistribute it and/or modify it
9 * under the terms of the GNU General Public License as published by the 9 * under the terms of the GNU General Public License as published by the
10 * Free Software Foundation; either version 2 of the License, or (at your 10 * Free Software Foundation; either version 2 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
12 */ 12 */
diff --git a/arch/mips/powertv/asic/prealloc-calliope.c b/arch/mips/powertv/asic/prealloc-calliope.c
index 3fc5d46687a9..98dc51650577 100644
--- a/arch/mips/powertv/asic/prealloc-calliope.c
+++ b/arch/mips/powertv/asic/prealloc-calliope.c
@@ -17,8 +17,8 @@
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19 * 19 *
20 * Author: Ken Eppinett 20 * Author: Ken Eppinett
21 * David Schleef <ds@schleef.org> 21 * David Schleef <ds@schleef.org>
22 */ 22 */
23 23
24#include <linux/init.h> 24#include <linux/init.h>
@@ -153,7 +153,7 @@ struct resource non_dvr_calliope_resources[] __initdata =
153 * End of Resource marker 153 * End of Resource marker
154 */ 154 */
155 { 155 {
156 .flags = 0, 156 .flags = 0,
157 }, 157 },
158}; 158};
159 159
@@ -260,7 +260,7 @@ struct resource non_dvr_vze_calliope_resources[] __initdata =
260 * End of Resource marker 260 * End of Resource marker
261 */ 261 */
262 { 262 {
263 .flags = 0, 263 .flags = 0,
264 }, 264 },
265}; 265};
266 266
@@ -380,6 +380,6 @@ struct resource non_dvr_vzf_calliope_resources[] __initdata =
380 * End of Resource marker 380 * End of Resource marker
381 */ 381 */
382 { 382 {
383 .flags = 0, 383 .flags = 0,
384 }, 384 },
385}; 385};
diff --git a/arch/mips/powertv/asic/prealloc-cronus.c b/arch/mips/powertv/asic/prealloc-cronus.c
index c532b50521ec..7c6ce7596935 100644
--- a/arch/mips/powertv/asic/prealloc-cronus.c
+++ b/arch/mips/powertv/asic/prealloc-cronus.c
@@ -17,8 +17,8 @@
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19 * 19 *
20 * Author: Ken Eppinett 20 * Author: Ken Eppinett
21 * David Schleef <ds@schleef.org> 21 * David Schleef <ds@schleef.org>
22 */ 22 */
23 23
24#include <linux/init.h> 24#include <linux/init.h>
@@ -78,7 +78,7 @@ struct resource dvr_cronus_resources[] __initdata =
78 * 78 *
79 * This memory area is used for allocating buffers for Video decoding 79 * This memory area is used for allocating buffers for Video decoding
80 * purposes. Allocation/De-allocation within this buffer is managed 80 * purposes. Allocation/De-allocation within this buffer is managed
81 * by the STAVMEM driver of the STAPI. They could be Decimated 81 * by the STAVMEM driver of the STAPI. They could be Decimated
82 * Picture Buffers, Intermediate Buffers, as deemed necessary for 82 * Picture Buffers, Intermediate Buffers, as deemed necessary for
83 * video decoding purposes, for any video decoders on Zeus. 83 * video decoding purposes, for any video decoders on Zeus.
84 */ 84 */
@@ -185,7 +185,7 @@ struct resource dvr_cronus_resources[] __initdata =
185 * End of Resource marker 185 * End of Resource marker
186 */ 186 */
187 { 187 {
188 .flags = 0, 188 .flags = 0,
189 }, 189 },
190}; 190};
191 191
@@ -241,7 +241,7 @@ struct resource non_dvr_cronus_resources[] __initdata =
241 * 241 *
242 * This memory area is used for allocating buffers for Video decoding 242 * This memory area is used for allocating buffers for Video decoding
243 * purposes. Allocation/De-allocation within this buffer is managed 243 * purposes. Allocation/De-allocation within this buffer is managed
244 * by the STAVMEM driver of the STAPI. They could be Decimated 244 * by the STAVMEM driver of the STAPI. They could be Decimated
245 * Picture Buffers, Intermediate Buffers, as deemed necessary for 245 * Picture Buffers, Intermediate Buffers, as deemed necessary for
246 * video decoding purposes, for any video decoders on Zeus. 246 * video decoding purposes, for any video decoders on Zeus.
247 */ 247 */
@@ -335,6 +335,6 @@ struct resource non_dvr_cronus_resources[] __initdata =
335 * End of Resource marker 335 * End of Resource marker
336 */ 336 */
337 { 337 {
338 .flags = 0, 338 .flags = 0,
339 }, 339 },
340}; 340};
diff --git a/arch/mips/powertv/asic/prealloc-cronuslite.c b/arch/mips/powertv/asic/prealloc-cronuslite.c
index b5537e49e7f5..a7937ba7b4c0 100644
--- a/arch/mips/powertv/asic/prealloc-cronuslite.c
+++ b/arch/mips/powertv/asic/prealloc-cronuslite.c
@@ -17,8 +17,8 @@
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19 * 19 *
20 * Author: Ken Eppinett 20 * Author: Ken Eppinett
21 * David Schleef <ds@schleef.org> 21 * David Schleef <ds@schleef.org>
22 */ 22 */
23 23
24#include <linux/init.h> 24#include <linux/init.h>
@@ -65,7 +65,7 @@ struct resource non_dvr_cronuslite_resources[] __initdata =
65 * 65 *
66 * This memory area is used for allocating buffers for Video decoding 66 * This memory area is used for allocating buffers for Video decoding
67 * purposes. Allocation/De-allocation within this buffer is managed 67 * purposes. Allocation/De-allocation within this buffer is managed
68 * by the STAVMEM driver of the STAPI. They could be Decimated 68 * by the STAVMEM driver of the STAPI. They could be Decimated
69 * Picture Buffers, Intermediate Buffers, as deemed necessary for 69 * Picture Buffers, Intermediate Buffers, as deemed necessary for
70 * video decoding purposes, for any video decoders on Zeus. 70 * video decoding purposes, for any video decoders on Zeus.
71 */ 71 */
@@ -169,6 +169,6 @@ struct resource non_dvr_cronuslite_resources[] __initdata =
169 * End of Resource marker 169 * End of Resource marker
170 */ 170 */
171 { 171 {
172 .flags = 0, 172 .flags = 0,
173 }, 173 },
174}; 174};
diff --git a/arch/mips/powertv/asic/prealloc-gaia.c b/arch/mips/powertv/asic/prealloc-gaia.c
index 8ac8c7aeb986..2303bbfe6b82 100644
--- a/arch/mips/powertv/asic/prealloc-gaia.c
+++ b/arch/mips/powertv/asic/prealloc-gaia.c
@@ -17,7 +17,7 @@
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19 * 19 *
20 * Author: David VomLehn 20 * Author: David VomLehn
21 */ 21 */
22 22
23#include <linux/init.h> 23#include <linux/init.h>
@@ -33,22 +33,22 @@ struct resource dvr_gaia_resources[] __initdata = {
33 * 33 *
34 */ 34 */
35 { 35 {
36 .name = "ST231aImage", /* Delta-Mu 1 image and ram */ 36 .name = "ST231aImage", /* Delta-Mu 1 image and ram */
37 .start = 0x24000000, 37 .start = 0x24000000,
38 .end = 0x241FFFFF, /* 2MiB */ 38 .end = 0x241FFFFF, /* 2MiB */
39 .flags = IORESOURCE_MEM, 39 .flags = IORESOURCE_MEM,
40 }, 40 },
41 { 41 {
42 .name = "ST231aMonitor", /* 8KiB block ST231a monitor */ 42 .name = "ST231aMonitor", /* 8KiB block ST231a monitor */
43 .start = 0x24200000, 43 .start = 0x24200000,
44 .end = 0x24201FFF, 44 .end = 0x24201FFF,
45 .flags = IORESOURCE_MEM, 45 .flags = IORESOURCE_MEM,
46 }, 46 },
47 { 47 {
48 .name = "MediaMemory1", 48 .name = "MediaMemory1",
49 .start = 0x24202000, 49 .start = 0x24202000,
50 .end = 0x25FFFFFF, /*~29.9MiB (32MiB - (2MiB + 8KiB)) */ 50 .end = 0x25FFFFFF, /*~29.9MiB (32MiB - (2MiB + 8KiB)) */
51 .flags = IORESOURCE_MEM, 51 .flags = IORESOURCE_MEM,
52 }, 52 },
53 /* 53 /*
54 * 54 *
@@ -56,22 +56,22 @@ struct resource dvr_gaia_resources[] __initdata = {
56 * 56 *
57 */ 57 */
58 { 58 {
59 .name = "ST231bImage", /* Delta-Mu 2 image and ram */ 59 .name = "ST231bImage", /* Delta-Mu 2 image and ram */
60 .start = 0x60000000, 60 .start = 0x60000000,
61 .end = 0x601FFFFF, /* 2MiB */ 61 .end = 0x601FFFFF, /* 2MiB */
62 .flags = IORESOURCE_IO, 62 .flags = IORESOURCE_IO,
63 }, 63 },
64 { 64 {
65 .name = "ST231bMonitor", /* 8KiB block ST231b monitor */ 65 .name = "ST231bMonitor", /* 8KiB block ST231b monitor */
66 .start = 0x60200000, 66 .start = 0x60200000,
67 .end = 0x60201FFF, 67 .end = 0x60201FFF,
68 .flags = IORESOURCE_IO, 68 .flags = IORESOURCE_IO,
69 }, 69 },
70 { 70 {
71 .name = "MediaMemory2", 71 .name = "MediaMemory2",
72 .start = 0x60202000, 72 .start = 0x60202000,
73 .end = 0x61FFFFFF, /*~29.9MiB (32MiB - (2MiB + 8KiB)) */ 73 .end = 0x61FFFFFF, /*~29.9MiB (32MiB - (2MiB + 8KiB)) */
74 .flags = IORESOURCE_IO, 74 .flags = IORESOURCE_IO,
75 }, 75 },
76 /* 76 /*
77 * 77 *
@@ -87,28 +87,28 @@ struct resource dvr_gaia_resources[] __initdata = {
87 * 87 *
88 */ 88 */
89 { 89 {
90 .name = "DSP_Image_Buff", 90 .name = "DSP_Image_Buff",
91 .start = 0x00000000, 91 .start = 0x00000000,
92 .end = 0x000FFFFF, 92 .end = 0x000FFFFF,
93 .flags = IORESOURCE_MEM, 93 .flags = IORESOURCE_MEM,
94 }, 94 },
95 { 95 {
96 .name = "ADSC_CPU_PCM_Buff", 96 .name = "ADSC_CPU_PCM_Buff",
97 .start = 0x00000000, 97 .start = 0x00000000,
98 .end = 0x00009FFF, 98 .end = 0x00009FFF,
99 .flags = IORESOURCE_MEM, 99 .flags = IORESOURCE_MEM,
100 }, 100 },
101 { 101 {
102 .name = "ADSC_AUX_Buff", 102 .name = "ADSC_AUX_Buff",
103 .start = 0x00000000, 103 .start = 0x00000000,
104 .end = 0x00003FFF, 104 .end = 0x00003FFF,
105 .flags = IORESOURCE_MEM, 105 .flags = IORESOURCE_MEM,
106 }, 106 },
107 { 107 {
108 .name = "ADSC_Main_Buff", 108 .name = "ADSC_Main_Buff",
109 .start = 0x00000000, 109 .start = 0x00000000,
110 .end = 0x00003FFF, 110 .end = 0x00003FFF,
111 .flags = IORESOURCE_MEM, 111 .flags = IORESOURCE_MEM,
112 }, 112 },
113 /* 113 /*
114 * 114 *
@@ -119,16 +119,16 @@ struct resource dvr_gaia_resources[] __initdata = {
119 * Arbitrary Based Buffers: 119 * Arbitrary Based Buffers:
120 * This memory area is used for allocating buffers for Video decoding 120 * This memory area is used for allocating buffers for Video decoding
121 * purposes. Allocation/De-allocation within this buffer is managed 121 * purposes. Allocation/De-allocation within this buffer is managed
122 * by the STAVMEM driver of the STAPI. They could be Decimated 122 * by the STAVMEM driver of the STAPI. They could be Decimated
123 * Picture Buffers, Intermediate Buffers, as deemed necessary for 123 * Picture Buffers, Intermediate Buffers, as deemed necessary for
124 * video decoding purposes, for any video decoders on Zeus. 124 * video decoding purposes, for any video decoders on Zeus.
125 * 125 *
126 */ 126 */
127 { 127 {
128 .name = "AVMEMPartition0", 128 .name = "AVMEMPartition0",
129 .start = 0x63580000, 129 .start = 0x63580000,
130 .end = 0x64180000 - 1, /* 12 MB total */ 130 .end = 0x64180000 - 1, /* 12 MB total */
131 .flags = IORESOURCE_IO, 131 .flags = IORESOURCE_IO,
132 }, 132 },
133 /* 133 /*
134 * 134 *
@@ -141,10 +141,10 @@ struct resource dvr_gaia_resources[] __initdata = {
141 * 141 *
142 */ 142 */
143 { 143 {
144 .name = "Docsis", 144 .name = "Docsis",
145 .start = 0x62000000, 145 .start = 0x62000000,
146 .end = 0x62700000 - 1, /* 7 MB total */ 146 .end = 0x62700000 - 1, /* 7 MB total */
147 .flags = IORESOURCE_IO, 147 .flags = IORESOURCE_IO,
148 }, 148 },
149 /* 149 /*
150 * 150 *
@@ -157,10 +157,10 @@ struct resource dvr_gaia_resources[] __initdata = {
157 * 157 *
158 */ 158 */
159 { 159 {
160 .name = "GraphicsHeap", 160 .name = "GraphicsHeap",
161 .start = 0x62700000, 161 .start = 0x62700000,
162 .end = 0x63500000 - 1, /* 14 MB total */ 162 .end = 0x63500000 - 1, /* 14 MB total */
163 .flags = IORESOURCE_IO, 163 .flags = IORESOURCE_IO,
164 }, 164 },
165 /* 165 /*
166 * 166 *
@@ -173,10 +173,10 @@ struct resource dvr_gaia_resources[] __initdata = {
173 * 173 *
174 */ 174 */
175 { 175 {
176 .name = "MulticomSHM", 176 .name = "MulticomSHM",
177 .start = 0x26000000, 177 .start = 0x26000000,
178 .end = 0x26020000 - 1, 178 .end = 0x26020000 - 1,
179 .flags = IORESOURCE_MEM, 179 .flags = IORESOURCE_MEM,
180 }, 180 },
181 /* 181 /*
182 * 182 *
@@ -189,10 +189,10 @@ struct resource dvr_gaia_resources[] __initdata = {
189 * 189 *
190 */ 190 */
191 { 191 {
192 .name = "BMM_Buffer", 192 .name = "BMM_Buffer",
193 .start = 0x00000000, 193 .start = 0x00000000,
194 .end = 0x00280000 - 1, 194 .end = 0x00280000 - 1,
195 .flags = IORESOURCE_MEM, 195 .flags = IORESOURCE_MEM,
196 }, 196 },
197 /* 197 /*
198 * 198 *
@@ -205,10 +205,10 @@ struct resource dvr_gaia_resources[] __initdata = {
205 * 205 *
206 */ 206 */
207 { 207 {
208 .name = "DisplayBins0", 208 .name = "DisplayBins0",
209 .start = 0x00000000, 209 .start = 0x00000000,
210 .end = 0x00000FFF, /* 4 KB total */ 210 .end = 0x00000FFF, /* 4 KB total */
211 .flags = IORESOURCE_MEM, 211 .flags = IORESOURCE_MEM,
212 }, 212 },
213 /* 213 /*
214 * 214 *
@@ -221,10 +221,10 @@ struct resource dvr_gaia_resources[] __initdata = {
221 * 221 *
222 */ 222 */
223 { 223 {
224 .name = "DisplayBins1", 224 .name = "DisplayBins1",
225 .start = 0x64AD4000, 225 .start = 0x64AD4000,
226 .end = 0x64AD5000 - 1, /* 4 KB total */ 226 .end = 0x64AD5000 - 1, /* 4 KB total */
227 .flags = IORESOURCE_IO, 227 .flags = IORESOURCE_IO,
228 }, 228 },
229 /* 229 /*
230 * 230 *
@@ -237,11 +237,11 @@ struct resource dvr_gaia_resources[] __initdata = {
237 * 237 *
238 */ 238 */
239 { 239 {
240 .name = "ITFS", 240 .name = "ITFS",
241 .start = 0x64180000, 241 .start = 0x64180000,
242 /* 815,104 bytes each for 2 ITFS partitions. */ 242 /* 815,104 bytes each for 2 ITFS partitions. */
243 .end = 0x6430DFFF, 243 .end = 0x6430DFFF,
244 .flags = IORESOURCE_IO, 244 .flags = IORESOURCE_IO,
245 }, 245 },
246 /* 246 /*
247 * 247 *
@@ -254,17 +254,17 @@ struct resource dvr_gaia_resources[] __initdata = {
254 * 254 *
255 */ 255 */
256 { 256 {
257 .name = "AvfsDmaMem", 257 .name = "AvfsDmaMem",
258 .start = 0x6430E000, 258 .start = 0x6430E000,
259 /* (945K * 8) = (128K *3) 5 playbacks / 3 server */ 259 /* (945K * 8) = (128K *3) 5 playbacks / 3 server */
260 .end = 0x64AD0000 - 1, 260 .end = 0x64AD0000 - 1,
261 .flags = IORESOURCE_IO, 261 .flags = IORESOURCE_IO,
262 }, 262 },
263 { 263 {
264 .name = "AvfsFileSys", 264 .name = "AvfsFileSys",
265 .start = 0x64AD0000, 265 .start = 0x64AD0000,
266 .end = 0x64AD1000 - 1, /* 4K */ 266 .end = 0x64AD1000 - 1, /* 4K */
267 .flags = IORESOURCE_IO, 267 .flags = IORESOURCE_IO,
268 }, 268 },
269 /* 269 /*
270 * 270 *
@@ -277,10 +277,10 @@ struct resource dvr_gaia_resources[] __initdata = {
277 * 277 *
278 */ 278 */
279 { 279 {
280 .name = "SmartCardInfo", 280 .name = "SmartCardInfo",
281 .start = 0x64AD1000, 281 .start = 0x64AD1000,
282 .end = 0x64AD3800 - 1, 282 .end = 0x64AD3800 - 1,
283 .flags = IORESOURCE_IO, 283 .flags = IORESOURCE_IO,
284 }, 284 },
285 /* 285 /*
286 * 286 *
@@ -290,22 +290,22 @@ struct resource dvr_gaia_resources[] __initdata = {
290 * NP IPC - must be video bank 2 290 * NP IPC - must be video bank 2
291 */ 291 */
292 { 292 {
293 .name = "NP_Reset_Vector", 293 .name = "NP_Reset_Vector",
294 .start = 0x27c00000, 294 .start = 0x27c00000,
295 .end = 0x27c01000 - 1, 295 .end = 0x27c01000 - 1,
296 .flags = IORESOURCE_MEM, 296 .flags = IORESOURCE_MEM,
297 }, 297 },
298 { 298 {
299 .name = "NP_Image", 299 .name = "NP_Image",
300 .start = 0x27020000, 300 .start = 0x27020000,
301 .end = 0x27060000 - 1, 301 .end = 0x27060000 - 1,
302 .flags = IORESOURCE_MEM, 302 .flags = IORESOURCE_MEM,
303 }, 303 },
304 { 304 {
305 .name = "NP_IPC", 305 .name = "NP_IPC",
306 .start = 0x63500000, 306 .start = 0x63500000,
307 .end = 0x63580000 - 1, 307 .end = 0x63580000 - 1,
308 .flags = IORESOURCE_IO, 308 .flags = IORESOURCE_IO,
309 }, 309 },
310 /* 310 /*
311 * Add other resources here 311 * Add other resources here
@@ -323,22 +323,22 @@ struct resource non_dvr_gaia_resources[] __initdata = {
323 * 323 *
324 */ 324 */
325 { 325 {
326 .name = "ST231aImage", /* Delta-Mu 1 image and ram */ 326 .name = "ST231aImage", /* Delta-Mu 1 image and ram */
327 .start = 0x24000000, 327 .start = 0x24000000,
328 .end = 0x241FFFFF, /* 2MiB */ 328 .end = 0x241FFFFF, /* 2MiB */
329 .flags = IORESOURCE_MEM, 329 .flags = IORESOURCE_MEM,
330 }, 330 },
331 { 331 {
332 .name = "ST231aMonitor", /* 8KiB block ST231a monitor */ 332 .name = "ST231aMonitor", /* 8KiB block ST231a monitor */
333 .start = 0x24200000, 333 .start = 0x24200000,
334 .end = 0x24201FFF, 334 .end = 0x24201FFF,
335 .flags = IORESOURCE_MEM, 335 .flags = IORESOURCE_MEM,
336 }, 336 },
337 { 337 {
338 .name = "MediaMemory1", 338 .name = "MediaMemory1",
339 .start = 0x24202000, 339 .start = 0x24202000,
340 .end = 0x25FFFFFF, /*~29.9MiB (32MiB - (2MiB + 8KiB)) */ 340 .end = 0x25FFFFFF, /*~29.9MiB (32MiB - (2MiB + 8KiB)) */
341 .flags = IORESOURCE_MEM, 341 .flags = IORESOURCE_MEM,
342 }, 342 },
343 /* 343 /*
344 * 344 *
@@ -346,22 +346,22 @@ struct resource non_dvr_gaia_resources[] __initdata = {
346 * 346 *
347 */ 347 */
348 { 348 {
349 .name = "ST231bImage", /* Delta-Mu 2 image and ram */ 349 .name = "ST231bImage", /* Delta-Mu 2 image and ram */
350 .start = 0x60000000, 350 .start = 0x60000000,
351 .end = 0x601FFFFF, /* 2MiB */ 351 .end = 0x601FFFFF, /* 2MiB */
352 .flags = IORESOURCE_IO, 352 .flags = IORESOURCE_IO,
353 }, 353 },
354 { 354 {
355 .name = "ST231bMonitor", /* 8KiB block ST231b monitor */ 355 .name = "ST231bMonitor", /* 8KiB block ST231b monitor */
356 .start = 0x60200000, 356 .start = 0x60200000,
357 .end = 0x60201FFF, 357 .end = 0x60201FFF,
358 .flags = IORESOURCE_IO, 358 .flags = IORESOURCE_IO,
359 }, 359 },
360 { 360 {
361 .name = "MediaMemory2", 361 .name = "MediaMemory2",
362 .start = 0x60202000, 362 .start = 0x60202000,
363 .end = 0x61FFFFFF, /*~29.9MiB (32MiB - (2MiB + 8KiB)) */ 363 .end = 0x61FFFFFF, /*~29.9MiB (32MiB - (2MiB + 8KiB)) */
364 .flags = IORESOURCE_IO, 364 .flags = IORESOURCE_IO,
365 }, 365 },
366 /* 366 /*
367 * 367 *
@@ -377,28 +377,28 @@ struct resource non_dvr_gaia_resources[] __initdata = {
377 * 377 *
378 */ 378 */
379 { 379 {
380 .name = "DSP_Image_Buff", 380 .name = "DSP_Image_Buff",
381 .start = 0x00000000, 381 .start = 0x00000000,
382 .end = 0x000FFFFF, 382 .end = 0x000FFFFF,
383 .flags = IORESOURCE_MEM, 383 .flags = IORESOURCE_MEM,
384 }, 384 },
385 { 385 {
386 .name = "ADSC_CPU_PCM_Buff", 386 .name = "ADSC_CPU_PCM_Buff",
387 .start = 0x00000000, 387 .start = 0x00000000,
388 .end = 0x00009FFF, 388 .end = 0x00009FFF,
389 .flags = IORESOURCE_MEM, 389 .flags = IORESOURCE_MEM,
390 }, 390 },
391 { 391 {
392 .name = "ADSC_AUX_Buff", 392 .name = "ADSC_AUX_Buff",
393 .start = 0x00000000, 393 .start = 0x00000000,
394 .end = 0x00003FFF, 394 .end = 0x00003FFF,
395 .flags = IORESOURCE_MEM, 395 .flags = IORESOURCE_MEM,
396 }, 396 },
397 { 397 {
398 .name = "ADSC_Main_Buff", 398 .name = "ADSC_Main_Buff",
399 .start = 0x00000000, 399 .start = 0x00000000,
400 .end = 0x00003FFF, 400 .end = 0x00003FFF,
401 .flags = IORESOURCE_MEM, 401 .flags = IORESOURCE_MEM,
402 }, 402 },
403 /* 403 /*
404 * 404 *
@@ -409,16 +409,16 @@ struct resource non_dvr_gaia_resources[] __initdata = {
409 * Arbitrary Based Buffers: 409 * Arbitrary Based Buffers:
410 * This memory area is used for allocating buffers for Video decoding 410 * This memory area is used for allocating buffers for Video decoding
411 * purposes. Allocation/De-allocation within this buffer is managed 411 * purposes. Allocation/De-allocation within this buffer is managed
412 * by the STAVMEM driver of the STAPI. They could be Decimated 412 * by the STAVMEM driver of the STAPI. They could be Decimated
413 * Picture Buffers, Intermediate Buffers, as deemed necessary for 413 * Picture Buffers, Intermediate Buffers, as deemed necessary for
414 * video decoding purposes, for any video decoders on Zeus. 414 * video decoding purposes, for any video decoders on Zeus.
415 * 415 *
416 */ 416 */
417 { 417 {
418 .name = "AVMEMPartition0", 418 .name = "AVMEMPartition0",
419 .start = 0x63580000, 419 .start = 0x63580000,
420 .end = 0x64180000 - 1, /* 12 MB total */ 420 .end = 0x64180000 - 1, /* 12 MB total */
421 .flags = IORESOURCE_IO, 421 .flags = IORESOURCE_IO,
422 }, 422 },
423 /* 423 /*
424 * 424 *
@@ -431,10 +431,10 @@ struct resource non_dvr_gaia_resources[] __initdata = {
431 * 431 *
432 */ 432 */
433 { 433 {
434 .name = "Docsis", 434 .name = "Docsis",
435 .start = 0x62000000, 435 .start = 0x62000000,
436 .end = 0x62700000 - 1, /* 7 MB total */ 436 .end = 0x62700000 - 1, /* 7 MB total */
437 .flags = IORESOURCE_IO, 437 .flags = IORESOURCE_IO,
438 }, 438 },
439 /* 439 /*
440 * 440 *
@@ -447,10 +447,10 @@ struct resource non_dvr_gaia_resources[] __initdata = {
447 * 447 *
448 */ 448 */
449 { 449 {
450 .name = "GraphicsHeap", 450 .name = "GraphicsHeap",
451 .start = 0x62700000, 451 .start = 0x62700000,
452 .end = 0x63500000 - 1, /* 14 MB total */ 452 .end = 0x63500000 - 1, /* 14 MB total */
453 .flags = IORESOURCE_IO, 453 .flags = IORESOURCE_IO,
454 }, 454 },
455 /* 455 /*
456 * 456 *
@@ -463,10 +463,10 @@ struct resource non_dvr_gaia_resources[] __initdata = {
463 * 463 *
464 */ 464 */
465 { 465 {
466 .name = "MulticomSHM", 466 .name = "MulticomSHM",
467 .start = 0x26000000, 467 .start = 0x26000000,
468 .end = 0x26020000 - 1, 468 .end = 0x26020000 - 1,
469 .flags = IORESOURCE_MEM, 469 .flags = IORESOURCE_MEM,
470 }, 470 },
471 /* 471 /*
472 * 472 *
@@ -479,10 +479,10 @@ struct resource non_dvr_gaia_resources[] __initdata = {
479 * 479 *
480 */ 480 */
481 { 481 {
482 .name = "BMM_Buffer", 482 .name = "BMM_Buffer",
483 .start = 0x00000000, 483 .start = 0x00000000,
484 .end = 0x000AA000 - 1, 484 .end = 0x000AA000 - 1,
485 .flags = IORESOURCE_MEM, 485 .flags = IORESOURCE_MEM,
486 }, 486 },
487 /* 487 /*
488 * 488 *
@@ -495,10 +495,10 @@ struct resource non_dvr_gaia_resources[] __initdata = {
495 * 495 *
496 */ 496 */
497 { 497 {
498 .name = "DisplayBins0", 498 .name = "DisplayBins0",
499 .start = 0x00000000, 499 .start = 0x00000000,
500 .end = 0x00000FFF, /* 4 KB total */ 500 .end = 0x00000FFF, /* 4 KB total */
501 .flags = IORESOURCE_MEM, 501 .flags = IORESOURCE_MEM,
502 }, 502 },
503 /* 503 /*
504 * 504 *
@@ -511,10 +511,10 @@ struct resource non_dvr_gaia_resources[] __initdata = {
511 * 511 *
512 */ 512 */
513 { 513 {
514 .name = "DisplayBins1", 514 .name = "DisplayBins1",
515 .start = 0x64AD4000, 515 .start = 0x64AD4000,
516 .end = 0x64AD5000 - 1, /* 4 KB total */ 516 .end = 0x64AD5000 - 1, /* 4 KB total */
517 .flags = IORESOURCE_IO, 517 .flags = IORESOURCE_IO,
518 }, 518 },
519 /* 519 /*
520 * 520 *
@@ -523,10 +523,10 @@ struct resource non_dvr_gaia_resources[] __initdata = {
523 * 523 *
524 */ 524 */
525 { 525 {
526 .name = "AvfsDmaMem", 526 .name = "AvfsDmaMem",
527 .start = 0x6430E000, 527 .start = 0x6430E000,
528 .end = 0x645D2C00 - 1, /* 945K * 3 for playback */ 528 .end = 0x645D2C00 - 1, /* 945K * 3 for playback */
529 .flags = IORESOURCE_IO, 529 .flags = IORESOURCE_IO,
530 }, 530 },
531 /* 531 /*
532 * 532 *
@@ -539,10 +539,10 @@ struct resource non_dvr_gaia_resources[] __initdata = {
539 * 539 *
540 */ 540 */
541 { 541 {
542 .name = "DiagPersistentMemory", 542 .name = "DiagPersistentMemory",
543 .start = 0x00000000, 543 .start = 0x00000000,
544 .end = 0x10000 - 1, 544 .end = 0x10000 - 1,
545 .flags = IORESOURCE_MEM, 545 .flags = IORESOURCE_MEM,
546 }, 546 },
547 /* 547 /*
548 * 548 *
@@ -555,10 +555,10 @@ struct resource non_dvr_gaia_resources[] __initdata = {
555 * 555 *
556 */ 556 */
557 { 557 {
558 .name = "SmartCardInfo", 558 .name = "SmartCardInfo",
559 .start = 0x64AD1000, 559 .start = 0x64AD1000,
560 .end = 0x64AD3800 - 1, 560 .end = 0x64AD3800 - 1,
561 .flags = IORESOURCE_IO, 561 .flags = IORESOURCE_IO,
562 }, 562 },
563 /* 563 /*
564 * 564 *
@@ -568,22 +568,22 @@ struct resource non_dvr_gaia_resources[] __initdata = {
568 * NP IPC - must be video bank 2 568 * NP IPC - must be video bank 2
569 */ 569 */
570 { 570 {
571 .name = "NP_Reset_Vector", 571 .name = "NP_Reset_Vector",
572 .start = 0x27c00000, 572 .start = 0x27c00000,
573 .end = 0x27c01000 - 1, 573 .end = 0x27c01000 - 1,
574 .flags = IORESOURCE_MEM, 574 .flags = IORESOURCE_MEM,
575 }, 575 },
576 { 576 {
577 .name = "NP_Image", 577 .name = "NP_Image",
578 .start = 0x27020000, 578 .start = 0x27020000,
579 .end = 0x27060000 - 1, 579 .end = 0x27060000 - 1,
580 .flags = IORESOURCE_MEM, 580 .flags = IORESOURCE_MEM,
581 }, 581 },
582 { 582 {
583 .name = "NP_IPC", 583 .name = "NP_IPC",
584 .start = 0x63500000, 584 .start = 0x63500000,
585 .end = 0x63580000 - 1, 585 .end = 0x63580000 - 1,
586 .flags = IORESOURCE_IO, 586 .flags = IORESOURCE_IO,
587 }, 587 },
588 { }, 588 { },
589}; 589};
diff --git a/arch/mips/powertv/asic/prealloc-zeus.c b/arch/mips/powertv/asic/prealloc-zeus.c
index 96480a2395c0..6e76f09c68d6 100644
--- a/arch/mips/powertv/asic/prealloc-zeus.c
+++ b/arch/mips/powertv/asic/prealloc-zeus.c
@@ -17,8 +17,8 @@
17 * along with this program; if not, write to the Free Software 17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19 * 19 *
20 * Author: Ken Eppinett 20 * Author: Ken Eppinett
21 * David Schleef <ds@schleef.org> 21 * David Schleef <ds@schleef.org>
22 */ 22 */
23 23
24#include <linux/init.h> 24#include <linux/init.h>
@@ -78,7 +78,7 @@ struct resource dvr_zeus_resources[] __initdata =
78 * 78 *
79 * This memory area is used for allocating buffers for Video decoding 79 * This memory area is used for allocating buffers for Video decoding
80 * purposes. Allocation/De-allocation within this buffer is managed 80 * purposes. Allocation/De-allocation within this buffer is managed
81 * by the STAVMEM driver of the STAPI. They could be Decimated 81 * by the STAVMEM driver of the STAPI. They could be Decimated
82 * Picture Buffers, Intermediate Buffers, as deemed necessary for 82 * Picture Buffers, Intermediate Buffers, as deemed necessary for
83 * video decoding purposes, for any video decoders on Zeus. 83 * video decoding purposes, for any video decoders on Zeus.
84 */ 84 */
@@ -175,7 +175,7 @@ struct resource dvr_zeus_resources[] __initdata =
175 * End of Resource marker 175 * End of Resource marker
176 */ 176 */
177 { 177 {
178 .flags = 0, 178 .flags = 0,
179 }, 179 },
180}; 180};
181 181
@@ -299,6 +299,6 @@ struct resource non_dvr_zeus_resources[] __initdata =
299 * End of Resource marker 299 * End of Resource marker
300 */ 300 */
301 { 301 {
302 .flags = 0, 302 .flags = 0,
303 }, 303 },
304}; 304};
diff --git a/arch/mips/powertv/init.c b/arch/mips/powertv/init.c
index c6979353980b..5bd9d8f468cc 100644
--- a/arch/mips/powertv/init.c
+++ b/arch/mips/powertv/init.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (C) 1999, 2000, 2004, 2005 MIPS Technologies, Inc. 2 * Copyright (C) 1999, 2000, 2004, 2005 MIPS Technologies, Inc.
3 * All rights reserved. 3 * All rights reserved.
4 * Authors: Carsten Langgaard <carstenl@mips.com> 4 * Authors: Carsten Langgaard <carstenl@mips.com>
5 * Maciej W. Rozycki <macro@mips.com> 5 * Maciej W. Rozycki <macro@mips.com>
diff --git a/arch/mips/powertv/ioremap.c b/arch/mips/powertv/ioremap.c
index a77c6f62fe23..d060478aab03 100644
--- a/arch/mips/powertv/ioremap.c
+++ b/arch/mips/powertv/ioremap.c
@@ -19,9 +19,9 @@
19 * along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 20 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
21 * 21 *
22 * Author: David VomLehn <dvomlehn@cisco.com> 22 * Author: David VomLehn <dvomlehn@cisco.com>
23 * 23 *
24 * Description: Defines the platform resources for the SA settop. 24 * Description: Defines the platform resources for the SA settop.
25 * 25 *
26 * NOTE: The bootloader allocates persistent memory at an address which is 26 * NOTE: The bootloader allocates persistent memory at an address which is
27 * 16 MiB below the end of the highest address in KSEG0. All fixed 27 * 16 MiB below the end of the highest address in KSEG0. All fixed
diff --git a/arch/mips/powertv/memory.c b/arch/mips/powertv/memory.c
index fb3d29660c42..6e5f1bdc59b5 100644
--- a/arch/mips/powertv/memory.c
+++ b/arch/mips/powertv/memory.c
@@ -60,7 +60,7 @@ unsigned long ptv_memsize;
60 * struct low_mem_reserved - Items in low memory that are reserved 60 * struct low_mem_reserved - Items in low memory that are reserved
61 * @start: Physical address of item 61 * @start: Physical address of item
62 * @size: Size, in bytes, of this item 62 * @size: Size, in bytes, of this item
63 * @is_aliased: True if this is RAM aliased from another location. If false, 63 * @is_aliased: True if this is RAM aliased from another location. If false,
64 * it is something other than aliased RAM and the RAM in the 64 * it is something other than aliased RAM and the RAM in the
65 * unaliased address is still visible outside of low memory. 65 * unaliased address is still visible outside of low memory.
66 */ 66 */
diff --git a/arch/mips/powertv/powertv-usb.c b/arch/mips/powertv/powertv-usb.c
index b0e2afa89395..d845eace58e9 100644
--- a/arch/mips/powertv/powertv-usb.c
+++ b/arch/mips/powertv/powertv-usb.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * powertv-usb.c 2 * powertv-usb.c
3 * 3 *
4 * Description: ASIC-specific USB device setup and shutdown 4 * Description: ASIC-specific USB device setup and shutdown
5 * 5 *
6 * Copyright (C) 2005-2009 Scientific-Atlanta, Inc. 6 * Copyright (C) 2005-2009 Scientific-Atlanta, Inc.
7 * Copyright (C) 2009 Cisco Systems, Inc. 7 * Copyright (C) 2009 Cisco Systems, Inc.
@@ -20,8 +20,8 @@
20 * along with this program; if not, write to the Free Software 20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 21 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
22 * 22 *
23 * Author: Ken Eppinett 23 * Author: Ken Eppinett
24 * David Schleef <ds@schleef.org> 24 * David Schleef <ds@schleef.org>
25 * 25 *
26 * NOTE: The bootloader allocates persistent memory at an address which is 26 * NOTE: The bootloader allocates persistent memory at an address which is
27 * 16 MiB below the end of the highest address in KSEG0. All fixed 27 * 16 MiB below the end of the highest address in KSEG0. All fixed
@@ -70,15 +70,15 @@
70#define MCC2_GMII_RX2_CLOCK_SELECT (1 << 16) 70#define MCC2_GMII_RX2_CLOCK_SELECT (1 << 16)
71 71
72#define ETHER_CLK_CONFIG (MCC2_GMII_GCLK_TO_PAD | \ 72#define ETHER_CLK_CONFIG (MCC2_GMII_GCLK_TO_PAD | \
73 MCC2_ETHER125_0_CLOCK_SELECT | \ 73 MCC2_ETHER125_0_CLOCK_SELECT | \
74 MCC2_RMII_0_CLOCK_SELECT | \ 74 MCC2_RMII_0_CLOCK_SELECT | \
75 MCC2_GMII_TX0_CLOCK_SELECT | \ 75 MCC2_GMII_TX0_CLOCK_SELECT | \
76 MCC2_GMII_RX0_CLOCK_SELECT | \ 76 MCC2_GMII_RX0_CLOCK_SELECT | \
77 MCC2_ETHER125_1_CLOCK_SELECT | \ 77 MCC2_ETHER125_1_CLOCK_SELECT | \
78 MCC2_RMII_1_CLOCK_SELECT | \ 78 MCC2_RMII_1_CLOCK_SELECT | \
79 MCC2_GMII_TX1_CLOCK_SELECT | \ 79 MCC2_GMII_TX1_CLOCK_SELECT | \
80 MCC2_GMII_RX1_CLOCK_SELECT | \ 80 MCC2_GMII_RX1_CLOCK_SELECT | \
81 MCC2_ETHER125_2_CLOCK_SELECT | \ 81 MCC2_ETHER125_2_CLOCK_SELECT | \
82 MCC2_RMII_2_CLOCK_SELECT | \ 82 MCC2_RMII_2_CLOCK_SELECT | \
83 MCC2_GMII_TX2_CLOCK_SELECT | \ 83 MCC2_GMII_TX2_CLOCK_SELECT | \
84 MCC2_GMII_RX2_CLOCK_SELECT) 84 MCC2_GMII_RX2_CLOCK_SELECT)
@@ -98,9 +98,9 @@
98 98
99#define QAM_FS_DISABLE_DIVIDE_BY_3 (1 << 5) 99#define QAM_FS_DISABLE_DIVIDE_BY_3 (1 << 5)
100#define QAM_FS_ENABLE_PROGRAM (1 << 4) 100#define QAM_FS_ENABLE_PROGRAM (1 << 4)
101#define QAM_FS_ENABLE_OUTPUT (1 << 3) 101#define QAM_FS_ENABLE_OUTPUT (1 << 3)
102#define QAM_FS_SELECT_TEST_BYPASS (1 << 2) 102#define QAM_FS_SELECT_TEST_BYPASS (1 << 2)
103#define QAM_FS_DISABLE_DIGITAL_STANDBY (1 << 1) 103#define QAM_FS_DISABLE_DIGITAL_STANDBY (1 << 1)
104#define QAM_FS_CHOOSE_FS (1 << 0) 104#define QAM_FS_CHOOSE_FS (1 << 0)
105 105
106/* Definitions for fs432x4a_ctl register */ 106/* Definitions for fs432x4a_ctl register */
@@ -142,14 +142,14 @@
142static struct resource ehci_resources[] = { 142static struct resource ehci_resources[] = {
143 { 143 {
144 .parent = &asic_resource, 144 .parent = &asic_resource,
145 .start = 0, 145 .start = 0,
146 .end = 0xff, 146 .end = 0xff,
147 .flags = IORESOURCE_MEM, 147 .flags = IORESOURCE_MEM,
148 }, 148 },
149 { 149 {
150 .start = irq_usbehci, 150 .start = irq_usbehci,
151 .end = irq_usbehci, 151 .end = irq_usbehci,
152 .flags = IORESOURCE_IRQ, 152 .flags = IORESOURCE_IRQ,
153 }, 153 },
154}; 154};
155 155
@@ -169,14 +169,14 @@ static struct platform_device ehci_device = {
169static struct resource ohci_resources[] = { 169static struct resource ohci_resources[] = {
170 { 170 {
171 .parent = &asic_resource, 171 .parent = &asic_resource,
172 .start = 0, 172 .start = 0,
173 .end = 0xff, 173 .end = 0xff,
174 .flags = IORESOURCE_MEM, 174 .flags = IORESOURCE_MEM,
175 }, 175 },
176 { 176 {
177 .start = irq_usbohci, 177 .start = irq_usbohci,
178 .end = irq_usbohci, 178 .end = irq_usbohci,
179 .flags = IORESOURCE_IRQ, 179 .flags = IORESOURCE_IRQ,
180 }, 180 },
181}; 181};
182 182
@@ -207,9 +207,9 @@ static DEFINE_SPINLOCK(usb_regs_lock);
207 * 207 *
208 * QAM frequency selection code, which affects the frequency at which USB 208 * QAM frequency selection code, which affects the frequency at which USB
209 * runs. The frequency is calculated as: 209 * runs. The frequency is calculated as:
210 * 2^15 * ndiv * Fin 210 * 2^15 * ndiv * Fin
211 * Fout = ------------------------------------------------------------ 211 * Fout = ------------------------------------------------------------
212 * (sdiv * (ipe * (1 + md/32) - (ipe - 2^15)*(1 + (md + 1)/32))) 212 * (sdiv * (ipe * (1 + md/32) - (ipe - 2^15)*(1 + (md + 1)/32)))
213 * where: 213 * where:
214 * Fin 54 MHz 214 * Fin 54 MHz
215 * ndiv QAM_FS_NSDIV_54MHZ ? 8 : 16 215 * ndiv QAM_FS_NSDIV_54MHZ ? 8 : 16
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-02 12:24:37 -0400