Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Christian Daudt and committed by
Russell King
505caa66 c477b8db

+6 -2
+3 -1
Documentation/devicetree/bindings/arm/l2cc.txt
··· 16 16 performs the same operation). 17 17 "marvell,"aurora-outer-cache: Marvell Controller designed to be 18 18 compatible with the ARM one with outer cache mode. 19 - "bcm,bcm11351-a2-pl310-cache": For Broadcom bcm11351 chipset where an 19 + "brcm,bcm11351-a2-pl310-cache": For Broadcom bcm11351 chipset where an 20 20 offset needs to be added to the address before passing down to the L2 21 21 cache controller 22 + "bcm,bcm11351-a2-pl310-cache": DEPRECATED by 23 + "brcm,bcm11351-a2-pl310-cache" 22 24 - cache-unified : Specifies the cache is a unified cache. 23 25 - cache-level : Should be set to 2 for a level 2 cache. 24 26 - reg : Physical base address and size of cache controller's memory mapped
+3 -1
arch/arm/mm/cache-l2x0.c
··· 929 929 .data = (void *)&aurora_no_outer_data}, 930 930 { .compatible = "marvell,aurora-outer-cache", 931 931 .data = (void *)&aurora_with_outer_data}, 932 - { .compatible = "bcm,bcm11351-a2-pl310-cache", 932 + { .compatible = "brcm,bcm11351-a2-pl310-cache", 933 + .data = (void *)&bcm_l2x0_data}, 934 + { .compatible = "bcm,bcm11351-a2-pl310-cache", /* deprecated name */ 933 935 .data = (void *)&bcm_l2x0_data}, 934 936 {} 935 937 };