diff options
| author | Christian Daudt | 2013-08-20 00:00:45 +0200 |
|---|---|---|
| committer | Russell King | 2013-08-20 01:26:36 +0200 |
| commit | 505caa66fe8551c2c8421395c2e56a5bb02520ff (patch) | |
| tree | ef65cab970bd7ca043442bfdea37d442ba988e67 /arch/arm/mm | |
| parent | ARM: 7820/1: mm: cache-l2x0: Print the cache size in kB (diff) | |
| download | kernel-qcow2-linux-505caa66fe8551c2c8421395c2e56a5bb02520ff.tar.gz kernel-qcow2-linux-505caa66fe8551c2c8421395c2e56a5bb02520ff.tar.xz kernel-qcow2-linux-505caa66fe8551c2c8421395c2e56a5bb02520ff.zip | |
ARM: 7821/1: DT: binding fixup to align with vendor-prefixes.txt
[ this is a follow-up to this discussion:
http://archive.arm.linux.org.uk/lurker/message/20130730.230827.a1ceb12a.en.html ]
This patchset renames all uses of "bcm," name bindings to
"brcm," as they were done prior to knowing that brcm had
already been standardized as Broadcom vendor prefix
(in Documentation/devicetree/bindings/vendor-prefixes.txt).
This will not cause any churn on devices because none of
these bindings have made it into production yet.
Acked-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Christian Daudt <csd@broadcom.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/cache-l2x0.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index ad4e8825f91e..f6a4bb2d2551 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -929,7 +929,9 @@ static const struct of_device_id l2x0_ids[] __initconst = { .data = (void *)&aurora_no_outer_data}, { .compatible = "marvell,aurora-outer-cache", .data = (void *)&aurora_with_outer_data}, - { .compatible = "bcm,bcm11351-a2-pl310-cache", + { .compatible = "brcm,bcm11351-a2-pl310-cache", + .data = (void *)&bcm_l2x0_data}, + { .compatible = "bcm,bcm11351-a2-pl310-cache", /* deprecated name */ .data = (void *)&bcm_l2x0_data}, {} }; |