diff options
| author | Hemant Gupta <hemant.gupta@stericsson.com> | 2011-10-11 19:45:44 +0530 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:05:58 +0200 |
| commit | 99b39f8e3dfb5800dac9c836b3cb9dc4840ca42b (patch) | |
| tree | b124f783545062ee33a3bc78138241213d2c504d /drivers/staging/cg2900/devices-cg2900.c | |
| parent | b231eb1acabe59c01e7cf57e56b62048ff147f09 (diff) | |
cg2900: Support new connectivity chips
This patch adds support for new connectivity combo chips.
Support is added for CG2905 and CG2910 chips firmware downloading.
CG2910 supports NFC, therefore a new HCI H4 channel is added.
ST-Ericsson Linux next: Not Tested, ER 373024
ST-Ericsson ID: 373024
ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10019
Change-Id: I18158e26e6e651c0ba7e6b98b872a20d5fcaa423
Signed-off-by: Hemant Gupta <hemant.gupta@stericsson.com>
Signed-off-by: Nitin Dhingra <nitin.dhingra@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33716
Reviewed-by: QATOOLS
Diffstat (limited to 'drivers/staging/cg2900/devices-cg2900.c')
| -rw-r--r-- | drivers/staging/cg2900/devices-cg2900.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/staging/cg2900/devices-cg2900.c b/drivers/staging/cg2900/devices-cg2900.c index e6703c96aa9..4c5d4a22a77 100644 --- a/drivers/staging/cg2900/devices-cg2900.c +++ b/drivers/staging/cg2900/devices-cg2900.c @@ -40,11 +40,6 @@ #define H4_HEADER_LENGTH 0x01 #define BT_HEADER_LENGTH 0x03 -#define STLC2690_HCI_REV 0x0600 -#define CG2900_PG1_HCI_REV 0x0101 -#define CG2900_PG2_HCI_REV 0x0200 -#define CG2900_PG1_SPECIAL_HCI_REV 0x0700 - struct vs_power_sw_off_cmd { __le16 op_code; u8 len; @@ -65,9 +60,7 @@ static struct sk_buff *dcg2900_get_power_switch_off_cmd int i; /* If connected chip does not support the command return NULL */ - if (CG2900_PG1_SPECIAL_HCI_REV != dev->chip.hci_revision && - CG2900_PG1_HCI_REV != dev->chip.hci_revision && - CG2900_PG2_HCI_REV != dev->chip.hci_revision) + if (!check_chip_revision_support(dev->chip.hci_revision)) return NULL; dev_dbg(dev->dev, "Generating PowerSwitchOff command\n"); |