diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-29 10:49:03 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-09-03 10:20:05 -0700 |
| commit | 103c6a71207f80e6ecfeba2c21d6246687bb0ee4 (patch) | |
| tree | a69dc44415f138264b7180797ce7f0f71f87a884 /Documentation/devicetree/bindings/misc | |
| parent | ef8932b94a441a189aaca15ef1b86d9e46b3f933 (diff) | |
| parent | 15e22ddf045ed9796d0d2302e759aa7a37826523 (diff) | |
| download | linux-stable-103c6a71207f80e6ecfeba2c21d6246687bb0ee4.tar.gz linux-stable-103c6a71207f80e6ecfeba2c21d6246687bb0ee4.tar.bz2 linux-stable-103c6a71207f80e6ecfeba2c21d6246687bb0ee4.zip | |
Merge branch 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351 into next/dt
From Christian Daudt, DT changes for Broadcom.
* 'armsoc/for-3.12/dt' of git://github.com/broadcom/bcm11351:
ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
ARM: dts: add sdio blocks to bcm28155-ap board
ARM: dts: align sdio numbers to HW definition
ARM: bcm281xx: DT changes for reboot code
ARM: bcm281xx: Adding bcm28155-ap.dts
Diffstat (limited to 'Documentation/devicetree/bindings/misc')
| -rw-r--r-- | Documentation/devicetree/bindings/misc/smc.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/misc/smc.txt b/Documentation/devicetree/bindings/misc/smc.txt index 02b428136177..6c9f176f3571 100644 --- a/Documentation/devicetree/bindings/misc/smc.txt +++ b/Documentation/devicetree/bindings/misc/smc.txt @@ -4,11 +4,12 @@ This binding defines the location of the bounce buffer used for non-secure to secure communications. Required properties: -- compatible : "bcm,kona-smc" +- compatible : "brcm,kona-smc" +- DEPRECATED: compatible : "bcm,kona-smc" - reg : Location and size of bounce buffer Example: smc@0x3404c000 { - compatible = "bcm,bcm11351-smc", "bcm,kona-smc"; + compatible = "brcm,bcm11351-smc", "brcm,kona-smc"; reg = <0x3404c000 0x400>; //1 KiB in SRAM }; |