aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorMark A. Greer <mgreer@mvista.com>2008-04-07 18:10:34 -0400
committerPaul Mackerras <paulus@samba.org>2008-04-15 07:21:24 -0400
commit1791f91bc794b7efc90719268146f582b9f29ead (patch)
tree4aee1b81ccac9231cec0636dfc0327a4378ede7f /arch/powerpc
parenta05ce88ab3e8a022ee17d89ecf86f6929c89c50e (diff)
[POWERPC] prpmc2800: Clean up dts properties
Remove several unused (or software config only) properties. Rename marvel node to "system-controller". Also, rename the "block-index" property to "cell-index" to conform to current practice. Signed-off-by: Mark A. Greer <mgreer@mvista.com> Signed-off-by: Dale Farnsworth <dale@farnsworth.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/boot/dts/prpmc2800.dts27
-rw-r--r--arch/powerpc/boot/mpsc.c2
-rw-r--r--arch/powerpc/sysdev/mv64x60_dev.c18
3 files changed, 11 insertions, 36 deletions
diff --git a/arch/powerpc/boot/dts/prpmc2800.dts b/arch/powerpc/boot/dts/prpmc2800.dts
index cb26b007980b..88a1a895985f 100644
--- a/arch/powerpc/boot/dts/prpmc2800.dts
+++ b/arch/powerpc/boot/dts/prpmc2800.dts
@@ -42,7 +42,7 @@
42 reg = <0x0 0x20000000>; /* Default (512MB) */ 42 reg = <0x0 0x20000000>; /* Default (512MB) */
43 }; 43 };
44 44
45 mv64x60@f1000000 { /* Marvell Discovery */ 45 system-controller@f1000000 { /* Marvell Discovery mv64360 */
46 #address-cells = <1>; 46 #address-cells = <1>;
47 #size-cells = <1>; 47 #size-cells = <1>;
48 model = "mv64360"; /* Default */ 48 model = "mv64360"; /* Default */
@@ -114,21 +114,17 @@
114 }; 114 };
115 115
116 SDMA0: sdma@4000 { 116 SDMA0: sdma@4000 {
117 device_type = "dma";
118 compatible = "marvell,mv64360-sdma"; 117 compatible = "marvell,mv64360-sdma";
119 reg = <0x4000 0xc18>; 118 reg = <0x4000 0xc18>;
120 virtual-reg = <0xf1004000>; 119 virtual-reg = <0xf1004000>;
121 interrupt-base = <0>;
122 interrupts = <36>; 120 interrupts = <36>;
123 interrupt-parent = <&PIC>; 121 interrupt-parent = <&PIC>;
124 }; 122 };
125 123
126 SDMA1: sdma@6000 { 124 SDMA1: sdma@6000 {
127 device_type = "dma";
128 compatible = "marvell,mv64360-sdma"; 125 compatible = "marvell,mv64360-sdma";
129 reg = <0x6000 0xc18>; 126 reg = <0x6000 0xc18>;
130 virtual-reg = <0xf1006000>; 127 virtual-reg = <0xf1006000>;
131 interrupt-base = <0>;
132 interrupts = <38>; 128 interrupts = <38>;
133 interrupt-parent = <&PIC>; 129 interrupt-parent = <&PIC>;
134 }; 130 };
@@ -139,7 +135,6 @@
139 clock-src = <8>; 135 clock-src = <8>;
140 clock-frequency = <133333333>; 136 clock-frequency = <133333333>;
141 current-speed = <9600>; 137 current-speed = <9600>;
142 bcr = <0>;
143 }; 138 };
144 139
145 BRG1: brg@b208 { 140 BRG1: brg@b208 {
@@ -148,7 +143,6 @@
148 clock-src = <8>; 143 clock-src = <8>;
149 clock-frequency = <133333333>; 144 clock-frequency = <133333333>;
150 current-speed = <9600>; 145 current-speed = <9600>;
151 bcr = <0>;
152 }; 146 };
153 147
154 CUNIT: cunit@f200 { 148 CUNIT: cunit@f200 {
@@ -174,12 +168,7 @@
174 cunit = <&CUNIT>; 168 cunit = <&CUNIT>;
175 mpscrouting = <&MPSCROUTING>; 169 mpscrouting = <&MPSCROUTING>;
176 mpscintr = <&MPSCINTR>; 170 mpscintr = <&MPSCINTR>;
177 block-index = <0>; 171 cell-index = <0>;
178 max_idle = <40>;
179 chr_1 = <0>;
180 chr_2 = <0>;
181 chr_10 = <3>;
182 mpcr = <0>;
183 interrupts = <40>; 172 interrupts = <40>;
184 interrupt-parent = <&PIC>; 173 interrupt-parent = <&PIC>;
185 }; 174 };
@@ -194,12 +183,7 @@
194 cunit = <&CUNIT>; 183 cunit = <&CUNIT>;
195 mpscrouting = <&MPSCROUTING>; 184 mpscrouting = <&MPSCROUTING>;
196 mpscintr = <&MPSCINTR>; 185 mpscintr = <&MPSCINTR>;
197 block-index = <1>; 186 cell-index = <1>;
198 max_idle = <40>;
199 chr_1 = <0>;
200 chr_2 = <0>;
201 chr_10 = <3>;
202 mpcr = <0>;
203 interrupts = <42>; 187 interrupts = <42>;
204 interrupt-parent = <&PIC>; 188 interrupt-parent = <&PIC>;
205 }; 189 };
@@ -207,7 +191,6 @@
207 wdt@b410 { /* watchdog timer */ 191 wdt@b410 { /* watchdog timer */
208 compatible = "marvell,mv64360-wdt"; 192 compatible = "marvell,mv64360-wdt";
209 reg = <0xb410 0x8>; 193 reg = <0xb410 0x8>;
210 timeout = <10>; /* wdt timeout in seconds */
211 }; 194 };
212 195
213 i2c@c000 { 196 i2c@c000 {
@@ -215,10 +198,6 @@
215 compatible = "marvell,mv64360-i2c"; 198 compatible = "marvell,mv64360-i2c";
216 reg = <0xc000 0x20>; 199 reg = <0xc000 0x20>;
217 virtual-reg = <0xf100c000>; 200 virtual-reg = <0xf100c000>;
218 freq_m = <8>;
219 freq_n = <3>;
220 timeout = <1000>; /* 1000 = 1 second */
221 retries = <1>;
222 interrupts = <37>; 201 interrupts = <37>;
223 interrupt-parent = <&PIC>; 202 interrupt-parent = <&PIC>;
224 }; 203 };
diff --git a/arch/powerpc/boot/mpsc.c b/arch/powerpc/boot/mpsc.c
index 802ea53790d8..425ad88cce8d 100644
--- a/arch/powerpc/boot/mpsc.c
+++ b/arch/powerpc/boot/mpsc.c
@@ -141,7 +141,7 @@ int mpsc_console_init(void *devp, struct serial_console_data *scdp)
141 if (mpscintr_base == NULL) 141 if (mpscintr_base == NULL)
142 goto err_out; 142 goto err_out;
143 143
144 n = getprop(devp, "block-index", &v, sizeof(v)); 144 n = getprop(devp, "cell-index", &v, sizeof(v));
145 if (n != sizeof(v)) 145 if (n != sizeof(v))
146 goto err_out; 146 goto err_out;
147 reg_set = (int)v; 147 reg_set = (int)v;
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index d9626eea1c72..90f2c14d5b60 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -127,7 +127,7 @@ static int __init mv64x60_mpsc_device_setup(struct device_node *np, int id)
127 if (err) 127 if (err)
128 return err; 128 return err;
129 129
130 prop = of_get_property(np, "block-index", NULL); 130 prop = of_get_property(np, "cell-index", NULL);
131 if (!prop) 131 if (!prop)
132 return -ENODEV; 132 return -ENODEV;
133 port_number = *(int *)prop; 133 port_number = *(int *)prop;
@@ -136,6 +136,7 @@ static int __init mv64x60_mpsc_device_setup(struct device_node *np, int id)
136 136
137 pdata.cache_mgmt = 1; /* All current revs need this set */ 137 pdata.cache_mgmt = 1; /* All current revs need this set */
138 138
139 pdata.max_idle = 40; /* default */
139 prop = of_get_property(np, "max_idle", NULL); 140 prop = of_get_property(np, "max_idle", NULL);
140 if (prop) 141 if (prop)
141 pdata.max_idle = *prop; 142 pdata.max_idle = *prop;
@@ -345,21 +346,19 @@ static int __init mv64x60_i2c_device_setup(struct device_node *np, int id)
345 346
346 memset(&pdata, 0, sizeof(pdata)); 347 memset(&pdata, 0, sizeof(pdata));
347 348
349 pdata.freq_m = 8; /* default */
348 prop = of_get_property(np, "freq_m", NULL); 350 prop = of_get_property(np, "freq_m", NULL);
349 if (!prop) 351 if (!prop)
350 return -ENODEV; 352 return -ENODEV;
351 pdata.freq_m = *prop; 353 pdata.freq_m = *prop;
352 354
355 pdata.freq_m = 3; /* default */
353 prop = of_get_property(np, "freq_n", NULL); 356 prop = of_get_property(np, "freq_n", NULL);
354 if (!prop) 357 if (!prop)
355 return -ENODEV; 358 return -ENODEV;
356 pdata.freq_n = *prop; 359 pdata.freq_n = *prop;
357 360
358 prop = of_get_property(np, "timeout", NULL); 361 pdata.timeout = 1000; /* default: 1 second */
359 if (prop)
360 pdata.timeout = *prop;
361 else
362 pdata.timeout = 1000; /* 1 second */
363 362
364 pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id); 363 pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id);
365 if (!pdev) 364 if (!pdev)
@@ -401,10 +400,7 @@ static int __init mv64x60_wdt_device_setup(struct device_node *np, int id)
401 400
402 memset(&pdata, 0, sizeof(pdata)); 401 memset(&pdata, 0, sizeof(pdata));
403 402
404 prop = of_get_property(np, "timeout", NULL); 403 pdata.timeout = 10; /* Default: 10 seconds */
405 if (!prop)
406 return -ENODEV;
407 pdata.timeout = *prop;
408 404
409 np = of_get_parent(np); 405 np = of_get_parent(np);
410 if (!np) 406 if (!np)
@@ -492,7 +488,7 @@ static int __init mv64x60_add_mpsc_console(void)
492 if (!of_device_is_compatible(np, "marvell,mv64360-mpsc")) 488 if (!of_device_is_compatible(np, "marvell,mv64360-mpsc"))
493 goto not_mpsc; 489 goto not_mpsc;
494 490
495 prop = of_get_property(np, "block-index", NULL); 491 prop = of_get_property(np, "cell-index", NULL);
496 if (!prop) 492 if (!prop)
497 goto not_mpsc; 493 goto not_mpsc;
498 494