powerpc/platforms: Use 'compatible' property for simple cases

Use the new 'compatible' property for simple cases.

checkpatch complains about the new compatible being undocumented
but in reality nothing is new so just ignore it for the time
being.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/6cb9865d916231c38401ba34ad1a98c249fae135.1676711562.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/platforms/44x/canyonlands.c b/arch/powerpc/platforms/44x/canyonlands.c
index 5b23aef8bdefbf640872f0ab1a86d9713a0a0e5d..ba561ca6c25fea96fee308c4770f03e53c747cdd 100644 (file)
--- a/arch/powerpc/platforms/44x/canyonlands.c
+++ b/arch/powerpc/platforms/44x/canyonlands.c
@@ -39,11 +39,9 @@ machine_device_initcall(canyonlands, ppc460ex_device_probe);
 
 static int __init ppc460ex_probe(void)
 {
-       if (of_machine_is_compatible("amcc,canyonlands")) {
-               pci_set_flags(PCI_REASSIGN_ALL_RSRC);
-               return 1;
-       }
-       return 0;
+       pci_set_flags(PCI_REASSIGN_ALL_RSRC);
+
+       return 1;
 }
 
 /* USB PHY fixup code on Canyonlands kit. */
@@ -110,6 +108,7 @@ err_bcsr:
 machine_device_initcall(canyonlands, ppc460ex_canyonlands_fixup);
 define_machine(canyonlands) {
        .name = "Canyonlands",
+       .compatible = "amcc,canyonlands",
        .probe = ppc460ex_probe,
        .progress = udbg_progress,
        .init_IRQ = uic_init_tree,

diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c
index 0d8f202bc45fa1695f807a56ef8fff09cb7a1932..5b9e57b4cd659407a0a520f1acc623b0e16884d8 100644 (file)
--- a/arch/powerpc/platforms/44x/ebony.c
+++ b/arch/powerpc/platforms/44x/ebony.c
@@ -45,9 +45,6 @@ machine_device_initcall(ebony, ebony_device_probe);
  */
 static int __init ebony_probe(void)
 {
-       if (!of_machine_is_compatible("ibm,ebony"))
-               return 0;
-
        pci_set_flags(PCI_REASSIGN_ALL_RSRC);
 
        return 1;
@@ -55,6 +52,7 @@ static int __init ebony_probe(void)
 
 define_machine(ebony) {
        .name                   = "Ebony",
+       .compatible             = "ibm,ebony",
        .probe                  = ebony_probe,
        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,

diff --git a/arch/powerpc/platforms/44x/iss4xx.c b/arch/powerpc/platforms/44x/iss4xx.c
index c5f82591408c16cbf95166eb90c2daef97b5396f..e779bd3d22916ffc2353411367c9c940f08bc96e 100644 (file)
--- a/arch/powerpc/platforms/44x/iss4xx.c
+++ b/arch/powerpc/platforms/44x/iss4xx.c
@@ -140,20 +140,9 @@ static void __init iss4xx_setup_arch(void)
        iss4xx_smp_init();
 }
 
-/*
- * Called very early, MMU is off, device-tree isn't unflattened
- */
-static int __init iss4xx_probe(void)
-{
-       if (!of_machine_is_compatible("ibm,iss-4xx"))
-               return 0;
-
-       return 1;
-}
-
 define_machine(iss4xx) {
        .name                   = "ISS-4xx",
-       .probe                  = iss4xx_probe,
+       .compatible             = "ibm,iss-4xx",
        .progress               = udbg_progress,
        .init_IRQ               = iss4xx_init_irq,
        .setup_arch             = iss4xx_setup_arch,

diff --git a/arch/powerpc/platforms/44x/sam440ep.c b/arch/powerpc/platforms/44x/sam440ep.c
index ed854b53877e8f09e51c92e9758eb6cb95099bcc..8b281e0274774832d70aa0369140931bd98d519e 100644 (file)
--- a/arch/powerpc/platforms/44x/sam440ep.c
+++ b/arch/powerpc/platforms/44x/sam440ep.c
@@ -41,9 +41,6 @@ machine_device_initcall(sam440ep, sam440ep_device_probe);
 
 static int __init sam440ep_probe(void)
 {
-       if (!of_machine_is_compatible("acube,sam440ep"))
-               return 0;
-
        pci_set_flags(PCI_REASSIGN_ALL_RSRC);
 
        return 1;
@@ -51,6 +48,7 @@ static int __init sam440ep_probe(void)
 
 define_machine(sam440ep) {
        .name                   = "Sam440ep",
+       .compatible             = "acube,sam440ep",
        .probe                  = sam440ep_probe,
        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,

diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
index cefa313c09f0b4226aab6e1a46c795b2aaf24c3a..acbc356e8a19c0abba4c24142afc47d5338fcbb2 100644 (file)
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
@@ -41,17 +41,9 @@ static int __init warp_device_probe(void)
 }
 machine_device_initcall(warp, warp_device_probe);
 
-static int __init warp_probe(void)
-{
-       if (!of_machine_is_compatible("pika,warp"))
-               return 0;
-
-       return 1;
-}
-
 define_machine(warp) {
        .name           = "Warp",
-       .probe          = warp_probe,
+       .compatible     = "pika,warp",
        .progress       = udbg_progress,
        .init_IRQ       = uic_init_tree,
        .get_irq        = uic_get_irq,

diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/platforms/512x/mpc5121_ads.c
index fc3fb999cd744960bfaa3eb2cf708d470fc098b2..0b6a2d3fd3436a7a580c59f5d73be7ae3109bb7e 100644 (file)
--- a/arch/powerpc/platforms/512x/mpc5121_ads.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads.c
@@ -53,9 +53,6 @@ static void __init mpc5121_ads_init_IRQ(void)
  */
 static int __init mpc5121_ads_probe(void)
 {
-       if (!of_machine_is_compatible("fsl,mpc5121ads"))
-               return 0;
-
        mpc512x_init_early();
 
        return 1;
@@ -63,6 +60,7 @@ static int __init mpc5121_ads_probe(void)
 
 define_machine(mpc5121_ads) {
        .name                   = "MPC5121 ADS",
+       .compatible             = "fsl,mpc5121ads",
        .probe                  = mpc5121_ads_probe,
        .setup_arch             = mpc5121_ads_setup_arch,
        .discover_phbs          = mpc5121_ads_setup_pci,

diff --git a/arch/powerpc/platforms/512x/pdm360ng.c b/arch/powerpc/platforms/512x/pdm360ng.c
index 1e911f42697d7658c512377a8457ccc1dc6fb112..d3a4eeb47bb104ae8b9cffa2b1a83121d6a3ad3f 100644 (file)
--- a/arch/powerpc/platforms/512x/pdm360ng.c
+++ b/arch/powerpc/platforms/512x/pdm360ng.c
@@ -108,9 +108,6 @@ void __init pdm360ng_init(void)
 
 static int __init pdm360ng_probe(void)
 {
-       if (!of_machine_is_compatible("ifm,pdm360ng"))
-               return 0;
-
        mpc512x_init_early();
 
        return 1;
@@ -118,6 +115,7 @@ static int __init pdm360ng_probe(void)
 
 define_machine(pdm360ng) {
        .name                   = "PDM360NG",
+       .compatible             = "ifm,pdm360ng",
        .probe                  = pdm360ng_probe,
        .setup_arch             = mpc512x_setup_arch,
        .init                   = pdm360ng_init,

diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index 33a35fff11b5cb043567fb1e70362fee85093cbb..a9c92c6ccbcfdb5bdde6862b05f9fe302ae857d3 100644 (file)
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -227,23 +227,9 @@ static void __init media5200_setup_arch(void)
 
 }
 
-/* list of the supported boards */
-static const char * const board[] __initconst = {
-       "fsl,media5200",
-       NULL
-};
-
-/*
- * Called very early, MMU is off, device-tree isn't unflattened
- */
-static int __init media5200_probe(void)
-{
-       return of_device_compatible_match(of_root, board);
-}
-
 define_machine(media5200_platform) {
        .name           = "media5200-platform",
-       .probe          = media5200_probe,
+       .compatible     = "fsl,media5200",
        .setup_arch     = media5200_setup_arch,
        .discover_phbs  = mpc52xx_setup_pci,
        .init           = mpc52xx_declare_of_platform_devices,

diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index 28e627f8a320f5678cfa934fba7bde2c3a0e5dab..66defdaf816fb7497f31dd7677bbf85ab8948c7b 100644 (file)
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -301,18 +301,10 @@ static int __init declare_of_platform_devices(void)
 }
 machine_device_initcall(ep8248e, declare_of_platform_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init ep8248e_probe(void)
-{
-       return of_machine_is_compatible("fsl,ep8248e");
-}
-
 define_machine(ep8248e)
 {
        .name = "Embedded Planet EP8248E",
-       .probe = ep8248e_probe,
+       .compatible = "fsl,ep8248e",
        .setup_arch = ep8248e_setup_arch,
        .init_IRQ = ep8248e_pic_init,
        .get_irq = cpm2_get_irq,

diff --git a/arch/powerpc/platforms/82xx/km82xx.c b/arch/powerpc/platforms/82xx/km82xx.c
index 1c8bbf4251d97db5669db9911e364b9fde92a147..8ab575d70080a1ef05f43c01d7ed6049dddeb9b2 100644 (file)
--- a/arch/powerpc/platforms/82xx/km82xx.c
+++ b/arch/powerpc/platforms/82xx/km82xx.c
@@ -188,18 +188,10 @@ static int __init declare_of_platform_devices(void)
 }
 machine_device_initcall(km82xx, declare_of_platform_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init km82xx_probe(void)
-{
-       return of_machine_is_compatible("keymile,km82xx");
-}
-
 define_machine(km82xx)
 {
        .name = "Keymile km82xx",
-       .probe = km82xx_probe,
+       .compatible = "keymile,km82xx",
        .setup_arch = km82xx_setup_arch,
        .init_IRQ = km82xx_pic_init,
        .get_irq = cpm2_get_irq,

diff --git a/arch/powerpc/platforms/82xx/mpc8272_ads.c b/arch/powerpc/platforms/82xx/mpc8272_ads.c
index 0b5b9dec16d5569ccdb469b4aad516df44abc583..5dd034ed2c8778acdf7a93e78ec1263d45b9439a 100644 (file)
--- a/arch/powerpc/platforms/82xx/mpc8272_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc8272_ads.c
@@ -191,18 +191,10 @@ static int __init declare_of_platform_devices(void)
 }
 machine_device_initcall(mpc8272_ads, declare_of_platform_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init mpc8272_ads_probe(void)
-{
-       return of_machine_is_compatible("fsl,mpc8272ads");
-}
-
 define_machine(mpc8272_ads)
 {
        .name = "Freescale MPC8272 ADS",
-       .probe = mpc8272_ads_probe,
+       .compatible = "fsl,mpc8272ads",
        .setup_arch = mpc8272_ads_setup_arch,
        .discover_phbs = pq2_init_pci,
        .init_IRQ = mpc8272_ads_pic_init,

diff --git a/arch/powerpc/platforms/82xx/pq2fads.c b/arch/powerpc/platforms/82xx/pq2fads.c
index ac9113d524af1a9ed6bab873c489b766f794efa6..d91dfdc634e97afbdcfc7caca34723e1846401a2 100644 (file)
--- a/arch/powerpc/platforms/82xx/pq2fads.c
+++ b/arch/powerpc/platforms/82xx/pq2fads.c
@@ -154,14 +154,6 @@ static void __init pq2fads_setup_arch(void)
                ppc_md.progress("pq2fads_setup_arch(), finish", 0);
 }
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init pq2fads_probe(void)
-{
-       return of_machine_is_compatible("fsl,pq2fads");
-}
-
 static const struct of_device_id of_bus_ids[] __initconst = {
        { .name = "soc", },
        { .name = "cpm", },
@@ -180,7 +172,7 @@ machine_device_initcall(pq2fads, declare_of_platform_devices);
 define_machine(pq2fads)
 {
        .name = "Freescale PQ2FADS",
-       .probe = pq2fads_probe,
+       .compatible = "fsl,pq2fads",
        .setup_arch = pq2fads_setup_arch,
        .discover_phbs = pq2_init_pci,
        .init_IRQ = pq2fads_pic_init,

diff --git a/arch/powerpc/platforms/83xx/asp834x.c b/arch/powerpc/platforms/83xx/asp834x.c
index 68061c2a57c14d1fd0a492d126365abbf1affdf6..8f3d995027febad5f935537def806b952a59909b 100644 (file)
--- a/arch/powerpc/platforms/83xx/asp834x.c
+++ b/arch/powerpc/platforms/83xx/asp834x.c
@@ -32,17 +32,9 @@ static void __init asp834x_setup_arch(void)
 
 machine_device_initcall(asp834x, mpc83xx_declare_of_platform_devices);
 
-/*
- * Called very early, MMU is off, device-tree isn't unflattened
- */
-static int __init asp834x_probe(void)
-{
-       return of_machine_is_compatible("analogue-and-micro,asp8347e");
-}
-
 define_machine(asp834x) {
        .name                   = "ASP8347E",
-       .probe                  = asp834x_probe,
+       .compatible             = "analogue-and-micro,asp8347e",
        .setup_arch             = asp834x_setup_arch,
        .discover_phbs          = mpc83xx_setup_pci,
        .init_IRQ               = mpc83xx_ipic_init_IRQ,

diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c
index 435344405d2c7dcbb3dced8992bab02bd0fb88ff..01035eff7d2eef8678e16cc56df2ae314b7df856 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc832x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c
@@ -88,17 +88,9 @@ static void __init mpc832x_sys_setup_arch(void)
 
 machine_device_initcall(mpc832x_mds, mpc83xx_declare_of_platform_devices);
 
-/*
- * Called very early, MMU is off, device-tree isn't unflattened
- */
-static int __init mpc832x_sys_probe(void)
-{
-       return of_machine_is_compatible("MPC832xMDS");
-}
-
 define_machine(mpc832x_mds) {
        .name           = "MPC832x MDS",
-       .probe          = mpc832x_sys_probe,
+       .compatible     = "MPC832xMDS",
        .setup_arch     = mpc832x_sys_setup_arch,
        .discover_phbs  = mpc83xx_setup_pci,
        .init_IRQ       = mpc83xx_ipic_init_IRQ,

diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
index caa96edf0e72acce568ec38982f369150b84d0e5..6b7b852e48bfc9ce17cb53af1ef8581b6f39234f 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c
+++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -212,17 +212,9 @@ static void __init mpc832x_rdb_setup_arch(void)
 
 machine_device_initcall(mpc832x_rdb, mpc83xx_declare_of_platform_devices);
 
-/*
- * Called very early, MMU is off, device-tree isn't unflattened
- */
-static int __init mpc832x_rdb_probe(void)
-{
-       return of_machine_is_compatible("MPC832xRDB");
-}
-
 define_machine(mpc832x_rdb) {
        .name           = "MPC832x RDB",
-       .probe          = mpc832x_rdb_probe,
+       .compatible     = "MPC832xRDB",
        .setup_arch     = mpc832x_rdb_setup_arch,
        .discover_phbs  = mpc83xx_setup_pci,
        .init_IRQ       = mpc83xx_ipic_init_IRQ,

diff --git a/arch/powerpc/platforms/83xx/mpc834x_itx.c b/arch/powerpc/platforms/83xx/mpc834x_itx.c
index 6a110f275304ade3b568a0eac86946c7857b04a8..92ff7be472c3092750712f96edb34e1645a545fa 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc834x_itx.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_itx.c
@@ -57,17 +57,9 @@ static void __init mpc834x_itx_setup_arch(void)
        mpc834x_usb_cfg();
 }
 
-/*
- * Called very early, MMU is off, device-tree isn't unflattened
- */
-static int __init mpc834x_itx_probe(void)
-{
-       return of_machine_is_compatible("MPC834xMITX");
-}
-
 define_machine(mpc834x_itx) {
        .name                   = "MPC834x ITX",
-       .probe                  = mpc834x_itx_probe,
+       .compatible             = "MPC834xMITX",
        .setup_arch             = mpc834x_itx_setup_arch,
        .discover_phbs          = mpc83xx_setup_pci,
        .init_IRQ               = mpc83xx_ipic_init_IRQ,

diff --git a/arch/powerpc/platforms/83xx/mpc834x_mds.c b/arch/powerpc/platforms/83xx/mpc834x_mds.c
index 7dde5a75332b6033405fa5a8d35dc239de005c7f..8e45c034daaf557ddbf6bf01a130d142e6d5f78e 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc834x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc834x_mds.c
@@ -79,17 +79,9 @@ static void __init mpc834x_mds_setup_arch(void)
 
 machine_device_initcall(mpc834x_mds, mpc83xx_declare_of_platform_devices);
 
-/*
- * Called very early, MMU is off, device-tree isn't unflattened
- */
-static int __init mpc834x_mds_probe(void)
-{
-       return of_machine_is_compatible("MPC834xMDS");
-}
-
 define_machine(mpc834x_mds) {
        .name                   = "MPC834x MDS",
-       .probe                  = mpc834x_mds_probe,
+       .compatible             = "MPC834xMDS",
        .setup_arch             = mpc834x_mds_setup_arch,
        .discover_phbs          = mpc83xx_setup_pci,
        .init_IRQ               = mpc83xx_ipic_init_IRQ,

diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c
index b1e6665be5d3572cf06cd4b343c1d334ef9cfe30..4ae2b6e4b513de0fb148875e0a2e1a5bfdbbdd9a 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc836x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c
@@ -188,17 +188,9 @@ err:
 machine_arch_initcall(mpc836x_mds, mpc836x_usb_cfg);
 #endif /* CONFIG_QE_USB */
 
-/*
- * Called very early, MMU is off, device-tree isn't unflattened
- */
-static int __init mpc836x_mds_probe(void)
-{
-       return of_machine_is_compatible("MPC836xMDS");
-}
-
 define_machine(mpc836x_mds) {
        .name           = "MPC836x MDS",
-       .probe          = mpc836x_mds_probe,
+       .compatible     = "MPC836xMDS",
        .setup_arch     = mpc836x_mds_setup_arch,
        .discover_phbs  = mpc83xx_setup_pci,
        .init_IRQ       = mpc83xx_ipic_init_IRQ,

diff --git a/arch/powerpc/platforms/83xx/mpc836x_rdk.c b/arch/powerpc/platforms/83xx/mpc836x_rdk.c
index 731bc5ce726de646cf33b09ee6fe7b0f25c3da28..231a5df0399b835d79c4fd92528bc6d7e3007e07 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc836x_rdk.c
+++ b/arch/powerpc/platforms/83xx/mpc836x_rdk.c
@@ -28,17 +28,9 @@ static void __init mpc836x_rdk_setup_arch(void)
        mpc83xx_setup_arch();
 }
 
-/*
- * Called very early, MMU is off, device-tree isn't unflattened.
- */
-static int __init mpc836x_rdk_probe(void)
-{
-       return of_machine_is_compatible("fsl,mpc8360rdk");
-}
-
 define_machine(mpc836x_rdk) {
        .name           = "MPC836x RDK",
-       .probe          = mpc836x_rdk_probe,
+       .compatible     = "fsl,mpc8360rdk",
        .setup_arch     = mpc836x_rdk_setup_arch,
        .discover_phbs  = mpc83xx_setup_pci,
        .init_IRQ       = mpc83xx_ipic_init_IRQ,

diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c
index fa3538803af761999b2cde1c30d466b45fed03c9..0c10100756d4991ed22cba206d2ea6e8c5439b5e 100644 (file)
--- a/arch/powerpc/platforms/83xx/mpc837x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c
@@ -81,17 +81,9 @@ static void __init mpc837x_mds_setup_arch(void)
 
 machine_device_initcall(mpc837x_mds, mpc83xx_declare_of_platform_devices);
 
-/*
- * Called very early, MMU is off, device-tree isn't unflattened
- */
-static int __init mpc837x_mds_probe(void)
-{
-       return of_machine_is_compatible("fsl,mpc837xmds");
-}
-
 define_machine(mpc837x_mds) {
        .name                   = "MPC837x MDS",
-       .probe                  = mpc837x_mds_probe,
+       .compatible             = "fsl,mpc837xmds",
        .setup_arch             = mpc837x_mds_setup_arch,
        .discover_phbs          = mpc83xx_setup_pci,
        .init_IRQ               = mpc83xx_ipic_init_IRQ,

diff --git a/arch/powerpc/platforms/85xx/bsc913x_qds.c b/arch/powerpc/platforms/85xx/bsc913x_qds.c
index bcbbeb5a972a5146d24c3a53e539c893a49af07e..902a867352c29090f0f51a710fe7c43576264f75 100644 (file)
--- a/arch/powerpc/platforms/85xx/bsc913x_qds.c
+++ b/arch/powerpc/platforms/85xx/bsc913x_qds.c
@@ -50,18 +50,9 @@ static void __init bsc913x_qds_setup_arch(void)
 
 machine_arch_initcall(bsc9132_qds, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-
-static int __init bsc9132_qds_probe(void)
-{
-       return of_machine_is_compatible("fsl,bsc9132qds");
-}
-
 define_machine(bsc9132_qds) {
        .name                   = "BSC9132 QDS",
-       .probe                  = bsc9132_qds_probe,
+       .compatible             = "fsl,bsc9132qds",
        .setup_arch             = bsc913x_qds_setup_arch,
        .init_IRQ               = bsc913x_qds_pic_init,
 #ifdef CONFIG_PCI

diff --git a/arch/powerpc/platforms/85xx/bsc913x_rdb.c b/arch/powerpc/platforms/85xx/bsc913x_rdb.c
index f78e5d3deedb21166a7f3bd472e0f1c63aa271c2..58a44953b936bae8f8fdcd4f4aed61bd69b6f724 100644 (file)
--- a/arch/powerpc/platforms/85xx/bsc913x_rdb.c
+++ b/arch/powerpc/platforms/85xx/bsc913x_rdb.c
@@ -40,18 +40,9 @@ static void __init bsc913x_rdb_setup_arch(void)
 
 machine_device_initcall(bsc9131_rdb, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-
-static int __init bsc9131_rdb_probe(void)
-{
-       return of_machine_is_compatible("fsl,bsc9131rdb");
-}
-
 define_machine(bsc9131_rdb) {
        .name                   = "BSC9131 RDB",
-       .probe                  = bsc9131_rdb_probe,
+       .compatible             = "fsl,bsc9131rdb",
        .setup_arch             = bsc913x_rdb_setup_arch,
        .init_IRQ               = bsc913x_rdb_pic_init,
        .get_irq                = mpic_get_irq,

diff --git a/arch/powerpc/platforms/85xx/c293pcie.c b/arch/powerpc/platforms/85xx/c293pcie.c
index 58a398c89e97340e35f51e94d14f6b6fc5a6c602..fbf1875e5835d4b2e92d8fb015df32696811263c 100644 (file)
--- a/arch/powerpc/platforms/85xx/c293pcie.c
+++ b/arch/powerpc/platforms/85xx/c293pcie.c
@@ -45,19 +45,9 @@ static void __init c293_pcie_setup_arch(void)
 
 machine_arch_initcall(c293_pcie, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init c293_pcie_probe(void)
-{
-       if (of_machine_is_compatible("fsl,C293PCIE"))
-               return 1;
-       return 0;
-}
-
 define_machine(c293_pcie) {
        .name                   = "C293 PCIE",
-       .probe                  = c293_pcie_probe,
+       .compatible             = "fsl,C293PCIE",
        .setup_arch             = c293_pcie_setup_arch,
        .init_IRQ               = c293_pcie_pic_init,
        .get_irq                = mpic_get_irq,

diff --git a/arch/powerpc/platforms/85xx/ge_imp3a.c b/arch/powerpc/platforms/85xx/ge_imp3a.c
index e3e8f18825a1b5ff66fb48f811b9de4d8a5d2346..1bfd4ea130387f6aaf4da31d6f8ea81201baf06b 100644 (file)
--- a/arch/powerpc/platforms/85xx/ge_imp3a.c
+++ b/arch/powerpc/platforms/85xx/ge_imp3a.c
@@ -190,19 +190,11 @@ static void ge_imp3a_show_cpuinfo(struct seq_file *m)
                ge_imp3a_get_cpci_is_syscon() ? "yes" : "no");
 }
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init ge_imp3a_probe(void)
-{
-       return of_machine_is_compatible("ge,IMP3A");
-}
-
 machine_arch_initcall(ge_imp3a, mpc85xx_common_publish_devices);
 
 define_machine(ge_imp3a) {
        .name                   = "GE_IMP3A",
-       .probe                  = ge_imp3a_probe,
+       .compatible             = "ge,IMP3A",
        .setup_arch             = ge_imp3a_setup_arch,
        .init_IRQ               = ge_imp3a_pic_init,
        .show_cpuinfo           = ge_imp3a_show_cpuinfo,

diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c
index a22f02b0fc77c43cbfe12c333732d286350450c0..548d478e5194e06358c68da05ac68946180828d8 100644 (file)
--- a/arch/powerpc/platforms/85xx/ksi8560.c
+++ b/arch/powerpc/platforms/85xx/ksi8560.c
@@ -172,17 +172,9 @@ static void ksi8560_show_cpuinfo(struct seq_file *m)
 
 machine_device_initcall(ksi8560, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init ksi8560_probe(void)
-{
-       return of_machine_is_compatible("emerson,KSI8560");
-}
-
 define_machine(ksi8560) {
        .name                   = "KSI8560",
-       .probe                  = ksi8560_probe,
+       .compatible             = "emerson,KSI8560",
        .setup_arch             = ksi8560_setup_arch,
        .init_IRQ               = ksi8560_pic_init,
        .show_cpuinfo           = ksi8560_show_cpuinfo,

diff --git a/arch/powerpc/platforms/85xx/mpc8536_ds.c b/arch/powerpc/platforms/85xx/mpc8536_ds.c
index e5d7386ad61258b0327bb8c35c36c00d09cbad5b..9900cf2cd3925eb15ffc06eca8564f8b428a0db8 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc8536_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc8536_ds.c
@@ -52,17 +52,9 @@ static void __init mpc8536_ds_setup_arch(void)
 
 machine_arch_initcall(mpc8536_ds, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init mpc8536_ds_probe(void)
-{
-       return of_machine_is_compatible("fsl,mpc8536ds");
-}
-
 define_machine(mpc8536_ds) {
        .name                   = "MPC8536 DS",
-       .probe                  = mpc8536_ds_probe,
+       .compatible             = "fsl,mpc8536ds",
        .setup_arch             = mpc8536_ds_setup_arch,
        .init_IRQ               = mpc8536_ds_pic_init,
 #ifdef CONFIG_PCI

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index a34fc037957d085f942ef69332eb0553677d7853..dd5302ab406d3b21bd53994e09719914699a92c7 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -151,17 +151,9 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
 
 machine_arch_initcall(mpc85xx_ads, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init mpc85xx_ads_probe(void)
-{
-       return of_machine_is_compatible("MPC85xxADS");
-}
-
 define_machine(mpc85xx_ads) {
        .name                   = "MPC85xx ADS",
-       .probe                  = mpc85xx_ads_probe,
+       .compatible             = "MPC85xxADS",
        .setup_arch             = mpc85xx_ads_setup_arch,
        .init_IRQ               = mpc85xx_ads_pic_init,
        .show_cpuinfo           = mpc85xx_ads_show_cpuinfo,

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 0b8f2101c5fba9f6af6884e0639781cb7a79ac71..d7568b35ec78936ce05e434ae0d5c400f2783f16 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -370,20 +370,11 @@ static void mpc85xx_cds_show_cpuinfo(struct seq_file *m)
        seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
 }
 
-
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init mpc85xx_cds_probe(void)
-{
-       return of_machine_is_compatible("MPC85xxCDS");
-}
-
 machine_arch_initcall(mpc85xx_cds, mpc85xx_common_publish_devices);
 
 define_machine(mpc85xx_cds) {
        .name           = "MPC85xx CDS",
-       .probe          = mpc85xx_cds_probe,
+       .compatible     = "MPC85xxCDS",
        .setup_arch     = mpc85xx_cds_setup_arch,
        .init_IRQ       = mpc85xx_cds_pic_init,
        .show_cpuinfo   = mpc85xx_cds_show_cpuinfo,

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index f8d2c97f39bd893c7934dcbf33596b1a04b75772..b4feb251b57eb154ffa991f85b75ed4843310f16 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -158,37 +158,13 @@ static void __init mpc85xx_ds_setup_arch(void)
        printk("MPC85xx DS board from Freescale Semiconductor\n");
 }
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init mpc8544_ds_probe(void)
-{
-       return !!of_machine_is_compatible("MPC8544DS");
-}
-
 machine_arch_initcall(mpc8544_ds, mpc85xx_common_publish_devices);
 machine_arch_initcall(mpc8572_ds, mpc85xx_common_publish_devices);
 machine_arch_initcall(p2020_ds, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init mpc8572_ds_probe(void)
-{
-       return !!of_machine_is_compatible("fsl,MPC8572DS");
-}
-
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init p2020_ds_probe(void)
-{
-       return !!of_machine_is_compatible("fsl,P2020DS");
-}
-
 define_machine(mpc8544_ds) {
        .name                   = "MPC8544 DS",
-       .probe                  = mpc8544_ds_probe,
+       .compatible             = "MPC8544DS",
        .setup_arch             = mpc85xx_ds_setup_arch,
        .init_IRQ               = mpc85xx_ds_pic_init,
 #ifdef CONFIG_PCI
@@ -202,7 +178,7 @@ define_machine(mpc8544_ds) {
 
 define_machine(mpc8572_ds) {
        .name                   = "MPC8572 DS",
-       .probe                  = mpc8572_ds_probe,
+       .compatible             = "fsl,MPC8572DS",
        .setup_arch             = mpc85xx_ds_setup_arch,
        .init_IRQ               = mpc85xx_ds_pic_init,
 #ifdef CONFIG_PCI
@@ -216,7 +192,7 @@ define_machine(mpc8572_ds) {
 
 define_machine(p2020_ds) {
        .name                   = "P2020 DS",
-       .probe                  = p2020_ds_probe,
+       .compatible             = "fsl,P2020DS",
        .setup_arch             = mpc85xx_ds_setup_arch,
        .init_IRQ               = mpc85xx_ds_pic_init,
 #ifdef CONFIG_PCI

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
index 3a2ac410af18b7977bc2be2acd03d846da9d3384..721322e04c7984a2375bd6e571e4a065db63f59d 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c
@@ -339,14 +339,9 @@ static void __init mpc85xx_mds_pic_init(void)
        mpic_init(mpic);
 }
 
-static int __init mpc85xx_mds_probe(void)
-{
-       return of_machine_is_compatible("MPC85xxMDS");
-}
-
 define_machine(mpc8568_mds) {
        .name           = "MPC8568 MDS",
-       .probe          = mpc85xx_mds_probe,
+       .compatible     = "MPC85xxMDS",
        .setup_arch     = mpc85xx_mds_setup_arch,
        .init_IRQ       = mpc85xx_mds_pic_init,
        .get_irq        = mpic_get_irq,
@@ -358,14 +353,9 @@ define_machine(mpc8568_mds) {
 #endif
 };
 
-static int __init mpc8569_mds_probe(void)
-{
-       return of_machine_is_compatible("fsl,MPC8569EMDS");
-}
-
 define_machine(mpc8569_mds) {
        .name           = "MPC8569 MDS",
-       .probe          = mpc8569_mds_probe,
+       .compatible     = "fsl,MPC8569EMDS",
        .setup_arch     = mpc85xx_mds_setup_arch,
        .init_IRQ       = mpc85xx_mds_pic_init,
        .get_irq        = mpic_get_irq,
@@ -377,15 +367,9 @@ define_machine(mpc8569_mds) {
 #endif
 };
 
-static int __init p1021_mds_probe(void)
-{
-       return of_machine_is_compatible("fsl,P1021MDS");
-
-}
-
 define_machine(p1021_mds) {
        .name           = "P1021 MDS",
-       .probe          = p1021_mds_probe,
+       .compatible     = "fsl,P1021MDS",
        .setup_arch     = mpc85xx_mds_setup_arch,
        .init_IRQ       = mpc85xx_mds_pic_init,
        .get_irq        = mpic_get_irq,

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
index d99aba158235cdc8e7bec7100077646a6badf893..9754feaebcd48864155f9dbdf1016e8c310ab44a 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
@@ -119,70 +119,9 @@ machine_arch_initcall(p1021_rdb_pc, mpc85xx_common_publish_devices);
 machine_arch_initcall(p1025_rdb, mpc85xx_common_publish_devices);
 machine_arch_initcall(p1024_rdb, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init p2020_rdb_probe(void)
-{
-       if (of_machine_is_compatible("fsl,P2020RDB"))
-               return 1;
-       return 0;
-}
-
-static int __init p1020_rdb_probe(void)
-{
-       if (of_machine_is_compatible("fsl,P1020RDB"))
-               return 1;
-       return 0;
-}
-
-static int __init p1020_rdb_pc_probe(void)
-{
-       return of_machine_is_compatible("fsl,P1020RDB-PC");
-}
-
-static int __init p1020_rdb_pd_probe(void)
-{
-       return of_machine_is_compatible("fsl,P1020RDB-PD");
-}
-
-static int __init p1021_rdb_pc_probe(void)
-{
-       if (of_machine_is_compatible("fsl,P1021RDB-PC"))
-               return 1;
-       return 0;
-}
-
-static int __init p2020_rdb_pc_probe(void)
-{
-       if (of_machine_is_compatible("fsl,P2020RDB-PC"))
-               return 1;
-       return 0;
-}
-
-static int __init p1025_rdb_probe(void)
-{
-       return of_machine_is_compatible("fsl,P1025RDB");
-}
-
-static int __init p1020_mbg_pc_probe(void)
-{
-       return of_machine_is_compatible("fsl,P1020MBG-PC");
-}
-
-static int __init p1020_utm_pc_probe(void)
-{
-       return of_machine_is_compatible("fsl,P1020UTM-PC");
-}
-
-static int __init p1024_rdb_probe(void)
-{
-       return of_machine_is_compatible("fsl,P1024RDB");
-}
-
 define_machine(p2020_rdb) {
        .name                   = "P2020 RDB",
-       .probe                  = p2020_rdb_probe,
+       .compatible             = "fsl,P2020RDB",
        .setup_arch             = mpc85xx_rdb_setup_arch,
        .init_IRQ               = mpc85xx_rdb_pic_init,
 #ifdef CONFIG_PCI
@@ -196,7 +135,7 @@ define_machine(p2020_rdb) {
 
 define_machine(p1020_rdb) {
        .name                   = "P1020 RDB",
-       .probe                  = p1020_rdb_probe,
+       .compatible             = "fsl,P1020RDB",
        .setup_arch             = mpc85xx_rdb_setup_arch,
        .init_IRQ               = mpc85xx_rdb_pic_init,
 #ifdef CONFIG_PCI
@@ -210,7 +149,7 @@ define_machine(p1020_rdb) {
 
 define_machine(p1021_rdb_pc) {
        .name                   = "P1021 RDB-PC",
-       .probe                  = p1021_rdb_pc_probe,
+       .compatible             = "fsl,P1021RDB-PC",
        .setup_arch             = mpc85xx_rdb_setup_arch,
        .init_IRQ               = mpc85xx_rdb_pic_init,
 #ifdef CONFIG_PCI
@@ -224,7 +163,7 @@ define_machine(p1021_rdb_pc) {
 
 define_machine(p2020_rdb_pc) {
        .name                   = "P2020RDB-PC",
-       .probe                  = p2020_rdb_pc_probe,
+       .compatible             = "fsl,P2020RDB-PC",
        .setup_arch             = mpc85xx_rdb_setup_arch,
        .init_IRQ               = mpc85xx_rdb_pic_init,
 #ifdef CONFIG_PCI
@@ -238,7 +177,7 @@ define_machine(p2020_rdb_pc) {
 
 define_machine(p1025_rdb) {
        .name                   = "P1025 RDB",
-       .probe                  = p1025_rdb_probe,
+       .compatible             = "fsl,P1025RDB",
        .setup_arch             = mpc85xx_rdb_setup_arch,
        .init_IRQ               = mpc85xx_rdb_pic_init,
 #ifdef CONFIG_PCI
@@ -252,7 +191,7 @@ define_machine(p1025_rdb) {
 
 define_machine(p1020_mbg_pc) {
        .name                   = "P1020 MBG-PC",
-       .probe                  = p1020_mbg_pc_probe,
+       .compatible             = "fsl,P1020MBG-PC",
        .setup_arch             = mpc85xx_rdb_setup_arch,
        .init_IRQ               = mpc85xx_rdb_pic_init,
 #ifdef CONFIG_PCI
@@ -266,7 +205,7 @@ define_machine(p1020_mbg_pc) {
 
 define_machine(p1020_utm_pc) {
        .name                   = "P1020 UTM-PC",
-       .probe                  = p1020_utm_pc_probe,
+       .compatible             = "fsl,P1020UTM-PC",
        .setup_arch             = mpc85xx_rdb_setup_arch,
        .init_IRQ               = mpc85xx_rdb_pic_init,
 #ifdef CONFIG_PCI
@@ -280,7 +219,7 @@ define_machine(p1020_utm_pc) {
 
 define_machine(p1020_rdb_pc) {
        .name                   = "P1020RDB-PC",
-       .probe                  = p1020_rdb_pc_probe,
+       .compatible             = "fsl,P1020RDB-PC",
        .setup_arch             = mpc85xx_rdb_setup_arch,
        .init_IRQ               = mpc85xx_rdb_pic_init,
 #ifdef CONFIG_PCI
@@ -294,7 +233,7 @@ define_machine(p1020_rdb_pc) {
 
 define_machine(p1020_rdb_pd) {
        .name                   = "P1020RDB-PD",
-       .probe                  = p1020_rdb_pd_probe,
+       .compatible             = "fsl,P1020RDB-PD",
        .setup_arch             = mpc85xx_rdb_setup_arch,
        .init_IRQ               = mpc85xx_rdb_pic_init,
 #ifdef CONFIG_PCI
@@ -308,7 +247,7 @@ define_machine(p1020_rdb_pd) {
 
 define_machine(p1024_rdb) {
        .name                   = "P1024 RDB",
-       .probe                  = p1024_rdb_probe,
+       .compatible             = "fsl,P1024RDB",
        .setup_arch             = mpc85xx_rdb_setup_arch,
        .init_IRQ               = mpc85xx_rdb_pic_init,
 #ifdef CONFIG_PCI

diff --git a/arch/powerpc/platforms/85xx/mvme2500.c b/arch/powerpc/platforms/85xx/mvme2500.c
index 69d5aa082a4b217af2ece46f9830acf206abdc0f..ee1383e811d98e3c96812ff3cd9df0b1bbb894d2 100644 (file)
--- a/arch/powerpc/platforms/85xx/mvme2500.c
+++ b/arch/powerpc/platforms/85xx/mvme2500.c
@@ -43,17 +43,9 @@ static void __init mvme2500_setup_arch(void)
 
 machine_arch_initcall(mvme2500, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init mvme2500_probe(void)
-{
-       return of_machine_is_compatible("artesyn,MVME2500");
-}
-
 define_machine(mvme2500) {
        .name                   = "MVME2500",
-       .probe                  = mvme2500_probe,
+       .compatible             = "artesyn,MVME2500",
        .setup_arch             = mvme2500_setup_arch,
        .init_IRQ               = mvme2500_pic_init,
 #ifdef CONFIG_PCI

diff --git a/arch/powerpc/platforms/85xx/p1022_ds.c b/arch/powerpc/platforms/85xx/p1022_ds.c
index 537599906146441c8c068fe5b1834a2c1bd97ef6..15a684ce920188d75c2096c8116d8f3a85ecc5d9 100644 (file)
--- a/arch/powerpc/platforms/85xx/p1022_ds.c
+++ b/arch/powerpc/platforms/85xx/p1022_ds.c
@@ -549,17 +549,9 @@ static void __init p1022_ds_setup_arch(void)
 
 machine_arch_initcall(p1022_ds, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init p1022_ds_probe(void)
-{
-       return of_machine_is_compatible("fsl,p1022ds");
-}
-
 define_machine(p1022_ds) {
        .name                   = "P1022 DS",
-       .probe                  = p1022_ds_probe,
+       .compatible             = "fsl,p1022ds",
        .setup_arch             = p1022_ds_setup_arch,
        .init_IRQ               = p1022_ds_pic_init,
 #ifdef CONFIG_PCI

diff --git a/arch/powerpc/platforms/85xx/p1022_rdk.c b/arch/powerpc/platforms/85xx/p1022_rdk.c
index bc58a99164c9841fc19b1e4c9beaf8f82ff9d7ab..aee9ffc0eb17101c25189218a0db436e112de01e 100644 (file)
--- a/arch/powerpc/platforms/85xx/p1022_rdk.c
+++ b/arch/powerpc/platforms/85xx/p1022_rdk.c
@@ -129,17 +129,9 @@ static void __init p1022_rdk_setup_arch(void)
 
 machine_arch_initcall(p1022_rdk, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init p1022_rdk_probe(void)
-{
-       return of_machine_is_compatible("fsl,p1022rdk");
-}
-
 define_machine(p1022_rdk) {
        .name                   = "P1022 RDK",
-       .probe                  = p1022_rdk_probe,
+       .compatible             = "fsl,p1022rdk",
        .setup_arch             = p1022_rdk_setup_arch,
        .init_IRQ               = p1022_rdk_pic_init,
 #ifdef CONFIG_PCI

diff --git a/arch/powerpc/platforms/85xx/p1023_rdb.c b/arch/powerpc/platforms/85xx/p1023_rdb.c
index c04868eb2eb19ee0ce85c5a2174bcc44a315b409..37e78f40d42432b00c286222a2bbf72fbf10d9d5 100644 (file)
--- a/arch/powerpc/platforms/85xx/p1023_rdb.c
+++ b/arch/powerpc/platforms/85xx/p1023_rdb.c
@@ -94,15 +94,9 @@ static void __init mpc85xx_rdb_pic_init(void)
        mpic_init(mpic);
 }
 
-static int __init p1023_rdb_probe(void)
-{
-       return of_machine_is_compatible("fsl,P1023RDB");
-
-}
-
 define_machine(p1023_rdb) {
        .name                   = "P1023 RDB",
-       .probe                  = p1023_rdb_probe,
+       .compatible             = "fsl,P1023RDB",
        .setup_arch             = mpc85xx_rdb_setup_arch,
        .init_IRQ               = mpc85xx_rdb_pic_init,
        .get_irq                = mpic_get_irq,

diff --git a/arch/powerpc/platforms/85xx/ppa8548.c b/arch/powerpc/platforms/85xx/ppa8548.c
index 0faf2990bf2c18a436462e0b60cc829659d92b4b..b030d0e7b06b6ce6d13f974e913ef834b2db2a91 100644 (file)
--- a/arch/powerpc/platforms/85xx/ppa8548.c
+++ b/arch/powerpc/platforms/85xx/ppa8548.c
@@ -72,17 +72,9 @@ static int __init declare_of_platform_devices(void)
 }
 machine_device_initcall(ppa8548, declare_of_platform_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init ppa8548_probe(void)
-{
-       return of_machine_is_compatible("ppa8548");
-}
-
 define_machine(ppa8548) {
        .name           = "ppa8548",
-       .probe          = ppa8548_probe,
+       .compatible     = "ppa8548",
        .setup_arch     = ppa8548_setup_arch,
        .init_IRQ       = ppa8548_pic_init,
        .show_cpuinfo   = ppa8548_show_cpuinfo,

diff --git a/arch/powerpc/platforms/85xx/qemu_e500.c b/arch/powerpc/platforms/85xx/qemu_e500.c
index 1639e222cc33f015a239aab0ab31cda4085ca60c..335815a2d121ee40c90e6560bd8dc277f7bcbf7d 100644 (file)
--- a/arch/powerpc/platforms/85xx/qemu_e500.c
+++ b/arch/powerpc/platforms/85xx/qemu_e500.c
@@ -46,19 +46,11 @@ static void __init qemu_e500_setup_arch(void)
        mpc85xx_smp_init();
 }
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init qemu_e500_probe(void)
-{
-       return !!of_machine_is_compatible("fsl,qemu-e500");
-}
-
 machine_arch_initcall(qemu_e500, mpc85xx_common_publish_devices);
 
 define_machine(qemu_e500) {
        .name                   = "QEMU e500",
-       .probe                  = qemu_e500_probe,
+       .compatible             = "fsl,qemu-e500",
        .setup_arch             = qemu_e500_setup_arch,
        .init_IRQ               = qemu_e500_pic_init,
 #ifdef CONFIG_PCI

diff --git a/arch/powerpc/platforms/85xx/socrates.c b/arch/powerpc/platforms/85xx/socrates.c
index 09f64470c7658c985836debd3346b2299c442619..f603a39058013db7a0e3b9d02fdba3262e3a8bd4 100644 (file)
--- a/arch/powerpc/platforms/85xx/socrates.c
+++ b/arch/powerpc/platforms/85xx/socrates.c
@@ -69,20 +69,9 @@ static void __init socrates_setup_arch(void)
 
 machine_arch_initcall(socrates, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init socrates_probe(void)
-{
-       if (of_machine_is_compatible("abb,socrates"))
-               return 1;
-
-       return 0;
-}
-
 define_machine(socrates) {
        .name                   = "Socrates",
-       .probe                  = socrates_probe,
+       .compatible             = "abb,socrates",
        .setup_arch             = socrates_setup_arch,
        .init_IRQ               = socrates_pic_init,
        .get_irq                = mpic_get_irq,

diff --git a/arch/powerpc/platforms/85xx/stx_gp3.c b/arch/powerpc/platforms/85xx/stx_gp3.c
index 6b1fe7bb3a8cb93372b347ea8964d4f45cf2f24a..9f37b25e7a821a47be390be249e50616cd2a42aa 100644 (file)
--- a/arch/powerpc/platforms/85xx/stx_gp3.c
+++ b/arch/powerpc/platforms/85xx/stx_gp3.c
@@ -83,17 +83,9 @@ static void stx_gp3_show_cpuinfo(struct seq_file *m)
 
 machine_arch_initcall(stx_gp3, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init stx_gp3_probe(void)
-{
-       return of_machine_is_compatible("stx,gp3-8560");
-}
-
 define_machine(stx_gp3) {
        .name                   = "STX GP3",
-       .probe                  = stx_gp3_probe,
+       .compatible             = "stx,gp3-8560",
        .setup_arch             = stx_gp3_setup_arch,
        .init_IRQ               = stx_gp3_pic_init,
        .show_cpuinfo           = stx_gp3_show_cpuinfo,

diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c
index eaec099b4077172940233fa0d1de4ae75e689bba..34b1e9cf9f3485f1f4c631457b05cf3a0baa3347 100644 (file)
--- a/arch/powerpc/platforms/85xx/twr_p102x.c
+++ b/arch/powerpc/platforms/85xx/twr_p102x.c
@@ -103,14 +103,9 @@ static void __init twr_p1025_setup_arch(void)
 
 machine_arch_initcall(twr_p1025, mpc85xx_common_publish_devices);
 
-static int __init twr_p1025_probe(void)
-{
-       return of_machine_is_compatible("fsl,TWR-P1025");
-}
-
 define_machine(twr_p1025) {
        .name                   = "TWR-P1025",
-       .probe                  = twr_p1025_probe,
+       .compatible             = "fsl,TWR-P1025",
        .setup_arch             = twr_p1025_setup_arch,
        .init_IRQ               = twr_p1025_pic_init,
 #ifdef CONFIG_PCI

diff --git a/arch/powerpc/platforms/85xx/xes_mpc85xx.c b/arch/powerpc/platforms/85xx/xes_mpc85xx.c
index 5836e4ecb7a01207beae1a17abf62fe3d6414e0f..57c38a8f40e86d0a58be806fdf42de7b84acbde3 100644 (file)
--- a/arch/powerpc/platforms/85xx/xes_mpc85xx.c
+++ b/arch/powerpc/platforms/85xx/xes_mpc85xx.c
@@ -136,27 +136,9 @@ machine_arch_initcall(xes_mpc8572, mpc85xx_common_publish_devices);
 machine_arch_initcall(xes_mpc8548, mpc85xx_common_publish_devices);
 machine_arch_initcall(xes_mpc8540, mpc85xx_common_publish_devices);
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init xes_mpc8572_probe(void)
-{
-       return of_machine_is_compatible("xes,MPC8572");
-}
-
-static int __init xes_mpc8548_probe(void)
-{
-       return of_machine_is_compatible("xes,MPC8548");
-}
-
-static int __init xes_mpc8540_probe(void)
-{
-       return of_machine_is_compatible("xes,MPC8540");
-}
-
 define_machine(xes_mpc8572) {
        .name                   = "X-ES MPC8572",
-       .probe                  = xes_mpc8572_probe,
+       .compatible             = "xes,MPC8572",
        .setup_arch             = xes_mpc85xx_setup_arch,
        .init_IRQ               = xes_mpc85xx_pic_init,
 #ifdef CONFIG_PCI
@@ -170,7 +152,7 @@ define_machine(xes_mpc8572) {
 
 define_machine(xes_mpc8548) {
        .name                   = "X-ES MPC8548",
-       .probe                  = xes_mpc8548_probe,
+       .compatible             = "xes,MPC8548",
        .setup_arch             = xes_mpc85xx_setup_arch,
        .init_IRQ               = xes_mpc85xx_pic_init,
 #ifdef CONFIG_PCI
@@ -184,7 +166,7 @@ define_machine(xes_mpc8548) {
 
 define_machine(xes_mpc8540) {
        .name                   = "X-ES MPC8540",
-       .probe                  = xes_mpc8540_probe,
+       .compatible             = "xes,MPC8540",
        .setup_arch             = xes_mpc85xx_setup_arch,
        .init_IRQ               = xes_mpc85xx_pic_init,
 #ifdef CONFIG_PCI

diff --git a/arch/powerpc/platforms/86xx/gef_ppc9a.c b/arch/powerpc/platforms/86xx/gef_ppc9a.c
index 8e358fa0bc412e848e7abf250ca459dc1eb4359f..2b656a763537ccbd456789a981508c8b8dc59522 100644 (file)
--- a/arch/powerpc/platforms/86xx/gef_ppc9a.c
+++ b/arch/powerpc/platforms/86xx/gef_ppc9a.c
@@ -175,27 +175,11 @@ static void gef_ppc9a_nec_fixup(struct pci_dev *pdev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB,
        gef_ppc9a_nec_fixup);
 
-/*
- * Called very early, device-tree isn't unflattened
- *
- * This function is called to determine whether the BSP is compatible with the
- * supplied device-tree, which is assumed to be the correct one for the actual
- * board. It is expected that, in the future, a kernel may support multiple
- * boards.
- */
-static int __init gef_ppc9a_probe(void)
-{
-       if (of_machine_is_compatible("gef,ppc9a"))
-               return 1;
-
-       return 0;
-}
-
 machine_arch_initcall(gef_ppc9a, mpc86xx_common_publish_devices);
 
 define_machine(gef_ppc9a) {
        .name                   = "GE PPC9A",
-       .probe                  = gef_ppc9a_probe,
+       .compatible             = "gef,ppc9a",
        .setup_arch             = gef_ppc9a_setup_arch,
        .init_IRQ               = gef_ppc9a_init_irq,
        .show_cpuinfo           = gef_ppc9a_show_cpuinfo,

diff --git a/arch/powerpc/platforms/86xx/gef_sbc310.c b/arch/powerpc/platforms/86xx/gef_sbc310.c
index b5b2733567cb2ba43e7b5c682f900ffbe2a95496..f38ab6bdfeb5710098c85f4b4afa25f308f80dae 100644 (file)
--- a/arch/powerpc/platforms/86xx/gef_sbc310.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc310.c
@@ -162,27 +162,11 @@ static void gef_sbc310_nec_fixup(struct pci_dev *pdev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB,
        gef_sbc310_nec_fixup);
 
-/*
- * Called very early, device-tree isn't unflattened
- *
- * This function is called to determine whether the BSP is compatible with the
- * supplied device-tree, which is assumed to be the correct one for the actual
- * board. It is expected that, in the future, a kernel may support multiple
- * boards.
- */
-static int __init gef_sbc310_probe(void)
-{
-       if (of_machine_is_compatible("gef,sbc310"))
-               return 1;
-
-       return 0;
-}
-
 machine_arch_initcall(gef_sbc310, mpc86xx_common_publish_devices);
 
 define_machine(gef_sbc310) {
        .name                   = "GE SBC310",
-       .probe                  = gef_sbc310_probe,
+       .compatible             = "gef,sbc310",
        .setup_arch             = gef_sbc310_setup_arch,
        .init_IRQ               = gef_sbc310_init_irq,
        .show_cpuinfo           = gef_sbc310_show_cpuinfo,

diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c
index bb4c8e6b44d0815016737832fa955ea30857e479..09d59f92eaacdb49c8a2a8edcd95ea6f0aa247af 100644 (file)
--- a/arch/powerpc/platforms/86xx/gef_sbc610.c
+++ b/arch/powerpc/platforms/86xx/gef_sbc610.c
@@ -152,27 +152,11 @@ static void gef_sbc610_nec_fixup(struct pci_dev *pdev)
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB,
        gef_sbc610_nec_fixup);
 
-/*
- * Called very early, device-tree isn't unflattened
- *
- * This function is called to determine whether the BSP is compatible with the
- * supplied device-tree, which is assumed to be the correct one for the actual
- * board. It is expected that, in the future, a kernel may support multiple
- * boards.
- */
-static int __init gef_sbc610_probe(void)
-{
-       if (of_machine_is_compatible("gef,sbc610"))
-               return 1;
-
-       return 0;
-}
-
 machine_arch_initcall(gef_sbc610, mpc86xx_common_publish_devices);
 
 define_machine(gef_sbc610) {
        .name                   = "GE SBC610",
-       .probe                  = gef_sbc610_probe,
+       .compatible             = "gef,sbc610",
        .setup_arch             = gef_sbc610_setup_arch,
        .init_IRQ               = gef_sbc610_init_irq,
        .show_cpuinfo           = gef_sbc610_show_cpuinfo,

diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index b593b9afd30a9438a340618bc47eab4dfee2a3bf..22ec5d7dc09d520c21fcee181ef589d8f06c6da3 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -307,20 +307,9 @@ static void __init mpc86xx_hpcd_setup_arch(void)
        printk("MPC86xx HPCD board from Freescale Semiconductor\n");
 }
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init mpc86xx_hpcd_probe(void)
-{
-       if (of_machine_is_compatible("fsl,MPC8610HPCD"))
-               return 1;       /* Looks good */
-
-       return 0;
-}
-
 define_machine(mpc86xx_hpcd) {
        .name                   = "MPC86xx HPCD",
-       .probe                  = mpc86xx_hpcd_probe,
+       .compatible             = "fsl,MPC8610HPCD",
        .setup_arch             = mpc86xx_hpcd_setup_arch,
        .init_IRQ               = mpc86xx_init_irq,
        .get_irq                = mpic_get_irq,

diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 5294394c9c077114c57a5f45ac3a6a7532f512f4..61eccb2d689d0320808ed4bb63be2624950e7878 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -85,18 +85,6 @@ mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
        seq_printf(m, "SVR\t\t: 0x%x\n", svid);
 }
 
-
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init mpc86xx_hpcn_probe(void)
-{
-       if (of_machine_is_compatible("fsl,mpc8641hpcn"))
-               return 1;       /* Looks good */
-
-       return 0;
-}
-
 static const struct of_device_id of_bus_ids[] __initconst = {
        { .compatible = "fsl,srio", },
        {},
@@ -113,7 +101,7 @@ machine_arch_initcall(mpc86xx_hpcn, declare_of_platform_devices);
 
 define_machine(mpc86xx_hpcn) {
        .name                   = "MPC86xx HPCN",
-       .probe                  = mpc86xx_hpcn_probe,
+       .compatible             = "fsl,MPC8610HPCD",
        .setup_arch             = mpc86xx_hpcn_setup_arch,
        .init_IRQ               = mpc86xx_init_irq,
        .show_cpuinfo           = mpc86xx_hpcn_show_cpuinfo,

diff --git a/arch/powerpc/platforms/8xx/adder875.c b/arch/powerpc/platforms/8xx/adder875.c
index 10e6e4fe77fcbd7727628678a55b13dac5602a94..68bb0da3d3ee969b168a7a46312093ab875956ed 100644 (file)
--- a/arch/powerpc/platforms/8xx/adder875.c
+++ b/arch/powerpc/platforms/8xx/adder875.c
@@ -83,11 +83,6 @@ static void __init adder875_setup(void)
        init_ioports();
 }
 
-static int __init adder875_probe(void)
-{
-       return of_machine_is_compatible("analogue-and-micro,adder875");
-}
-
 static const struct of_device_id of_bus_ids[] __initconst = {
        { .compatible = "simple-bus", },
        {},
@@ -102,7 +97,7 @@ machine_device_initcall(adder875, declare_of_platform_devices);
 
 define_machine(adder875) {
        .name = "Adder MPC875",
-       .probe = adder875_probe,
+       .compatible = "analogue-and-micro,adder875",
        .setup_arch = adder875_setup,
        .init_IRQ = mpc8xx_pic_init,
        .get_irq = mpc8xx_get_irq,

diff --git a/arch/powerpc/platforms/8xx/ep88xc.c b/arch/powerpc/platforms/8xx/ep88xc.c
index b3b22520b435fb56833eb5159a1f86d82d35ef24..fc276a29d67f0f1c2a4f4572c2ed9cb9bb1a0b6d 100644 (file)
--- a/arch/powerpc/platforms/8xx/ep88xc.c
+++ b/arch/powerpc/platforms/8xx/ep88xc.c
@@ -142,11 +142,6 @@ static void __init ep88xc_setup_arch(void)
                                  BCSR8_PHY2_ENABLE | BCSR8_PHY2_POWER);
 }
 
-static int __init ep88xc_probe(void)
-{
-       return of_machine_is_compatible("fsl,ep88xc");
-}
-
 static const struct of_device_id of_bus_ids[] __initconst = {
        { .name = "soc", },
        { .name = "cpm", },
@@ -165,7 +160,7 @@ machine_device_initcall(ep88xc, declare_of_platform_devices);
 
 define_machine(ep88xc) {
        .name = "Embedded Planet EP88xC",
-       .probe = ep88xc_probe,
+       .compatible = "fsl,ep88xc",
        .setup_arch = ep88xc_setup_arch,
        .init_IRQ = mpc8xx_pic_init,
        .get_irq        = mpc8xx_get_irq,

diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
index 03267e4a44a9c068ce52019ad285668c160be15c..11b3d1116db146532204b4698c439e0d83da7a6a 100644 (file)
--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
@@ -117,11 +117,6 @@ static void __init mpc86xads_setup_arch(void)
        iounmap(bcsr_io);
 }
 
-static int __init mpc86xads_probe(void)
-{
-       return of_machine_is_compatible("fsl,mpc866ads");
-}
-
 static const struct of_device_id of_bus_ids[] __initconst = {
        { .name = "soc", },
        { .name = "cpm", },
@@ -139,7 +134,7 @@ machine_device_initcall(mpc86x_ads, declare_of_platform_devices);
 
 define_machine(mpc86x_ads) {
        .name                   = "MPC86x ADS",
-       .probe                  = mpc86xads_probe,
+       .compatible             = "fsl,mpc866ads",
        .setup_arch             = mpc86xads_setup_arch,
        .init_IRQ               = mpc8xx_pic_init,
        .get_irq                = mpc8xx_get_irq,

diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index b1e39f96de0002ef5972965a93a66d307ee4945c..2fc7cacbcd96821cc471ba82f5f9e5dcad15fd8e 100644 (file)
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -192,11 +192,6 @@ static void __init mpc885ads_setup_arch(void)
        }
 }
 
-static int __init mpc885ads_probe(void)
-{
-       return of_machine_is_compatible("fsl,mpc885ads");
-}
-
 static const struct of_device_id of_bus_ids[] __initconst = {
        { .name = "soc", },
        { .name = "cpm", },
@@ -215,7 +210,7 @@ machine_device_initcall(mpc885_ads, declare_of_platform_devices);
 
 define_machine(mpc885_ads) {
        .name                   = "Freescale MPC885 ADS",
-       .probe                  = mpc885ads_probe,
+       .compatible             = "fsl,mpc885ads",
        .setup_arch             = mpc885ads_setup_arch,
        .init_IRQ               = mpc8xx_pic_init,
        .get_irq                = mpc8xx_get_irq,

diff --git a/arch/powerpc/platforms/8xx/tqm8xx_setup.c b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
index ffcfd17a5fa30734db9ed5750c34230022f2b76e..7d8eb50bb9cd3ab91dda6e2b67f6a05881d8ae24 100644 (file)
--- a/arch/powerpc/platforms/8xx/tqm8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/tqm8xx_setup.c
@@ -121,11 +121,6 @@ static void __init tqm8xx_setup_arch(void)
        init_ioports();
 }
 
-static int __init tqm8xx_probe(void)
-{
-       return of_machine_is_compatible("tqc,tqm8xx");
-}
-
 static const struct of_device_id of_bus_ids[] __initconst = {
        { .name = "soc", },
        { .name = "cpm", },
@@ -144,7 +139,7 @@ machine_device_initcall(tqm8xx, declare_of_platform_devices);
 
 define_machine(tqm8xx) {
        .name                   = "TQM8xx",
-       .probe                  = tqm8xx_probe,
+       .compatible             = "tqc,tqm8xx",
        .setup_arch             = tqm8xx_setup_arch,
        .init_IRQ               = mpc8xx_pic_init,
        .get_irq                = mpc8xx_get_irq,

diff --git a/arch/powerpc/platforms/amigaone/setup.c b/arch/powerpc/platforms/amigaone/setup.c
index 397ce6a40bd09908bfb97ba972af6dbce9df8147..ba3b4a5688fb4bb66fbb6a012176f47663f168e8 100644 (file)
--- a/arch/powerpc/platforms/amigaone/setup.c
+++ b/arch/powerpc/platforms/amigaone/setup.c
@@ -143,24 +143,21 @@ void __noreturn amigaone_restart(char *cmd)
 
 static int __init amigaone_probe(void)
 {
-       if (of_machine_is_compatible("eyetech,amigaone")) {
-               /*
-                * Coherent memory access cause complete system lockup! Thus
-                * disable this CPU feature, even if the CPU needs it.
-                */
-               cur_cpu_spec->cpu_features &= ~CPU_FTR_NEED_COHERENT;
+       /*
+        * Coherent memory access cause complete system lockup! Thus
+        * disable this CPU feature, even if the CPU needs it.
+        */
+       cur_cpu_spec->cpu_features &= ~CPU_FTR_NEED_COHERENT;
 
-               DMA_MODE_READ = 0x44;
-               DMA_MODE_WRITE = 0x48;
+       DMA_MODE_READ = 0x44;
+       DMA_MODE_WRITE = 0x48;
 
-               return 1;
-       }
-
-       return 0;
+       return 1;
 }
 
 define_machine(amigaone) {
        .name                   = "AmigaOne",
+       .compatible             = "eyetech,amigaone",
        .probe                  = amigaone_probe,
        .setup_arch             = amigaone_setup_arch,
        .discover_phbs          = amigaone_discover_phbs,

diff --git a/arch/powerpc/platforms/embedded6xx/gamecube.c b/arch/powerpc/platforms/embedded6xx/gamecube.c
index 5c2575adcc7e6b320aaf99686f3ed3b778d264a2..4fc84ff95b5eab1cccc4fd16170333fd445bca7d 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/gamecube.c
+++ b/arch/powerpc/platforms/embedded6xx/gamecube.c
@@ -50,9 +50,6 @@ static void __noreturn gamecube_halt(void)
 
 static int __init gamecube_probe(void)
 {
-       if (!of_machine_is_compatible("nintendo,gamecube"))
-               return 0;
-
        pm_power_off = gamecube_power_off;
 
        ug_udbg_init();
@@ -67,6 +64,7 @@ static void gamecube_shutdown(void)
 
 define_machine(gamecube) {
        .name                   = "gamecube",
+       .compatible             = "nintendo,gamecube",
        .probe                  = gamecube_probe,
        .restart                = gamecube_restart,
        .halt                   = gamecube_halt,

diff --git a/arch/powerpc/platforms/embedded6xx/holly.c b/arch/powerpc/platforms/embedded6xx/holly.c
index bebc5a972694e33d26809ce09557cc7a2593a4d3..67949c85c39880972786b158cfbc3f9a35841862 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/holly.c
+++ b/arch/powerpc/platforms/embedded6xx/holly.c
@@ -241,16 +241,6 @@ static void __noreturn holly_restart(char *cmd)
        for (;;) ;
 }
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init holly_probe(void)
-{
-       if (!of_machine_is_compatible("ibm,holly"))
-               return 0;
-       return 1;
-}
-
 static int ppc750_machine_check_exception(struct pt_regs *regs)
 {
        const struct exception_table_entry *entry;
@@ -267,7 +257,7 @@ static int ppc750_machine_check_exception(struct pt_regs *regs)
 
 define_machine(holly){
        .name                           = "PPC750 GX/CL TSI",
-       .probe                          = holly_probe,
+       .compatible                     = "ibm,holly",
        .setup_arch                     = holly_setup_arch,
        .discover_phbs                  = holly_init_pci,
        .init_IRQ                       = holly_init_IRQ,

diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c
index 1830e1ac1f8f01e4519c797d7033310be8e050fb..f04fd234c9abe148a4c2bcb185a04b5368aa2c00 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/linkstation.c
+++ b/arch/powerpc/platforms/embedded6xx/linkstation.c
@@ -143,9 +143,6 @@ static void linkstation_show_cpuinfo(struct seq_file *m)
 
 static int __init linkstation_probe(void)
 {
-       if (!of_machine_is_compatible("linkstation"))
-               return 0;
-
        pm_power_off = linkstation_power_off;
 
        return 1;
@@ -153,6 +150,7 @@ static int __init linkstation_probe(void)
 
 define_machine(linkstation){
        .name                   = "Buffalo Linkstation",
+       .compatible             = "linkstation",
        .probe                  = linkstation_probe,
        .setup_arch             = linkstation_setup_arch,
        .discover_phbs          = linkstation_setup_pci,

diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index ddf0c652af8000f058594e43f1b841d928d0c683..6821fb6644ac7fb749e994a76bf7a28c5f349750 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -159,16 +159,6 @@ static void __noreturn mpc7448_hpc2_restart(char *cmd)
        for (;;) ;              /* Spin until reset happens */
 }
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init mpc7448_hpc2_probe(void)
-{
-       if (!of_machine_is_compatible("mpc74xx"))
-               return 0;
-       return 1;
-}
-
 static int mpc7448_machine_check_exception(struct pt_regs *regs)
 {
        const struct exception_table_entry *entry;
@@ -185,7 +175,7 @@ static int mpc7448_machine_check_exception(struct pt_regs *regs)
 
 define_machine(mpc7448_hpc2){
        .name                   = "MPC7448 HPC2",
-       .probe                  = mpc7448_hpc2_probe,
+       .compatible             = "mpc74xx",
        .setup_arch             = mpc7448_hpc2_setup_arch,
        .discover_phbs          = mpc7448_hpc2_setup_pci,
        .init_IRQ               = mpc7448_hpc2_init_IRQ,

diff --git a/arch/powerpc/platforms/embedded6xx/mvme5100.c b/arch/powerpc/platforms/embedded6xx/mvme5100.c
index 4854cc592cecffee48bfd3424f4a00132ec84e48..7e57de576ef7447fc345d10d3ea32332a8c11faf 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/mvme5100.c
+++ b/arch/powerpc/platforms/embedded6xx/mvme5100.c
@@ -186,14 +186,6 @@ static void __noreturn mvme5100_restart(char *cmd)
                ;
 }
 
-/*
- * Called very early, device-tree isn't unflattened
- */
-static int __init mvme5100_probe(void)
-{
-       return of_machine_is_compatible("MVME5100");
-}
-
 static int __init probe_of_platform_devices(void)
 {
 
@@ -205,7 +197,7 @@ machine_device_initcall(mvme5100, probe_of_platform_devices);
 
 define_machine(mvme5100) {
        .name                   = "MVME5100",
-       .probe                  = mvme5100_probe,
+       .compatible             = "MVME5100",
        .setup_arch             = mvme5100_setup_arch,
        .discover_phbs          = mvme5100_setup_pci,
        .init_IRQ               = mvme5100_pic_init,

diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c
index 5f16e80b6ed61b8935ff7675cf73feeae38107cd..ab85af37117fa9454af4ad05408a029ac4525439 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/storcenter.c
+++ b/arch/powerpc/platforms/embedded6xx/storcenter.c
@@ -110,14 +110,9 @@ static void __noreturn storcenter_restart(char *cmd)
        for (;;) ;
 }
 
-static int __init storcenter_probe(void)
-{
-       return of_machine_is_compatible("iomega,storcenter");
-}
-
 define_machine(storcenter){
        .name                   = "IOMEGA StorCenter",
-       .probe                  = storcenter_probe,
+       .compatible             = "iomega,storcenter",
        .setup_arch             = storcenter_setup_arch,
        .discover_phbs          = storcenter_setup_pci,
        .init_IRQ               = storcenter_init_IRQ,

diff --git a/arch/powerpc/platforms/embedded6xx/wii.c b/arch/powerpc/platforms/embedded6xx/wii.c
index f4e654a9d4ff6d79f4216ccb09fc3e0a6dce909d..f2cc00e6f12f76a6e0801281a7075f8bfa315985 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/wii.c
+++ b/arch/powerpc/platforms/embedded6xx/wii.c
@@ -141,9 +141,6 @@ static void __init wii_pic_probe(void)
 
 static int __init wii_probe(void)
 {
-       if (!of_machine_is_compatible("nintendo,wii"))
-               return 0;
-
        pm_power_off = wii_power_off;
 
        ug_udbg_init();
@@ -174,6 +171,7 @@ device_initcall(wii_device_probe);
 
 define_machine(wii) {
        .name                   = "wii",
+       .compatible             = "nintendo,wii",
        .probe                  = wii_probe,
        .setup_arch             = wii_setup_arch,
        .restart                = wii_restart,

diff --git a/arch/powerpc/platforms/microwatt/setup.c b/arch/powerpc/platforms/microwatt/setup.c
index 6b32539395a485e60ba39a31546192fb5be10e7d..f08edcde7bee81c705075673c20526c8367d302a 100644 (file)
--- a/arch/powerpc/platforms/microwatt/setup.c
+++ b/arch/powerpc/platforms/microwatt/setup.c
@@ -23,11 +23,6 @@ static void __init microwatt_init_IRQ(void)
        xics_init();
 }
 
-static int __init microwatt_probe(void)
-{
-       return of_machine_is_compatible("microwatt-soc");
-}
-
 static int __init microwatt_populate(void)
 {
        return of_platform_default_populate(NULL, NULL, NULL);
@@ -41,7 +36,7 @@ static void __init microwatt_setup_arch(void)
 
 define_machine(microwatt) {
        .name                   = "microwatt",
-       .probe                  = microwatt_probe,
+       .compatible             = "microwatt-soc",
        .init_IRQ               = microwatt_init_IRQ,
        .setup_arch             = microwatt_setup_arch,
        .progress               = udbg_progress,

diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 61ab2d38ff4be98993ed85afd7edb8e796c9891b..f89731670448af6a0c56124d53b3258d8b67ef1f 100644 (file)
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -512,9 +512,6 @@ static void __init pnv_setup_machdep_opal(void)
 
 static int __init pnv_probe(void)
 {
-       if (!of_machine_is_compatible("ibm,powernv"))
-               return 0;
-
        if (firmware_has_feature(FW_FEATURE_OPAL))
                pnv_setup_machdep_opal();
 
@@ -578,6 +575,7 @@ static long pnv_machine_check_early(struct pt_regs *regs)
 
 define_machine(powernv) {
        .name                   = "PowerNV",
+       .compatible             = "ibm,powernv",
        .probe                  = pnv_probe,
        .setup_arch             = pnv_setup_arch,
        .init_IRQ               = pnv_init_IRQ,

diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index d7495785fe47bc8f0e6be113331f2832dcc093ef..5144f11359f798d17ca75b3653d7784ae66d84a3 100644 (file)
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -264,9 +264,6 @@ static int __init ps3_probe(void)
 {
        DBG(" -> %s:%d\n", __func__, __LINE__);
 
-       if (!of_machine_is_compatible("sony,ps3"))
-               return 0;
-
        ps3_os_area_save_params();
 
        pm_power_off = ps3_power_off;
@@ -291,6 +288,7 @@ static void ps3_kexec_cpu_down(int crash_shutdown, int secondary)
 
 define_machine(ps3) {
        .name                           = "PS3",
+       .compatible                     = "sony,ps3",
        .probe                          = ps3_probe,
        .setup_arch                     = ps3_setup_arch,
        .init_IRQ                       = ps3_init_IRQ,