Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 450cc8cc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-upstream' of... 

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



Johan Hedberg says:

====================
pull request: bluetooth-next 2017-04-14

Here's the main batch of Bluetooth & 802.15.4 patches for the 4.12
kernel.

 - Many fixes to 6LoWPAN, in particular for BLE
 - New CA8210 IEEE 802.15.4 device driver (accounting for most of the
   lines of code added in this pull request)
 - Added Nokia Bluetooth (UART) HCI driver
 - Some serdev & TTY changes that are dependencies for the Nokia
   driver (with acks from relevant maintainers and an agreement that
   these come through the bluetooth tree)
 - Support for new Intel Bluetooth device
 - Various other minor cleanups/fixes here and there

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d584fec6 019aa56b

Documentation/devicetree/bindings/net/ieee802154/ca8210.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
* CA8210 IEEE 802.15.4 *



Required properties:

	- compatible:           Should be "cascoda,ca8210"

	- reg:                  Controlling chip select

	- spi-max-frequency:    Maximum clock speed, should be *less than*

	                        4000000

	- spi-cpol:             Requires inverted clock polarity

	- reset-gpio:           GPIO attached to reset

	- irq-gpio:             GPIO attached to IRQ

Optional properties:

	- extclock-enable:      Include for the ca8210 to route its 16MHz clock

	                        to an output

	- extclock-freq:        Frequency in Hz of the external clock

	- extclock-gpio:        GPIO of the ca8210 to output the clock on



Example:

	ca8210@0 {

		compatible = "cascoda,ca8210";

		reg = <0>;

		spi-max-frequency = <3000000>;

		spi-cpol;

		reset-gpio = <&gpio1 1 GPIO_ACTIVE_HIGH>;

		irq-gpio = <&gpio1 2 GPIO_ACTIVE_HIGH>;

		extclock-enable;

		extclock-freq = 16000000;

		extclock-gpio = 2;

	};

Documentation/devicetree/bindings/net/nokia-bluetooth.txt

0 → 100644
+51 −0
Original line number Diff line number Diff line 
Nokia Bluetooth Chips

---------------------



Nokia phones often come with UART connected bluetooth chips from different

vendors and modified device API. Those devices speak a protocol named H4+

(also known as h4p) by Nokia, which is similar to the H4 protocol from the

Bluetooth standard. In addition to the H4 protocol it specifies two more

UART status lines for wakeup of UART transceivers to improve power management

and a few new packet types used to negotiate uart speed.



Required properties:



 - compatible: should contain "nokia,h4p-bluetooth" as well as one of the following:

   * "brcm,bcm2048-nokia"

   * "ti,wl1271-bluetooth-nokia"

 - reset-gpios: GPIO specifier, used to reset the BT module (active low)

 - bluetooth-wakeup-gpios: GPIO specifier, used to wakeup the BT module (active high)

 - host-wakeup-gpios: GPIO specifier, used to wakeup the host processor (active high)

 - clock-names: should be "sysclk"

 - clocks: should contain a clock specifier for every name in clock-names



Optional properties:



 - None



Example:



/ {

       /* controlled (enabled/disabled) directly by BT module */

       bluetooth_clk: vctcxo {

               compatible = "fixed-clock";

               #clock-cells = <0>;

               clock-frequency = <38400000>;

       };

};



&uart2 {

       pinctrl-names = "default";

       pinctrl-0 = <&uart2_pins>;



       bluetooth {

               compatible = "ti,wl1271-bluetooth-nokia", "nokia,h4p-bluetooth";



               reset-gpios = <&gpio1 26 GPIO_ACTIVE_LOW>; /* gpio26 */

               host-wakeup-gpios = <&gpio4 5 GPIO_ACTIVE_HIGH>; /* gpio101 */

               bluetooth-wakeup-gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; /* gpio37 */



               clocks = <&bluetooth_clk>;

               clock-names = "sysclk";

       };

};

Documentation/devicetree/bindings/net/ti,wilink-st.txt

0 → 100644
+35 −0
Original line number Diff line number Diff line 
TI WiLink 7/8 (wl12xx/wl18xx) Shared Transport BT/FM/GPS devices



TI WiLink devices have a UART interface for providing Bluetooth, FM radio,

and GPS over what's called "shared transport". The shared transport is

standard BT HCI protocol with additional channels for the other functions.



These devices also have a separate WiFi interface as described in

wireless/ti,wlcore.txt.



This bindings follows the UART slave device binding in

../serial/slave-device.txt.



Required properties:

 - compatible: should be one of the following:

    "ti,wl1271-st"

    "ti,wl1273-st"

    "ti,wl1831-st"

    "ti,wl1835-st"

    "ti,wl1837-st"



Optional properties:

 - enable-gpios : GPIO signal controlling enabling of BT. Active high.

 - vio-supply : Vio input supply (1.8V)

 - vbat-supply : Vbat input supply (2.9-4.8V)



Example:



&serial0 {

	compatible = "ns16550a";

	...

	bluetooth {

		compatible = "ti,wl1835-st";

		enable-gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;

	};

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ brcm Broadcom Corporation 
buffalo	Buffalo, Inc.

calxeda	Calxeda

capella	Capella Microsystems, Inc

cascoda	Cascoda, Ltd.

cavium	Cavium, Inc.

cdns	Cadence Design Systems Inc.

ceva	Ceva, Inc.

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -2944,6 +2944,15 @@ W: http://www.linux-c6x.org/wiki/index.php/Main_Page 
S:	Maintained

F:	arch/c6x/



CA8210 IEEE-802.15.4 RADIO DRIVER

M:	Harry Morris <h.morris@cascoda.com>

M:	linuxdev@cascoda.com

L:	linux-wpan@vger.kernel.org

W:	https://github.com/Cascoda/ca8210-linux.git

S:	Maintained

F:	drivers/net/ieee802154/ca8210.c

F:	Documentation/devicetree/bindings/net/ieee802154/ca8210.txt



CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS

M:	David Howells <dhowells@redhat.com>

L:	linux-cachefs@redhat.com (moderated for non-subscribers)