Commit b05cd8f4 authored by Russell King - ARM Linux's avatar Russell King - ARM Linux Committed by Dan Williams

ARM: PL08x: improve the announcement printk

Include the revision number of the PL08x primecell in the boot-time
printk to allow proper identification of the peripheral.  Reformat
the announcement printk format reflect what we do for other primecell
drivers - generally "PLXXX revX at 0xNNNNNNNN irq X".
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 9dc2c200
...@@ -98,13 +98,11 @@ ...@@ -98,13 +98,11 @@
/** /**
* struct vendor_data - vendor-specific config parameters * struct vendor_data - vendor-specific config parameters
* for PL08x derivatives * for PL08x derivatives
* @name: the name of this specific variant
* @channels: the number of channels available in this variant * @channels: the number of channels available in this variant
* @dualmaster: whether this version supports dual AHB masters * @dualmaster: whether this version supports dual AHB masters
* or not. * or not.
*/ */
struct vendor_data { struct vendor_data {
char *name;
u8 channels; u8 channels;
bool dualmaster; bool dualmaster;
}; };
...@@ -2024,7 +2022,7 @@ static int pl08x_probe(struct amba_device *adev, struct amba_id *id) ...@@ -2024,7 +2022,7 @@ static int pl08x_probe(struct amba_device *adev, struct amba_id *id)
writel(0x000000FF, pl08x->base + PL080_TC_CLEAR); writel(0x000000FF, pl08x->base + PL080_TC_CLEAR);
ret = request_irq(adev->irq[0], pl08x_irq, IRQF_DISABLED, ret = request_irq(adev->irq[0], pl08x_irq, IRQF_DISABLED,
vd->name, pl08x); DRIVER_NAME, pl08x);
if (ret) { if (ret) {
dev_err(&adev->dev, "%s failed to request interrupt %d\n", dev_err(&adev->dev, "%s failed to request interrupt %d\n",
__func__, adev->irq[0]); __func__, adev->irq[0]);
...@@ -2095,8 +2093,9 @@ static int pl08x_probe(struct amba_device *adev, struct amba_id *id) ...@@ -2095,8 +2093,9 @@ static int pl08x_probe(struct amba_device *adev, struct amba_id *id)
amba_set_drvdata(adev, pl08x); amba_set_drvdata(adev, pl08x);
init_pl08x_debugfs(pl08x); init_pl08x_debugfs(pl08x);
dev_info(&pl08x->adev->dev, "ARM(R) %s DMA block initialized @%08x\n", dev_info(&pl08x->adev->dev, "DMA: PL%03x rev%u at 0x%08llx irq %d\n",
vd->name, adev->res.start); amba_part(adev), amba_rev(adev),
(unsigned long long)adev->res.start, adev->irq[0]);
return 0; return 0;
out_no_slave_reg: out_no_slave_reg:
...@@ -2123,13 +2122,11 @@ static int pl08x_probe(struct amba_device *adev, struct amba_id *id) ...@@ -2123,13 +2122,11 @@ static int pl08x_probe(struct amba_device *adev, struct amba_id *id)
/* PL080 has 8 channels and the PL080 have just 2 */ /* PL080 has 8 channels and the PL080 have just 2 */
static struct vendor_data vendor_pl080 = { static struct vendor_data vendor_pl080 = {
.name = "PL080",
.channels = 8, .channels = 8,
.dualmaster = true, .dualmaster = true,
}; };
static struct vendor_data vendor_pl081 = { static struct vendor_data vendor_pl081 = {
.name = "PL081",
.channels = 2, .channels = 2,
.dualmaster = false, .dualmaster = false,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment