Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

Johan Hedberg says:

====================
pull request: bluetooth-next 2015-03-02

Here's the first bluetooth-next pull request targeting the 4.1 kernel:

 - ieee802154/6lowpan cleanups
 - SCO routing to host interface support for the btmrvl driver
 - AMP code cleanups
 - Fixes to AMP HCI init sequence
 - Refactoring of the HCI callback mechanism
 - Added shutdown routine for Intel controllers in the btusb driver
 - New config option to enable/disable Bluetooth debugfs information
 - Fix for early data reception on L2CAP fixed channels

Please let me know if there are any issues pulling. Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 2 deletions

diff --git a/Documentation/devicetree/bindings/net/ieee802154/at86rf230.txt b/Documentation/devicetree/bindings/net/ieee802154/at86rf230.txt
index d3bbdded4cbe..168f1be50912 100644
--- a/Documentation/devicetree/bindings/net/ieee802154/at86rf230.txt
+++ b/Documentation/devicetree/bindings/net/ieee802154/at86rf230.txt
@@ -6,11 +6,14 @@ Required properties:
   - spi-max-frequency:  maximal bus speed, should be set to 7500000 depends
                         sync or async operation mode
   - reg:                the chipselect index
-  - interrupts:         the interrupt generated by the device
+  - interrupts:         the interrupt generated by the device. Non high-level
+                        can occur deadlocks while handling isr.
 
 Optional properties:
   - reset-gpio:         GPIO spec for the rstn pin
   - sleep-gpio:         GPIO spec for the slp_tr pin
+  - xtal-trim:          u8 value for fine tuning the internal capacitance
+                        arrays of xtal pins: 0 = +0 pF, 0xf = +4.5 pF
 
 Example:
 
@@ -18,6 +21,7 @@ Example:
                 compatible = "atmel,at86rf231";
                 spi-max-frequency = <7500000>;
                 reg = <0>;
-                interrupts = <19 1>;
+                interrupts = <19 4>;
                 interrupt-parent = <&gpio3>;
+                xtal-trim = /bits/ 8 <0x06>;
         };