diff options
Diffstat (limited to 'arch/powerpc/sysdev/bestcomm/bestcomm.c')
-rw-r--r-- | arch/powerpc/sysdev/bestcomm/bestcomm.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c index 740ad73ce5cc..f589999361e0 100644 --- a/arch/powerpc/sysdev/bestcomm/bestcomm.c +++ b/arch/powerpc/sysdev/bestcomm/bestcomm.c | |||
@@ -29,11 +29,17 @@ | |||
29 | 29 | ||
30 | #define DRIVER_NAME "bestcomm-core" | 30 | #define DRIVER_NAME "bestcomm-core" |
31 | 31 | ||
32 | /* MPC5200 device tree match tables */ | ||
33 | static struct of_device_id mpc52xx_sram_ids[] __devinitdata = { | ||
34 | { .compatible = "fsl,mpc5200-sram", }, | ||
35 | { .compatible = "mpc5200-sram", }, | ||
36 | {} | ||
37 | }; | ||
38 | |||
32 | 39 | ||
33 | struct bcom_engine *bcom_eng = NULL; | 40 | struct bcom_engine *bcom_eng = NULL; |
34 | EXPORT_SYMBOL_GPL(bcom_eng); /* needed for inline functions */ | 41 | EXPORT_SYMBOL_GPL(bcom_eng); /* needed for inline functions */ |
35 | 42 | ||
36 | |||
37 | /* ======================================================================== */ | 43 | /* ======================================================================== */ |
38 | /* Public and private API */ | 44 | /* Public and private API */ |
39 | /* ======================================================================== */ | 45 | /* ======================================================================== */ |
@@ -373,7 +379,7 @@ mpc52xx_bcom_probe(struct of_device *op, const struct of_device_id *match) | |||
373 | of_node_get(op->node); | 379 | of_node_get(op->node); |
374 | 380 | ||
375 | /* Prepare SRAM */ | 381 | /* Prepare SRAM */ |
376 | ofn_sram = of_find_compatible_node(NULL, "sram", "mpc5200-sram"); | 382 | ofn_sram = of_find_matching_node(NULL, mpc52xx_sram_ids); |
377 | if (!ofn_sram) { | 383 | if (!ofn_sram) { |
378 | printk(KERN_ERR DRIVER_NAME ": " | 384 | printk(KERN_ERR DRIVER_NAME ": " |
379 | "No SRAM found in device tree\n"); | 385 | "No SRAM found in device tree\n"); |
@@ -478,10 +484,8 @@ mpc52xx_bcom_remove(struct of_device *op) | |||
478 | } | 484 | } |
479 | 485 | ||
480 | static struct of_device_id mpc52xx_bcom_of_match[] = { | 486 | static struct of_device_id mpc52xx_bcom_of_match[] = { |
481 | { | 487 | { .type = "dma-controller", .compatible = "fsl,mpc5200-bestcomm", }, |
482 | .type = "dma-controller", | 488 | { .type = "dma-controller", .compatible = "mpc5200-bestcomm", }, |
483 | .compatible = "mpc5200-bestcomm", | ||
484 | }, | ||
485 | {}, | 489 | {}, |
486 | }; | 490 | }; |
487 | 491 | ||