diff options
author | Russell King - ARM Linux <linux@arm.linux.org.uk> | 2011-01-03 17:33:26 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-01-04 22:16:11 -0500 |
commit | b05cd8f4c04a29eebfa65c45fabc78a02f16a782 (patch) | |
tree | 3fd5cbcb3b4560c8b8380177f108de21df66dc79 /drivers/dma/amba-pl08x.c | |
parent | 9dc2c200a0551754f91e1b322dcb3d782cd709b2 (diff) |
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: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma/amba-pl08x.c')
-rw-r--r-- | drivers/dma/amba-pl08x.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index 4b63fc39a6df..75ab4e47a153 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c | |||
@@ -98,13 +98,11 @@ | |||
98 | /** | 98 | /** |
99 | * struct vendor_data - vendor-specific config parameters | 99 | * struct vendor_data - vendor-specific config parameters |
100 | * for PL08x derivatives | 100 | * for PL08x derivatives |
101 | * @name: the name of this specific variant | ||
102 | * @channels: the number of channels available in this variant | 101 | * @channels: the number of channels available in this variant |
103 | * @dualmaster: whether this version supports dual AHB masters | 102 | * @dualmaster: whether this version supports dual AHB masters |
104 | * or not. | 103 | * or not. |
105 | */ | 104 | */ |
106 | struct vendor_data { | 105 | struct vendor_data { |
107 | char *name; | ||
108 | u8 channels; | 106 | u8 channels; |
109 | bool dualmaster; | 107 | bool dualmaster; |
110 | }; | 108 | }; |
@@ -2024,7 +2022,7 @@ static int pl08x_probe(struct amba_device *adev, struct amba_id *id) | |||
2024 | writel(0x000000FF, pl08x->base + PL080_TC_CLEAR); | 2022 | writel(0x000000FF, pl08x->base + PL080_TC_CLEAR); |
2025 | 2023 | ||
2026 | ret = request_irq(adev->irq[0], pl08x_irq, IRQF_DISABLED, | 2024 | ret = request_irq(adev->irq[0], pl08x_irq, IRQF_DISABLED, |
2027 | vd->name, pl08x); | 2025 | DRIVER_NAME, pl08x); |
2028 | if (ret) { | 2026 | if (ret) { |
2029 | dev_err(&adev->dev, "%s failed to request interrupt %d\n", | 2027 | dev_err(&adev->dev, "%s failed to request interrupt %d\n", |
2030 | __func__, adev->irq[0]); | 2028 | __func__, adev->irq[0]); |
@@ -2095,8 +2093,9 @@ static int pl08x_probe(struct amba_device *adev, struct amba_id *id) | |||
2095 | 2093 | ||
2096 | amba_set_drvdata(adev, pl08x); | 2094 | amba_set_drvdata(adev, pl08x); |
2097 | init_pl08x_debugfs(pl08x); | 2095 | init_pl08x_debugfs(pl08x); |
2098 | dev_info(&pl08x->adev->dev, "ARM(R) %s DMA block initialized @%08x\n", | 2096 | dev_info(&pl08x->adev->dev, "DMA: PL%03x rev%u at 0x%08llx irq %d\n", |
2099 | vd->name, adev->res.start); | 2097 | amba_part(adev), amba_rev(adev), |
2098 | (unsigned long long)adev->res.start, adev->irq[0]); | ||
2100 | return 0; | 2099 | return 0; |
2101 | 2100 | ||
2102 | out_no_slave_reg: | 2101 | out_no_slave_reg: |
@@ -2123,13 +2122,11 @@ out_no_pl08x: | |||
2123 | 2122 | ||
2124 | /* PL080 has 8 channels and the PL080 have just 2 */ | 2123 | /* PL080 has 8 channels and the PL080 have just 2 */ |
2125 | static struct vendor_data vendor_pl080 = { | 2124 | static struct vendor_data vendor_pl080 = { |
2126 | .name = "PL080", | ||
2127 | .channels = 8, | 2125 | .channels = 8, |
2128 | .dualmaster = true, | 2126 | .dualmaster = true, |
2129 | }; | 2127 | }; |
2130 | 2128 | ||
2131 | static struct vendor_data vendor_pl081 = { | 2129 | static struct vendor_data vendor_pl081 = { |
2132 | .name = "PL081", | ||
2133 | .channels = 2, | 2130 | .channels = 2, |
2134 | .dualmaster = false, | 2131 | .dualmaster = false, |
2135 | }; | 2132 | }; |