aboutsummaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorStuart MacDonald <stuart.macdonald@stericsson.com>2010-05-26 09:30:40 +0200
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:45:25 -0600
commit39607c005bca3ebb8f846cca12dcfcbc631fd0bf (patch)
tree5fa91ddaef826a28cd72fdf4c6cd8ce0fc503914 /firmware
parentfd68b76d27bb82c65bdeb6cf35d2dfc295427379 (diff)
downloadlinux-2.6.34-ux500-39607c005bca3ebb8f846cca12dcfcbc631fd0bf.tar.gz
FM Radio: Integration of CG2900 FM driver
This change updates the driver, documentation, and firmware files for the CG2900 FM radio driver. ST-Ericsson Change-ID: 259611 Change-Id: I95f9cb6b6944bcfe268ac1f442553a3ec72c32ee
Diffstat (limited to 'firmware')
-rwxr-xr-xfirmware/BT_src_coeff_1.1.fw.org (renamed from firmware/R1e2v10BT_src_coeff_11.fw.org)bin2056 -> 2056 bytes
-rwxr-xr-xfirmware/Cobra_FM_SOC1_coef.fw.orgbin0 -> 3086 bytes
-rwxr-xr-xfirmware/Cobra_FM_SOC1_prog.fw.orgbin0 -> 48176 bytes
-rwxr-xr-xfirmware/EXT_src_coeff_1.1.fw.org (renamed from firmware/R1e2v10EXT_src_coeff_11.fw.org)bin2056 -> 2056 bytes
-rw-r--r--firmware/Makefile4
-rwxr-xr-xfirmware/R1e2v10FM_coeff.fw.orgbin2890 -> 0 bytes
-rwxr-xr-xfirmware/R1e2v10FM_prog.fw.orgbin35282 -> 0 bytes
-rw-r--r--[-rwxr-xr-x]firmware/ste_fm_bt_src_coeff_info.fw.org16
-rw-r--r--[-rwxr-xr-x]firmware/ste_fm_ext_src_coeff_info.fw.org16
-rw-r--r--[-rwxr-xr-x]firmware/ste_fm_fm_coeff_info.fw.org14
-rw-r--r--[-rwxr-xr-x]firmware/ste_fm_fm_prog_info.fw.org14
11 files changed, 40 insertions, 24 deletions
diff --git a/firmware/R1e2v10BT_src_coeff_11.fw.org b/firmware/BT_src_coeff_1.1.fw.org
index 83549331be2..83549331be2 100755
--- a/firmware/R1e2v10BT_src_coeff_11.fw.org
+++ b/firmware/BT_src_coeff_1.1.fw.org
Binary files differ
diff --git a/firmware/Cobra_FM_SOC1_coef.fw.org b/firmware/Cobra_FM_SOC1_coef.fw.org
new file mode 100755
index 00000000000..90a89b86f5d
--- /dev/null
+++ b/firmware/Cobra_FM_SOC1_coef.fw.org
Binary files differ
diff --git a/firmware/Cobra_FM_SOC1_prog.fw.org b/firmware/Cobra_FM_SOC1_prog.fw.org
new file mode 100755
index 00000000000..91cef21b81c
--- /dev/null
+++ b/firmware/Cobra_FM_SOC1_prog.fw.org
Binary files differ
diff --git a/firmware/R1e2v10EXT_src_coeff_11.fw.org b/firmware/EXT_src_coeff_1.1.fw.org
index 875380e2c4a..875380e2c4a 100755
--- a/firmware/R1e2v10EXT_src_coeff_11.fw.org
+++ b/firmware/EXT_src_coeff_1.1.fw.org
Binary files differ
diff --git a/firmware/Makefile b/firmware/Makefile
index 4a4a12a283f..e21859c0605 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -144,8 +144,8 @@ fw-shipped-$(CONFIG_MFD_STE_CONN) += ste_conn_patch_info.fw ste_conn_settings_in
fw-shipped-$(CONFIG_RADIO_CG2900) += ste_fm_bt_src_coeff_info.fw ste_fm_ext_src_coeff_info.fw \
ste_fm_fm_coeff_info.fw ste_fm_fm_prog_info.fw \
- R1e2v10BT_src_coeff_11.fw R1e2v10FM_coeff.fw \
- R1e2v10FM_prog.fw R1e2v10EXT_src_coeff_11.fw
+ BT_src_coeff_1.1.fw EXT_src_coeff_1.1.fw \
+ Cobra_FM_SOC1_coef.fw Cobra_FM_SOC1_prog.fw
fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
diff --git a/firmware/R1e2v10FM_coeff.fw.org b/firmware/R1e2v10FM_coeff.fw.org
deleted file mode 100755
index f56218e721a..00000000000
--- a/firmware/R1e2v10FM_coeff.fw.org
+++ /dev/null
Binary files differ
diff --git a/firmware/R1e2v10FM_prog.fw.org b/firmware/R1e2v10FM_prog.fw.org
deleted file mode 100755
index c4c9e518b34..00000000000
--- a/firmware/R1e2v10FM_prog.fw.org
+++ /dev/null
Binary files differ
diff --git a/firmware/ste_fm_bt_src_coeff_info.fw.org b/firmware/ste_fm_bt_src_coeff_info.fw.org
index 3d163bbf198..ee155dbdd5e 100755..100644
--- a/firmware/ste_fm_bt_src_coeff_info.fw.org
+++ b/firmware/ste_fm_bt_src_coeff_info.fw.org
@@ -1,13 +1,17 @@
+#########################################################################
+# ST-Ericsson Connectivity Chip FM BT Coeffecient Information File
#
-# FM BT Coeffecient File
+# All information must be stored as follows
#
-# All Coeffecient information must be stored as follows
+# HCI_revision LMP_Subversion File_name (without .org extension)
#
-# CHIP_ID HCI_revision LMP_Subversion
+########################################################################
#
-# ST: <CHIP_ID> is set to 0x00000000 since this is not used by ST.
#
-# FM Coeffecient file for ST-Ericsson - CG2900
+########################################################################
#
-0x0700 0x0011 R1e2v10BT_src_coeff_11.fw
+# FM BT Coeffecient file for ST-Ericsson - CG2900
#
+0x0700 0x0011 BT_src_coeff_1.1.fw
+#
+########################################################################
diff --git a/firmware/ste_fm_ext_src_coeff_info.fw.org b/firmware/ste_fm_ext_src_coeff_info.fw.org
index 48be3dedb78..3a6ac5e3c54 100755..100644
--- a/firmware/ste_fm_ext_src_coeff_info.fw.org
+++ b/firmware/ste_fm_ext_src_coeff_info.fw.org
@@ -1,13 +1,17 @@
+#########################################################################
+# ST-Ericsson Connectivity Chip FM Ext Coeffecient Information File
#
-# FM Ext Coeffecient File
+# All information must be stored as follows
#
-# All Coeffecient information must be stored as follows
+# HCI_revision LMP_Subversion File_name (without .org extension)
#
-# CHIP_ID HCI_revision LMP_Subversion
+########################################################################
#
-# ST: <CHIP_ID> is set to 0x00000000 since this is not used by ST.
#
-# FM Coeffecient file for ST-Ericsson - CG2900
+########################################################################
#
-0x0700 0x0011 R1e2v10EXT_src_coeff_11.fw
+# FM Ext Coeffecient file for ST-Ericsson - CG2900
#
+0x0700 0x0011 EXT_src_coeff_1.1.fw
+#
+########################################################################
diff --git a/firmware/ste_fm_fm_coeff_info.fw.org b/firmware/ste_fm_fm_coeff_info.fw.org
index 631ac1ca818..03bfb783797 100755..100644
--- a/firmware/ste_fm_fm_coeff_info.fw.org
+++ b/firmware/ste_fm_fm_coeff_info.fw.org
@@ -1,13 +1,17 @@
+#########################################################################
+# ST-Ericsson Connectivity Chip FM Coeffecient Information File
#
-# FM Coeffecient File
+# All information must be stored as follows
#
-# All Coeffecient information must be stored as follows
+# HCI_revision LMP_Subversion File_name (without .org extension)
#
-# CHIP_ID HCI_revision LMP_Subversion
+########################################################################
#
-# ST: <CHIP_ID> is set to 0x00000000 since this is not used by ST.
+#
+########################################################################
#
# FM Coeffecient file for ST-Ericsson - CG2900
#
-0x0700 0x0011 R1e2v10FM_coeff.fw
+0x0700 0x0011 Cobra_FM_SOC1_coef.fw
#
+#########################################################################
diff --git a/firmware/ste_fm_fm_prog_info.fw.org b/firmware/ste_fm_fm_prog_info.fw.org
index 3872ac0acbf..b5920eaeadf 100755..100644
--- a/firmware/ste_fm_fm_prog_info.fw.org
+++ b/firmware/ste_fm_fm_prog_info.fw.org
@@ -1,13 +1,17 @@
+#########################################################################
+# ST-Ericsson Connectivity Chip FM Firmware Information File
#
-# FM Firmware File
+# All information must be stored as follows
#
-# All firmware information must be stored as follows
+# HCI_revision LMP_Subversion File_name (without .org extension)
#
-# CHIP_ID HCI_revision LMP_Subversion
+########################################################################
#
-# ST: <CHIP_ID> is set to 0x00000000 since this is not used by ST.
+#
+########################################################################
#
# FM Firmware file for ST-Ericsson - CG2900
#
-0x0700 0x0011 R1e2v10FM_prog.fw
+0x0700 0x0011 Cobra_FM_SOC1_prog.fw
#
+##########################################################################