path: root/Documentation/devicetree/bindings/net
diff options
authorDavid S. Miller <>2015-03-19 15:18:04 -0400
committerDavid S. Miller <>2015-03-19 15:18:04 -0400
commit970282d0e1404b23f9d7ec6a676fa76ff15b3376 (patch)
tree15b7398383f5158cd19ba5fcbf17d46509e80a86 /Documentation/devicetree/bindings/net
parentc9bdc0dde187e5f6b481989b4084c1b7cbe2726f (diff)
parentea6edfbcefec1fcfdb826a1d5a054f402dfbfb24 (diff)
Merge branch 'for-upstream' of git://
Johan Hedberg says: ==================== pull request: bluetooth-next 2015-03-19 This wont the last 4.1 bluetooth-next pull request, but we've piled up enough patches in less than a week that I wanted to save you from a single huge "last-minute" pull somewhere closer to the merge window. The main changes are: - Simultaneous LE & BR/EDR discovery support for HW that can do it - Complete LE OOB pairing support - More fine-grained mgmt-command access control (normal user can now do harmless read-only operations). - Added RF power amplifier support in cc2520 ieee802154 driver - Some cleanups/fixes in ieee802154 code Please let me know if there are any issues pulling. Thanks. ==================== Signed-off-by: David S. Miller <>
Diffstat (limited to 'Documentation/devicetree/bindings/net')
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/net/ieee802154/cc2520.txt b/Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
index 0071883c08d8..fb6d49f184ed 100644
--- a/Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
+++ b/Documentation/devicetree/bindings/net/ieee802154/cc2520.txt
@@ -13,11 +13,15 @@ Required properties:
- cca-gpio: GPIO spec for the CCA pin
- vreg-gpio: GPIO spec for the VREG pin
- reset-gpio: GPIO spec for the RESET pin
+Optional properties:
+ - amplified: include if the CC2520 is connected to a CC2591 amplifier
cc2520@0 {
compatible = "ti,cc2520";
reg = <0>;
spi-max-frequency = <4000000>;
+ amplified;
pinctrl-names = "default";
pinctrl-0 = <&cc2520_cape_pins>;
fifo-gpio = <&gpio1 18 0>;