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

Commit 49c0ca17 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
parents a85ae0e9 67b3bd4e

Documentation/devicetree/bindings/net/nfc/trf7970a.txt

0 → 100644
+34 −0
Original line number Diff line number Diff line 
* Texas Instruments TRF7970A RFID/NFC/15693 Transceiver



Required properties:

- compatible: Should be "ti,trf7970a".

- spi-max-frequency: Maximum SPI frequency (<= 2000000).

- interrupt-parent: phandle of parent interrupt handler.

- interrupts: A single interrupt specifier.

- ti,enable-gpios: Two GPIO entries used for 'EN' and 'EN2' pins on the

  TRF7970A.

- vin-supply: Regulator for supply voltage to VIN pin



Optional SoC Specific Properties:

- pinctrl-names: Contains only one value - "default".

- pintctrl-0: Specifies the pin control groups used for this controller.



Example (for ARM-based BeagleBone with TRF7970A on SPI1):



&spi1 {

	status = "okay";



	nfc@0 {

		compatible = "ti,trf7970a";

		reg = <0>;

		pinctrl-names = "default";

		pinctrl-0 = <&trf7970a_default>;

		spi-max-frequency = <2000000>;

		interrupt-parent = <&gpio2>;

		interrupts = <14 0>;

		ti,enable-gpios = <&gpio2 2 GPIO_ACTIVE_LOW>,

				  <&gpio2 5 GPIO_ACTIVE_LOW>;

		vin-supply = <&ldo3_reg>;

		status = "okay";

	};

};

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -6117,6 +6117,7 @@ F: include/net/nfc/ 
F:	include/uapi/linux/nfc.h

F:	drivers/nfc/

F:	include/linux/platform_data/pn544.h

F:	Documentation/devicetree/bindings/net/nfc/



NFS, SUNRPC, AND LOCKD CLIENTS

M:	Trond Myklebust <trond.myklebust@primarydata.com>

drivers/bluetooth/ath3k.c

+7 −6
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static const struct usb_device_id ath3k_table[] = { 
	{ USB_DEVICE(0x0b05, 0x17d0) },

	{ USB_DEVICE(0x0CF3, 0x0036) },

	{ USB_DEVICE(0x0CF3, 0x3004) },

	{ USB_DEVICE(0x0CF3, 0x3005) },

	{ USB_DEVICE(0x0CF3, 0x3008) },

	{ USB_DEVICE(0x0CF3, 0x311D) },

	{ USB_DEVICE(0x0CF3, 0x311E) },
@@ -137,6 +138,7 @@ static const struct usb_device_id ath3k_blist_tbl[] = { 
	{ USB_DEVICE(0x0b05, 0x17d0), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3005), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },

	{ USB_DEVICE(0x0cf3, 0x311E), .driver_info = BTUSB_ATH3012 },
@@ -180,10 +182,9 @@ static int ath3k_load_firmware(struct usb_device *udev, 
	}



	memcpy(send_buf, firmware->data, 20);

	if ((err = usb_control_msg(udev, pipe,

				USB_REQ_DFU_DNLOAD,

				USB_TYPE_VENDOR, 0, 0,

				send_buf, 20, USB_CTRL_SET_TIMEOUT)) < 0) {

	err = usb_control_msg(udev, pipe, USB_REQ_DFU_DNLOAD, USB_TYPE_VENDOR,

			      0, 0, send_buf, 20, USB_CTRL_SET_TIMEOUT);

	if (err < 0) {

		BT_ERR("Can't change to loading configuration err");

		goto error;

	}
@@ -366,7 +367,7 @@ static int ath3k_load_patch(struct usb_device *udev) 
	}



	snprintf(filename, ATH3K_NAME_LEN, "ar3k/AthrBT_0x%08x.dfu",

		fw_version.rom_version);

		le32_to_cpu(fw_version.rom_version));



	ret = request_firmware(&firmware, filename, &udev->dev);

	if (ret < 0) {
@@ -428,7 +429,7 @@ static int ath3k_load_syscfg(struct usb_device *udev) 
	}



	snprintf(filename, ATH3K_NAME_LEN, "ar3k/ramps_0x%08x_%d%s",

		fw_version.rom_version, clk_value, ".dfu");

		le32_to_cpu(fw_version.rom_version), clk_value, ".dfu");



	ret = request_firmware(&firmware, filename, &udev->dev);

	if (ret < 0) {

drivers/bluetooth/bfusb.c

+10 −4
Original line number Diff line number Diff line
@@ -131,8 +131,11 @@ static int bfusb_send_bulk(struct bfusb_data *data, struct sk_buff *skb) 


	BT_DBG("bfusb %p skb %p len %d", data, skb, skb->len);



	if (!urb && !(urb = usb_alloc_urb(0, GFP_ATOMIC)))

	if (!urb) {

		urb = usb_alloc_urb(0, GFP_ATOMIC);

		if (!urb)

			return -ENOMEM;

	}



	pipe = usb_sndbulkpipe(data->udev, data->bulk_out_ep);
@@ -218,8 +221,11 @@ static int bfusb_rx_submit(struct bfusb_data *data, struct urb *urb) 


	BT_DBG("bfusb %p urb %p", data, urb);



	if (!urb && !(urb = usb_alloc_urb(0, GFP_ATOMIC)))

	if (!urb) {

		urb = usb_alloc_urb(0, GFP_ATOMIC);

		if (!urb)

			return -ENOMEM;

	}



	skb = bt_skb_alloc(size, GFP_ATOMIC);

	if (!skb) {

drivers/bluetooth/bluecard_cs.c

+6 −3
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ static void bluecard_write_wakeup(bluecard_info_t *info) 
			ready_bit = XMIT_BUF_ONE_READY;

		}



		if (!(skb = skb_dequeue(&(info->txq))))

		skb = skb_dequeue(&(info->txq));

		if (!skb)

			break;



		if (bt_cb(skb)->pkt_type & 0x80) {
@@ -391,7 +392,8 @@ static void bluecard_receive(bluecard_info_t *info, unsigned int offset) 
		if (info->rx_skb == NULL) {

			info->rx_state = RECV_WAIT_PACKET_TYPE;

			info->rx_count = 0;

			if (!(info->rx_skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC))) {

			info->rx_skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC);

			if (!info->rx_skb) {

				BT_ERR("Can't allocate mem for new packet");

				return;

			}
@@ -566,7 +568,8 @@ static int bluecard_hci_set_baud_rate(struct hci_dev *hdev, int baud) 
	/* Ericsson baud rate command */

	unsigned char cmd[] = { HCI_COMMAND_PKT, 0x09, 0xfc, 0x01, 0x03 };



	if (!(skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC))) {

	skb = bt_skb_alloc(HCI_MAX_FRAME_SIZE, GFP_ATOMIC);

	if (!skb) {

		BT_ERR("Can't allocate mem for new packet");

		return -1;

	}