AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[POWERPC] prpmc2800: Clean up dts properties

Browse Source 
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>
This commit is contained in:
Mark A. Greer 2008-04-08 08:10:34 +10:00 committed by Paul Mackerras
parent a05ce88ab3
commit 1791f91bc7
3 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
arch/powerpc/boot/dts/prpmc2800.dts
View File

@ -42,7 +42,7 @@ memory {
reg = <0x0 0x20000000>; /* Default (512MB) */
};
mv64x60@f1000000 { /* Marvell Discovery */
system-controller@f1000000 { /* Marvell Discovery mv64360 */
#address-cells = <1>;
#size-cells = <1>;
model = "mv64360"; /* Default */
@ -114,21 +114,17 @@ eth1 {
};
SDMA0: sdma@4000 {
device_type = "dma";
compatible = "marvell,mv64360-sdma";
reg = <0x4000 0xc18>;
virtual-reg = <0xf1004000>;
interrupt-base = <0>;
interrupts = <36>;
interrupt-parent = <&PIC>;
};
SDMA1: sdma@6000 {
device_type = "dma";
compatible = "marvell,mv64360-sdma";
reg = <0x6000 0xc18>;
virtual-reg = <0xf1006000>;
interrupt-base = <0>;
interrupts = <38>;
interrupt-parent = <&PIC>;
};
@ -139,7 +135,6 @@ BRG0: brg@b200 {
clock-src = <8>;
clock-frequency = <133333333>;
current-speed = <9600>;
bcr = <0>;
};
BRG1: brg@b208 {
@ -148,7 +143,6 @@ BRG1: brg@b208 {
clock-src = <8>;
clock-frequency = <133333333>;
current-speed = <9600>;
bcr = <0>;
};
CUNIT: cunit@f200 {
@ -174,12 +168,7 @@ MPSC0: mpsc@8000 {
cunit = <&CUNIT>;
mpscrouting = <&MPSCROUTING>;
mpscintr = <&MPSCINTR>;
block-index = <0>;
max_idle = <40>;
chr_1 = <0>;
chr_2 = <0>;
chr_10 = <3>;
mpcr = <0>;
cell-index = <0>;
interrupts = <40>;
interrupt-parent = <&PIC>;
};
@ -194,12 +183,7 @@ MPSC1: mpsc@9000 {
cunit = <&CUNIT>;
mpscrouting = <&MPSCROUTING>;
mpscintr = <&MPSCINTR>;
block-index = <1>;
max_idle = <40>;
chr_1 = <0>;
chr_2 = <0>;
chr_10 = <3>;
mpcr = <0>;
cell-index = <1>;
interrupts = <42>;
interrupt-parent = <&PIC>;
};
@ -207,7 +191,6 @@ MPSC1: mpsc@9000 {
wdt@b410 { /* watchdog timer */
compatible = "marvell,mv64360-wdt";
reg = <0xb410 0x8>;
timeout = <10>; /* wdt timeout in seconds */
};
i2c@c000 {
@ -215,10 +198,6 @@ i2c@c000 {
compatible = "marvell,mv64360-i2c";
reg = <0xc000 0x20>;
virtual-reg = <0xf100c000>;
freq_m = <8>;
freq_n = <3>;
timeout = <1000>; /* 1000 = 1 second */
retries = <1>;
interrupts = <37>;
interrupt-parent = <&PIC>;
};

2
arch/powerpc/boot/mpsc.c
View File

@ -141,7 +141,7 @@ int mpsc_console_init(void *devp, struct serial_console_data *scdp)
if (mpscintr_base == NULL)
goto err_out;
n = getprop(devp, "block-index", &v, sizeof(v));
n = getprop(devp, "cell-index", &v, sizeof(v));
if (n != sizeof(v))
goto err_out;
reg_set = (int)v;

18
arch/powerpc/sysdev/mv64x60_dev.c
View File

@ -127,7 +127,7 @@ static int __init mv64x60_mpsc_device_setup(struct device_node *np, int id)
if (err)
return err;
prop = of_get_property(np, "block-index", NULL);
prop = of_get_property(np, "cell-index", NULL);
if (!prop)
return -ENODEV;
port_number = *(int *)prop;
@ -136,6 +136,7 @@ static int __init mv64x60_mpsc_device_setup(struct device_node *np, int id)
pdata.cache_mgmt = 1; /* All current revs need this set */
pdata.max_idle = 40; /* default */
prop = of_get_property(np, "max_idle", NULL);
if (prop)
pdata.max_idle = *prop;
@ -345,21 +346,19 @@ static int __init mv64x60_i2c_device_setup(struct device_node *np, int id)
memset(&pdata, 0, sizeof(pdata));
pdata.freq_m = 8; /* default */
prop = of_get_property(np, "freq_m", NULL);
if (!prop)
return -ENODEV;
pdata.freq_m = *prop;
pdata.freq_m = 3; /* default */
prop = of_get_property(np, "freq_n", NULL);
if (!prop)
return -ENODEV;
pdata.freq_n = *prop;
prop = of_get_property(np, "timeout", NULL);
if (prop)
pdata.timeout = *prop;
else
pdata.timeout = 1000; /* 1 second */
pdata.timeout = 1000; /* default: 1 second */
pdev = platform_device_alloc(MV64XXX_I2C_CTLR_NAME, id);
if (!pdev)
@ -401,10 +400,7 @@ static int __init mv64x60_wdt_device_setup(struct device_node *np, int id)
memset(&pdata, 0, sizeof(pdata));
prop = of_get_property(np, "timeout", NULL);
if (!prop)
return -ENODEV;
pdata.timeout = *prop;
pdata.timeout = 10; /* Default: 10 seconds */
np = of_get_parent(np);
if (!np)
@ -492,7 +488,7 @@ static int __init mv64x60_add_mpsc_console(void)
if (!of_device_is_compatible(np, "marvell,mv64360-mpsc"))
goto not_mpsc;
prop = of_get_property(np, "block-index", NULL);
prop = of_get_property(np, "cell-index", NULL);
if (!prop)
goto not_mpsc;