aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/bluetooth/btmrvl_sdio.h
diff options
context:
space:
mode:
authorBing Zhao <bzhao@marvell.com>2013-11-01 18:28:24 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-12-04 08:09:03 -0500
commit433a9389a11778f1bc342789abccac9ce46eee82 (patch)
treea19a6f853df611fa8e63e673f57bbd8bdc2c7e01 /drivers/bluetooth/btmrvl_sdio.h
parent3e4543abf9deea8733341d235719e7e02b4068ed (diff)
Bluetooth: btmrvl: use cal-data from device-tree instead of conf file
Some ARM versions of Chromebook need to download a new calibration data from host driver to firmware. They do have EEPROM but still need a piece of new calibration data in test mode. The cal-data is platform dependent. It's simpler and more feasible to use device tree based cal-data instead of configuration file based cal-data. This patch remove configuration file based cal-data downloading and replace it using cal-data from device tree. When CONFIG_OF is not selected, or the specific property is not present in the device tree, the calibration downloading will not happen. Cc: Mike Frysinger <vapier@chromium.org> Cc: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Bing Zhao <bzhao@marvell.com> Signed-off-by: Hyuckjoo Lee <hyuckjoo.lee@samsung.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers/bluetooth/btmrvl_sdio.h')
-rw-r--r--drivers/bluetooth/btmrvl_sdio.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.h b/drivers/bluetooth/btmrvl_sdio.h
index 6872d9ecac07..43d35a609ca9 100644
--- a/drivers/bluetooth/btmrvl_sdio.h
+++ b/drivers/bluetooth/btmrvl_sdio.h
@@ -85,7 +85,6 @@ struct btmrvl_sdio_card {
85 u32 ioport; 85 u32 ioport;
86 const char *helper; 86 const char *helper;
87 const char *firmware; 87 const char *firmware;
88 const char *cal_data;
89 const struct btmrvl_sdio_card_reg *reg; 88 const struct btmrvl_sdio_card_reg *reg;
90 u16 sd_blksz_fw_dl; 89 u16 sd_blksz_fw_dl;
91 u8 rx_unit; 90 u8 rx_unit;
@@ -95,7 +94,6 @@ struct btmrvl_sdio_card {
95struct btmrvl_sdio_device { 94struct btmrvl_sdio_device {
96 const char *helper; 95 const char *helper;
97 const char *firmware; 96 const char *firmware;
98 const char *cal_data;
99 const struct btmrvl_sdio_card_reg *reg; 97 const struct btmrvl_sdio_card_reg *reg;
100 u16 sd_blksz_fw_dl; 98 u16 sd_blksz_fw_dl;
101}; 99};