8 files changed, 68 insertions, 64 deletions

diff --git a/include/linux/bcma/bcma.h b/include/linux/bcma/bcma.h
index 969af0f2bdf9..0272e49135d0 100644
--- a/include/linux/bcma/bcma.h
+++ b/include/linux/bcma/bcma.h
@@ -73,17 +73,17 @@ struct bcma_host_ops {
 /* Core-ID values. */
 #define BCMA_CORE_OOB_ROUTER            0x367   /* Out of band */
 #define BCMA_CORE_4706_CHIPCOMMON       0x500
-#define BCMA_CORE_PCIEG2                0x501
-#define BCMA_CORE_DMA                   0x502
-#define BCMA_CORE_SDIO3                 0x503
-#define BCMA_CORE_USB20                 0x504
-#define BCMA_CORE_USB30                 0x505
-#define BCMA_CORE_A9JTAG                0x506
-#define BCMA_CORE_DDR23                 0x507
-#define BCMA_CORE_ROM                   0x508
-#define BCMA_CORE_NAND                  0x509
-#define BCMA_CORE_QSPI                  0x50A
-#define BCMA_CORE_CHIPCOMMON_B          0x50B
+#define BCMA_CORE_NS_PCIEG2             0x501
+#define BCMA_CORE_NS_DMA                0x502
+#define BCMA_CORE_NS_SDIO3              0x503
+#define BCMA_CORE_NS_USB20              0x504
+#define BCMA_CORE_NS_USB30              0x505
+#define BCMA_CORE_NS_A9JTAG             0x506
+#define BCMA_CORE_NS_DDR23              0x507
+#define BCMA_CORE_NS_ROM                0x508
+#define BCMA_CORE_NS_NAND               0x509
+#define BCMA_CORE_NS_QSPI               0x50A
+#define BCMA_CORE_NS_CHIPCOMMON_B       0x50B
 #define BCMA_CORE_4706_SOC_RAM          0x50E
 #define BCMA_CORE_ARMCA9                0x510
 #define BCMA_CORE_4706_MAC_GBIT         0x52D
@@ -158,6 +158,7 @@ struct bcma_host_ops {
 /* Chip IDs of PCIe devices */
 #define BCMA_CHIP_ID_BCM4313    0x4313
 #define BCMA_CHIP_ID_BCM43142   43142
+#define BCMA_CHIP_ID_BCM43131   43131
 #define BCMA_CHIP_ID_BCM43217   43217
 #define BCMA_CHIP_ID_BCM43222   43222
 #define BCMA_CHIP_ID_BCM43224   43224
diff --git a/include/linux/platform_data/st21nfcb.h b/include/linux/platform_data/st21nfcb.h
new file mode 100644
index 000000000000..2d11f1f5efab
--- /dev/null
+++ b/include/linux/platform_data/st21nfcb.h
@@ -0,0 +1,32 @@
+/*
+ * Driver include for the ST21NFCB NFC chip.
+ *
+ * Copyright (C) 2014  STMicroelectronics SAS. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _ST21NFCB_NCI_H_
+#define _ST21NFCB_NCI_H_
+
+#include <linux/i2c.h>
+
+#define ST21NFCB_NCI_DRIVER_NAME "st21nfcb_nci"
+
+struct st21nfcb_nfc_platform_data {
+        unsigned int gpio_irq;
+        unsigned int gpio_reset;
+        unsigned int irq_polarity;
+};
+
+#endif /* _ST21NFCA_HCI_H_ */
diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h
index 79b530fb2c4d..d184df1d0d41 100644
--- a/include/net/6lowpan.h
+++ b/include/net/6lowpan.h
@@ -75,20 +75,6 @@
          (((a)->s6_addr[14]) == (m)[6]) &&              \
          (((a)->s6_addr[15]) == (m)[7]))
 
-/* ipv6 address is unspecified */
-#define is_addr_unspecified(a)          \
-        ((((a)->s6_addr32[0]) == 0) &&  \
-         (((a)->s6_addr32[1]) == 0) &&  \
-         (((a)->s6_addr32[2]) == 0) &&  \
-         (((a)->s6_addr32[3]) == 0))
-
-/* compare ipv6 addresses prefixes */
-#define ipaddr_prefixcmp(addr1, addr2, length) \
-        (memcmp(addr1, addr2, length >> 3) == 0)
-
-/* local link, i.e. FE80::/10 */
-#define is_addr_link_local(a) (((a)->s6_addr16[0]) == htons(0xFE80))
-
 /*
  * check whether we can compress the IID to 16 bits,
  * it's possible for unicast adresses with first 49 bits are zero only.
@@ -100,22 +86,8 @@
          (((a)->s6_addr[12]) == 0xfe) &&        \
          (((a)->s6_addr[13]) == 0))
 
-/* multicast address */
-#define is_addr_mcast(a) (((a)->s6_addr[0]) == 0xFF)
-
 /* check whether the 112-bit gid of the multicast address is mappable to: */
 
-/* 9 bits, for FF02::1 (all nodes) and FF02::2 (all routers) addresses only. */
-#define lowpan_is_mcast_addr_compressable(a)    \
-        ((((a)->s6_addr16[1]) == 0) &&          \
-         (((a)->s6_addr16[2]) == 0) &&          \
-         (((a)->s6_addr16[3]) == 0) &&          \
-         (((a)->s6_addr16[4]) == 0) &&          \
-         (((a)->s6_addr16[5]) == 0) &&          \
-         (((a)->s6_addr16[6]) == 0) &&          \
-         (((a)->s6_addr[14])  == 0) &&          \
-         ((((a)->s6_addr[15]) == 1) || (((a)->s6_addr[15]) == 2)))
-
 /* 48 bits, FFXX::00XX:XXXX:XXXX */
 #define lowpan_is_mcast_addr_compressable48(a)  \
         ((((a)->s6_addr16[1]) == 0) &&          \
@@ -168,17 +140,6 @@
 #define LOWPAN_FRAGN_HEAD_SIZE  0x5
 
 /*
- * According IEEE802.15.4 standard:
- *   - MTU is 127 octets
- *   - maximum MHR size is 37 octets
- *   - MFR size is 2 octets
- *
- * so minimal payload size that we may guarantee is:
- *   MTU - MHR - MFR = 88 octets
- */
-#define LOWPAN_FRAG_SIZE        88
-
-/*
  * Values of fields within the IPHC encoding first byte
  * (C stands for compressed and I for inline)
  */
@@ -279,17 +240,6 @@ static inline int lowpan_fetch_skb_u8(struct sk_buff *skb, u8 *val)
         return 0;
 }
 
-static inline int lowpan_fetch_skb_u16(struct sk_buff *skb, u16 *val)
-{
-        if (unlikely(!pskb_may_pull(skb, 2)))
-                return -EINVAL;
-
-        *val = (skb->data[0] << 8) | skb->data[1];
-        skb_pull(skb, 2);
-
-        return 0;
-}
-
 static inline bool lowpan_fetch_skb(struct sk_buff *skb,
                 void *data, const unsigned int len)
 {
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index f0a3d8890760..3f8547f1c6f8 100644
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -167,7 +167,7 @@ enum {
         HCI_AUTO_OFF,
         HCI_RFKILLED,
         HCI_MGMT,
-        HCI_PAIRABLE,
+        HCI_BONDABLE,
         HCI_SERVICE_CACHE,
         HCI_KEEP_DEBUG_KEYS,
         HCI_USE_DEBUG_KEYS,
@@ -1074,6 +1074,8 @@ struct hci_rp_read_data_block_size {
         __le16   num_blocks;
 } __packed;
 
+#define HCI_OP_READ_LOCAL_CODECS        0x100b
+
 #define HCI_OP_READ_PAGE_SCAN_ACTIVITY  0x0c1b
 struct hci_rp_read_page_scan_activity {
         __u8     status;
@@ -1170,6 +1172,8 @@ struct hci_rp_write_remote_amp_assoc {
         __u8     phy_handle;
 } __packed;
 
+#define HCI_OP_GET_MWS_TRANSPORT_CONFIG 0x140c
+
 #define HCI_OP_ENABLE_DUT_MODE          0x1803
 
 #define HCI_OP_WRITE_SSP_DEBUG_MODE     0x1804
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 996ed065b6c2..b5d5af3aa469 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -203,6 +203,8 @@ struct hci_dev {
         __u16           page_scan_window;
         __u8            page_scan_type;
         __u8            le_adv_channel_map;
+        __u16           le_adv_min_interval;
+        __u16           le_adv_max_interval;
         __u8            le_scan_type;
         __u16           le_scan_interval;
         __u16           le_scan_window;
@@ -458,6 +460,7 @@ struct hci_conn_params {
         enum {
                 HCI_AUTO_CONN_DISABLED,
                 HCI_AUTO_CONN_REPORT,
+                HCI_AUTO_CONN_DIRECT,
                 HCI_AUTO_CONN_ALWAYS,
                 HCI_AUTO_CONN_LINK_LOSS,
         } auto_connect;
diff --git a/include/net/bluetooth/mgmt.h b/include/net/bluetooth/mgmt.h
index 623d5203c592..414cd2f9a437 100644
--- a/include/net/bluetooth/mgmt.h
+++ b/include/net/bluetooth/mgmt.h
@@ -87,7 +87,7 @@ struct mgmt_rp_read_index_list {
 #define MGMT_SETTING_CONNECTABLE        0x00000002
 #define MGMT_SETTING_FAST_CONNECTABLE   0x00000004
 #define MGMT_SETTING_DISCOVERABLE       0x00000008
-#define MGMT_SETTING_PAIRABLE           0x00000010
+#define MGMT_SETTING_BONDABLE           0x00000010
 #define MGMT_SETTING_LINK_SECURITY      0x00000020
 #define MGMT_SETTING_SSP                0x00000040
 #define MGMT_SETTING_BREDR              0x00000080
@@ -131,7 +131,7 @@ struct mgmt_cp_set_discoverable {
 
 #define MGMT_OP_SET_FAST_CONNECTABLE    0x0008
 
-#define MGMT_OP_SET_PAIRABLE            0x0009
+#define MGMT_OP_SET_BONDABLE            0x0009
 
 #define MGMT_OP_SET_LINK_SECURITY       0x000A
 
diff --git a/include/net/nfc/digital.h b/include/net/nfc/digital.h
index bdf55c3b7a19..d9a5cf7ac1c4 100644
--- a/include/net/nfc/digital.h
+++ b/include/net/nfc/digital.h
@@ -49,6 +49,7 @@ enum {
         NFC_DIGITAL_FRAMING_NFCA_SHORT = 0,
         NFC_DIGITAL_FRAMING_NFCA_STANDARD,
         NFC_DIGITAL_FRAMING_NFCA_STANDARD_WITH_CRC_A,
+        NFC_DIGITAL_FRAMING_NFCA_ANTICOL_COMPLETE,
 
         NFC_DIGITAL_FRAMING_NFCA_T1T,
         NFC_DIGITAL_FRAMING_NFCA_T2T,
@@ -126,6 +127,15 @@ typedef void (*nfc_digital_cmd_complete_t)(struct nfc_digital_dev *ddev,
  *      the NFC-DEP ATR_REQ command through cb. The digital stack deducts the RF
  *      tech by analyzing the SoD of the frame containing the ATR_REQ command.
  *      This is an asynchronous function.
+ * @tg_listen_md: If supported, put the device in automatic listen mode with
+ *      mode detection but without automatic anti-collision. In this mode, the
+ *      device automatically detects the RF technology.  What the actual
+ *      RF technology is can be retrieved by calling @tg_get_rf_tech.
+ *      The digital stack will then perform the appropriate anti-collision
+ *      sequence.  This is an asynchronous function.
+ * @tg_get_rf_tech: Required when @tg_listen_md is supported, unused otherwise.
+ *      Return the RF Technology that was detected by the @tg_listen_md call.
+ *      This is a synchronous function.
  *
  * @switch_rf: Turns device radio on or off. The stack does not call explicitly
  *      switch_rf to turn the radio on. A call to in|tg_configure_hw must turn
@@ -160,6 +170,9 @@ struct nfc_digital_ops {
                               struct digital_tg_mdaa_params *mdaa_params,
                               u16 timeout, nfc_digital_cmd_complete_t cb,
                               void *arg);
+        int (*tg_listen_md)(struct nfc_digital_dev *ddev, u16 timeout,
+                            nfc_digital_cmd_complete_t cb, void *arg);
+        int (*tg_get_rf_tech)(struct nfc_digital_dev *ddev, u8 *rf_tech);
 
         int (*switch_rf)(struct nfc_digital_dev *ddev, bool on);
         void (*abort_cmd)(struct nfc_digital_dev *ddev);
diff --git a/include/net/nfc/hci.h b/include/net/nfc/hci.h
index 61286db54388..7ee8f4cc610b 100644
--- a/include/net/nfc/hci.h
+++ b/include/net/nfc/hci.h
@@ -37,6 +37,7 @@ struct nfc_hci_ops {
         int (*xmit) (struct nfc_hci_dev *hdev, struct sk_buff *skb);
         int (*start_poll) (struct nfc_hci_dev *hdev,
                            u32 im_protocols, u32 tm_protocols);
+        void (*stop_poll) (struct nfc_hci_dev *hdev);
         int (*dep_link_up)(struct nfc_hci_dev *hdev, struct nfc_target *target,
                            u8 comm_mode, u8 *gb, size_t gb_len);
         int (*dep_link_down)(struct nfc_hci_dev *hdev);