git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
[pandora-kernel.git]
/
arch
/
powerpc
/
sysdev
/
bestcomm
/
bestcomm.c
diff --git
a/arch/powerpc/sysdev/bestcomm/bestcomm.c
b/arch/powerpc/sysdev/bestcomm/bestcomm.c
index
740ad73
..
446c9ea
100644
(file)
--- a/
arch/powerpc/sysdev/bestcomm/bestcomm.c
+++ b/
arch/powerpc/sysdev/bestcomm/bestcomm.c
@@
-29,11
+29,17
@@
#define DRIVER_NAME "bestcomm-core"
#define DRIVER_NAME "bestcomm-core"
+/* MPC5200 device tree match tables */
+static struct of_device_id mpc52xx_sram_ids[] __devinitdata = {
+ { .compatible = "fsl,mpc5200-sram", },
+ { .compatible = "mpc5200-sram", },
+ {}
+};
+
struct bcom_engine *bcom_eng = NULL;
EXPORT_SYMBOL_GPL(bcom_eng); /* needed for inline functions */
struct bcom_engine *bcom_eng = NULL;
EXPORT_SYMBOL_GPL(bcom_eng); /* needed for inline functions */
-
/* ======================================================================== */
/* Public and private API */
/* ======================================================================== */
/* ======================================================================== */
/* Public and private API */
/* ======================================================================== */
@@
-46,6
+52,10
@@
bcom_task_alloc(int bd_count, int bd_size, int priv_size)
int i, tasknum = -1;
struct bcom_task *tsk;
int i, tasknum = -1;
struct bcom_task *tsk;
+ /* Don't try to do anything if bestcomm init failed */
+ if (!bcom_eng)
+ return NULL;
+
/* Get and reserve a task num */
spin_lock(&bcom_eng->lock);
/* Get and reserve a task num */
spin_lock(&bcom_eng->lock);
@@
-373,7
+383,7
@@
mpc52xx_bcom_probe(struct of_device *op, const struct of_device_id *match)
of_node_get(op->node);
/* Prepare SRAM */
of_node_get(op->node);
/* Prepare SRAM */
- ofn_sram = of_find_
compatible_node(NULL, "sram", "mpc5200-sram"
);
+ ofn_sram = of_find_
matching_node(NULL, mpc52xx_sram_ids
);
if (!ofn_sram) {
printk(KERN_ERR DRIVER_NAME ": "
"No SRAM found in device tree\n");
if (!ofn_sram) {
printk(KERN_ERR DRIVER_NAME ": "
"No SRAM found in device tree\n");
@@
-433,7
+443,7
@@
mpc52xx_bcom_probe(struct of_device *op, const struct of_device_id *match)
/* Done ! */
printk(KERN_INFO "DMA: MPC52xx BestComm engine @%08lx ok !\n",
/* Done ! */
printk(KERN_INFO "DMA: MPC52xx BestComm engine @%08lx ok !\n",
- bcom_eng->regs_base);
+
(long)
bcom_eng->regs_base);
return 0;
return 0;
@@
-478,10
+488,8
@@
mpc52xx_bcom_remove(struct of_device *op)
}
static struct of_device_id mpc52xx_bcom_of_match[] = {
}
static struct of_device_id mpc52xx_bcom_of_match[] = {
- {
- .type = "dma-controller",
- .compatible = "mpc5200-bestcomm",
- },
+ { .compatible = "fsl,mpc5200-bestcomm", },
+ { .compatible = "mpc5200-bestcomm", },
{},
};
{},
};