powerpc/fsl: proliferate simple-bus compatibility to soc nodes
authorKim Phillips <kim.phillips@freescale.com>
Tue, 29 Jul 2008 20:29:24 +0000 (15:29 -0500)
committerKumar Gala <galak@kernel.crashing.org>
Tue, 29 Jul 2008 22:48:35 +0000 (17:48 -0500)
add simple-bus compatible property to soc nodes for 83xx/85xx platforms
that were missing them.  Add same to platform probe code.

This fixes SoC device drivers (such as talitos) to succeed in matching
devices present in the soc node.

also update mpc836x_rdk dts to new SEC bindings (overlooked in commit
3fd4473: powerpc/fsl: update crypto node definition and device tree
instances).

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
31 files changed:
arch/powerpc/boot/dts/mpc832x_mds.dts
arch/powerpc/boot/dts/mpc832x_rdb.dts
arch/powerpc/boot/dts/mpc8349emitx.dts
arch/powerpc/boot/dts/mpc8349emitxgp.dts
arch/powerpc/boot/dts/mpc834x_mds.dts
arch/powerpc/boot/dts/mpc836x_mds.dts
arch/powerpc/boot/dts/mpc836x_rdk.dts
arch/powerpc/boot/dts/mpc8377_mds.dts
arch/powerpc/boot/dts/mpc8378_mds.dts
arch/powerpc/boot/dts/mpc8379_mds.dts
arch/powerpc/boot/dts/mpc8536ds.dts
arch/powerpc/boot/dts/mpc8540ads.dts
arch/powerpc/boot/dts/mpc8541cds.dts
arch/powerpc/boot/dts/mpc8544ds.dts
arch/powerpc/boot/dts/mpc8548cds.dts
arch/powerpc/boot/dts/mpc8555cds.dts
arch/powerpc/boot/dts/mpc8560ads.dts
arch/powerpc/boot/dts/mpc8568mds.dts
arch/powerpc/boot/dts/mpc8572ds.dts
arch/powerpc/platforms/83xx/mpc832x_mds.c
arch/powerpc/platforms/83xx/mpc832x_rdb.c
arch/powerpc/platforms/83xx/mpc834x_itx.c
arch/powerpc/platforms/83xx/mpc834x_mds.c
arch/powerpc/platforms/83xx/mpc836x_mds.c
arch/powerpc/platforms/83xx/sbc834x.c
arch/powerpc/platforms/85xx/ksi8560.c
arch/powerpc/platforms/85xx/mpc8536_ds.c
arch/powerpc/platforms/85xx/mpc85xx_ads.c
arch/powerpc/platforms/85xx/mpc85xx_ds.c
arch/powerpc/platforms/85xx/mpc85xx_mds.c
arch/powerpc/platforms/85xx/sbc8560.c

index 7345743..fbc9304 100644 (file)
@@ -68,6 +68,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x00100000>;
                reg = <0xe0000000 0x00000200>;
                bus-frequency = <132000000>;
index e74c045..b157d18 100644 (file)
@@ -51,6 +51,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x00100000>;
                reg = <0xe0000000 0x00000200>;
                bus-frequency = <0>;
index 8dfab56..700e076 100644 (file)
@@ -52,6 +52,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x00100000>;
                reg = <0xe0000000 0x00000200>;
                bus-frequency = <0>;                    // from bootloader
index 49ca349..cdd3063 100644 (file)
@@ -50,6 +50,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x00100000>;
                reg = <0xe0000000 0x00000200>;
                bus-frequency = <0>;                    // from bootloader
index ba586cb..783241c 100644 (file)
@@ -57,6 +57,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x00100000>;
                reg = <0xe0000000 0x00000200>;
                bus-frequency = <0>;
index 3701dae..a3b76a7 100644 (file)
@@ -61,6 +61,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x00100000>;
                reg = <0xe0000000 0x00000200>;
                bus-frequency = <264000000>;
index 8acd1d6..89c9202 100644 (file)
                };
 
                crypto@30000 {
-                       compatible = "fsl,sec2-crypto";
+                       compatible = "fsl,sec2.0";
                        reg = <0x30000 0x10000>;
-                       interrupts = <11 8>;
+                       interrupts = <11 0x8>;
                        interrupt-parent = <&ipic>;
-                       num-channels = <4>;
-                       channel-fifo-len = <24>;
-                       exec-units-mask = <0x7e>;
-                       /*
-                        * desc mask is for rev1.x, we need runtime fixup
-                        * for >=2.x
-                        */
-                       descriptor-types-mask = <0x1010ebf>;
+                       fsl,num-channels = <4>;
+                       fsl,channel-fifo-len = <24>;
+                       fsl,exec-units-mask = <0x7e>;
+                       fsl,descriptor-types-mask = <0x01010ebf>;
                };
 
                ipic: interrupt-controller@700 {
index 0a700cb..432782b 100644 (file)
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x00100000>;
                reg = <0xe0000000 0x00000200>;
                bus-frequency = <0>;
index 29c8c76..ed32c8d 100644 (file)
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x00100000>;
                reg = <0xe0000000 0x00000200>;
                bus-frequency = <0>;
index d641a89..f4db9ed 100644 (file)
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x00100000>;
                reg = <0xe0000000 0x00000200>;
                bus-frequency = <0>;
index 02cfa24..1505d68 100644 (file)
@@ -49,6 +49,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xffe00000 0x100000>;
                reg = <0xffe00000 0x1000>;
                bus-frequency = <0>;            // Filled out by uboot.
index f2273a8..9568bfa 100644 (file)
@@ -53,6 +53,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x100000>;
                reg = <0xe0000000 0x100000>;    // CCSRBAR 1M
                bus-frequency = <0>;
index c4469f1..6480f4f 100644 (file)
@@ -53,6 +53,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x100000>;
                reg = <0xe0000000 0x1000>;      // CCSRBAR 1M
                bus-frequency = <0>;
index 7d3829d..f1fb207 100644 (file)
@@ -54,6 +54,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
 
                ranges = <0x0 0xe0000000 0x100000>;
                reg = <0xe0000000 0x1000>;      // CCSRBAR 1M
index d84466b..431b496 100644 (file)
@@ -58,6 +58,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x100000>;
                reg = <0xe0000000 0x1000>;      // CCSRBAR
                bus-frequency = <0>;
index e03a780..d833a5c 100644 (file)
@@ -53,6 +53,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x100000>;
                reg = <0xe0000000 0x1000>;      // CCSRBAR 1M
                bus-frequency = <0>;
index ba8159d..4d1f2f2 100644 (file)
@@ -53,6 +53,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x100000>;
                reg = <0xe0000000 0x200>;
                bus-frequency = <330000000>;
index 9c30a34..a15f103 100644 (file)
@@ -60,6 +60,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xe0000000 0x100000>;
                reg = <0xe0000000 0x1000>;
                bus-frequency = <0>;
index 08c61e3..e124dd1 100644 (file)
@@ -68,6 +68,7 @@
                #address-cells = <1>;
                #size-cells = <1>;
                device_type = "soc";
+               compatible = "simple-bus";
                ranges = <0x0 0xffe00000 0x100000>;
                reg = <0xffe00000 0x1000>;      // CCSRBAR & soc regs, remove once parse code for immrbase fixed
                bus-frequency = <0>;            // Filled out by uboot.
index dd4be4a..ec43477 100644 (file)
@@ -105,6 +105,7 @@ static void __init mpc832x_sys_setup_arch(void)
 static struct of_device_id mpc832x_ids[] = {
        { .type = "soc", },
        { .compatible = "soc", },
+       { .compatible = "simple-bus", },
        { .type = "qe", },
        { .compatible = "fsl,qe", },
        {},
index f049d69..0300268 100644 (file)
@@ -115,6 +115,7 @@ static void __init mpc832x_rdb_setup_arch(void)
 static struct of_device_id mpc832x_ids[] = {
        { .type = "soc", },
        { .compatible = "soc", },
+       { .compatible = "simple-bus", },
        { .type = "qe", },
        { .compatible = "fsl,qe", },
        {},
index 7301d77..76092d3 100644 (file)
@@ -41,6 +41,7 @@
 
 static struct of_device_id __initdata mpc834x_itx_ids[] = {
        { .compatible = "fsl,pq2pro-localbus", },
+       { .compatible = "simple-bus", },
        {},
 };
 
index 30d509a..fc3f2ed 100644 (file)
@@ -111,6 +111,7 @@ static void __init mpc834x_mds_init_IRQ(void)
 static struct of_device_id mpc834x_ids[] = {
        { .type = "soc", },
        { .compatible = "soc", },
+       { .compatible = "simple-bus", },
        {},
 };
 
index 75b80e8..9d46e5b 100644 (file)
@@ -136,6 +136,7 @@ static void __init mpc836x_mds_setup_arch(void)
 static struct of_device_id mpc836x_ids[] = {
        { .type = "soc", },
        { .compatible = "soc", },
+       { .compatible = "simple-bus", },
        { .type = "qe", },
        { .compatible = "fsl,qe", },
        {},
index fc21f5c..156c4e2 100644 (file)
@@ -83,6 +83,7 @@ static void __init sbc834x_init_IRQ(void)
 static struct __initdata of_device_id sbc834x_ids[] = {
        { .type = "soc", },
        { .compatible = "soc", },
+       { .compatible = "simple-bus", },
        {},
 };
 
index 2145ade..8a3b117 100644 (file)
@@ -222,6 +222,7 @@ static void ksi8560_show_cpuinfo(struct seq_file *m)
 
 static struct of_device_id __initdata of_bus_ids[] = {
        { .type = "soc", },
+       { .type = "simple-bus", },
        { .name = "cpm", },
        { .name = "localbus", },
        {},
index 6b846aa..1bf5aef 100644 (file)
@@ -91,6 +91,7 @@ static void __init mpc8536_ds_setup_arch(void)
 static struct of_device_id __initdata mpc8536_ds_ids[] = {
        { .type = "soc", },
        { .compatible = "soc", },
+       { .compatible = "simple-bus", },
        {},
 };
 
index ba498d6..d17807a 100644 (file)
@@ -230,6 +230,7 @@ static struct of_device_id __initdata of_bus_ids[] = {
        { .type = "soc", },
        { .name = "cpm", },
        { .name = "localbus", },
+       { .compatible = "simple-bus", },
        {},
 };
 
index 00c5358..483b65c 100644 (file)
@@ -186,6 +186,7 @@ static int __init mpc8544_ds_probe(void)
 static struct of_device_id __initdata mpc85xxds_ids[] = {
        { .type = "soc", },
        { .compatible = "soc", },
+       { .compatible = "simple-bus", },
        {},
 };
 
index 43a459f..2494c51 100644 (file)
@@ -260,6 +260,7 @@ machine_arch_initcall(mpc85xx_mds, board_fixups);
 static struct of_device_id mpc85xx_ids[] = {
        { .type = "soc", },
        { .compatible = "soc", },
+       { .compatible = "simple-bus", },
        { .type = "qe", },
        { .compatible = "fsl,qe", },
        {},
index 2c580cd..6509ade 100644 (file)
@@ -217,6 +217,7 @@ static struct of_device_id __initdata of_bus_ids[] = {
        { .type = "soc", },
        { .name = "cpm", },
        { .name = "localbus", },
+       { .compatible = "simple-bus", },
        {},
 };