浏览代码

[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>
Kumar Gala 17 年之前
父节点
当前提交
f67be814ff

+ 1 - 1
arch/powerpc/boot/dts/stx_gp3_8560.dts

@@ -46,7 +46,7 @@
 		reg = <0x00000000 0x10000000>;
 		reg = <0x00000000 0x10000000>;
 	};
 	};
 
 
-	soc8560@fdf00000 {
+	soc@fdf00000 {
 		#address-cells = <1>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		#size-cells = <1>;
 		device_type = "soc";
 		device_type = "soc";

+ 1 - 1
arch/powerpc/boot/dts/tqm8540.dts

@@ -48,7 +48,7 @@
 		reg = <0x00000000 0x10000000>;
 		reg = <0x00000000 0x10000000>;
 	};
 	};
 
 
-	soc8540@e0000000 {
+	soc@e0000000 {
 		#address-cells = <1>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		#size-cells = <1>;
 		device_type = "soc";
 		device_type = "soc";

+ 1 - 1
arch/powerpc/boot/dts/tqm8541.dts

@@ -47,7 +47,7 @@
 		reg = <0x00000000 0x10000000>;
 		reg = <0x00000000 0x10000000>;
 	};
 	};
 
 
-	soc8541@e0000000 {
+	soc@e0000000 {
 		#address-cells = <1>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		#size-cells = <1>;
 		device_type = "soc";
 		device_type = "soc";

+ 1 - 1
arch/powerpc/boot/dts/tqm8555.dts

@@ -47,7 +47,7 @@
 		reg = <0x00000000 0x10000000>;
 		reg = <0x00000000 0x10000000>;
 	};
 	};
 
 
-	soc8555@e0000000 {
+	soc@e0000000 {
 		#address-cells = <1>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		#size-cells = <1>;
 		device_type = "soc";
 		device_type = "soc";

+ 1 - 1
arch/powerpc/boot/dts/tqm8560.dts

@@ -48,7 +48,7 @@
 		reg = <0x00000000 0x10000000>;
 		reg = <0x00000000 0x10000000>;
 	};
 	};
 
 
-	soc8560@e0000000 {
+	soc@e0000000 {
 		#address-cells = <1>;
 		#address-cells = <1>;
 		#size-cells = <1>;
 		#size-cells = <1>;
 		device_type = "soc";
 		device_type = "soc";

+ 0 - 4
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[] = {
 static struct of_device_id __initdata of_bus_ids[] = {
-	{ .name = "soc", },
-	{ .type = "soc", },
-	{ .name = "cpm", },
-	{ .name = "localbus", },
 	{ .compatible = "simple-bus", },
 	{ .compatible = "simple-bus", },
 	{},
 	{},
 };
 };

+ 0 - 4
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[] = {
 static struct of_device_id __initdata of_bus_ids[] = {
-	{ .name = "soc", },
-	{ .type = "soc", },
-	{ .name = "cpm", },
-	{ .name = "localbus", },
 	{ .compatible = "simple-bus", },
 	{ .compatible = "simple-bus", },
 	{},
 	{},
 };
 };