diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2008-01-25 10:23:34 -0600 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-01-28 08:32:53 -0600 |
| commit | f67be814ff8e862422739cb424ce8c4e6c142c28 (patch) | |
| tree | ff15bd3e1e3bc75ec28cda1c536d571d6dbe0bbb | |
| parent | eedd62ed53512e6749764427ffe5a1c9e41175c6 (diff) | |
| download | linux-f67be814ff8e862422739cb424ce8c4e6c142c28.tar.bz2 | |
[POWERPC] 85xx: some minor cleanups for stx_gp3 and tqm85xx
* "simple-bus" covers all our needs for of_platform_bus_probe()
* make device tree name just 'soc' not 'soc85..'
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/boot/dts/stx_gp3_8560.dts | 2 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/tqm8540.dts | 2 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/tqm8541.dts | 2 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/tqm8555.dts | 2 | ||||
| -rw-r--r-- | arch/powerpc/boot/dts/tqm8560.dts | 2 | ||||
| -rw-r--r-- | arch/powerpc/platforms/85xx/stx_gp3.c | 4 | ||||
| -rw-r--r-- | arch/powerpc/platforms/85xx/tqm85xx.c | 4 |
7 files changed, 5 insertions, 13 deletions
diff --git a/arch/powerpc/boot/dts/stx_gp3_8560.dts b/arch/powerpc/boot/dts/stx_gp3_8560.dts index 2e9723604148..f81fd7fdb29e 100644 --- a/arch/powerpc/boot/dts/stx_gp3_8560.dts +++ b/arch/powerpc/boot/dts/stx_gp3_8560.dts @@ -46,7 +46,7 @@ reg = <0x00000000 0x10000000>; }; - soc8560@fdf00000 { + soc@fdf00000 { #address-cells = <1>; #size-cells = <1>; device_type = "soc"; diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts index a6e39897e1cc..1addb3ae719e 100644 --- a/arch/powerpc/boot/dts/tqm8540.dts +++ b/arch/powerpc/boot/dts/tqm8540.dts @@ -48,7 +48,7 @@ reg = <0x00000000 0x10000000>; }; - soc8540@e0000000 { + soc@e0000000 { #address-cells = <1>; #size-cells = <1>; device_type = "soc"; diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts index 11bdb0fe50f4..9e01093f496e 100644 --- a/arch/powerpc/boot/dts/tqm8541.dts +++ b/arch/powerpc/boot/dts/tqm8541.dts @@ -47,7 +47,7 @@ reg = <0x00000000 0x10000000>; }; - soc8541@e0000000 { + soc@e0000000 { #address-cells = <1>; #size-cells = <1>; device_type = "soc"; diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts index eef9a6bb748b..a20eb06c482f 100644 --- a/arch/powerpc/boot/dts/tqm8555.dts +++ b/arch/powerpc/boot/dts/tqm8555.dts @@ -47,7 +47,7 @@ reg = <0x00000000 0x10000000>; }; - soc8555@e0000000 { + soc@e0000000 { #address-cells = <1>; #size-cells = <1>; device_type = "soc"; diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts index 8ca7fdd0a129..b9ac6c943b89 100644 --- a/arch/powerpc/boot/dts/tqm8560.dts +++ b/arch/powerpc/boot/dts/tqm8560.dts @@ -48,7 +48,7 @@ reg = <0x00000000 0x10000000>; }; - soc8560@e0000000 { + soc@e0000000 { #address-cells = <1>; #size-cells = <1>; device_type = "soc"; diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c index 0b20c170c4d2..18499d7c9d9e 100644 --- a/arch/powerpc/platforms/85xx/stx_gp3.c +++ b/arch/powerpc/platforms/85xx/stx_gp3.c @@ -148,10 +148,6 @@ static void stx_gp3_show_cpuinfo(struct seq_file *m) } static struct of_device_id __initdata of_bus_ids[] = { - { .name = "soc", }, - { .type = "soc", }, - { .name = "cpm", }, - { .name = "localbus", }, { .compatible = "simple-bus", }, {}, }; diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c index 2a08b315e190..77681acf1bae 100644 --- a/arch/powerpc/platforms/85xx/tqm85xx.c +++ b/arch/powerpc/platforms/85xx/tqm85xx.c @@ -146,10 +146,6 @@ static void tqm85xx_show_cpuinfo(struct seq_file *m) } static struct of_device_id __initdata of_bus_ids[] = { - { .name = "soc", }, - { .type = "soc", }, - { .name = "cpm", }, - { .name = "localbus", }, { .compatible = "simple-bus", }, {}, }; |