aboutsummaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorAndreas Areskoug <andreas.areskoug@stericsson.com>2010-03-16 11:02:42 +0100
committerJohn Rigby <john.rigby@linaro.org>2010-09-02 22:44:26 -0600
commit4d10a5ddd564f07ec5bd6e6d0e0b80882a799f1f (patch)
tree868695abf8243fd52d0103d6000333d3d3eecd92 /firmware
parenta1113d0582381ec61040f22054eb6232eac16355 (diff)
downloadlinux-2.6.34-ux500-4d10a5ddd564f07ec5bd6e6d0e0b80882a799f1f.tar.gz
Merged ste_conn driver with Linux_SW_v0.6
Diffstat (limited to 'firmware')
-rw-r--r--firmware/Makefile10
-rwxr-xr-xfirmware/STLC2600_R6_03_01.fw.orgbin0 -> 436 bytes
-rwxr-xr-xfirmware/STLC2600_R6_04_02.fw.orgbin0 -> 424 bytes
-rwxr-xr-xfirmware/STLC2600_R7_00_01.fw.orgbin0 -> 363 bytes
-rwxr-xr-xfirmware/STLC2690_R6_03_A1_E5.fw.orgbin0 -> 6156 bytes
-rwxr-xr-xfirmware/STLC2690_R6_04_A2.fw.orgbin0 -> 5320 bytes
-rwxr-xr-xfirmware/STLC2690_R7_00_A1_E5.fw.orgbin0 -> 6384 bytes
-rwxr-xr-xfirmware/ste_conn_patch_info.fw.org24
-rwxr-xr-xfirmware/ste_conn_settings_info.fw.org24
9 files changed, 58 insertions, 0 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index 8af0fc7210b..e19ec4f76b6 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -137,6 +137,10 @@ fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda/xircom_pgs.fw
fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw
fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin
fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin
+fw-shipped-$(CONFIG_MFD_STE_CONN) += ste_conn_patch_info.fw ste_conn_settings_info.fw \
+ STLC2600_R6_03_01.fw STLC2690_R6_03_A1_E5.fw \
+ STLC2600_R6_04_02.fw STLC2690_R6_04_A2.fw \
+ STLC2600_R7_00_01.fw STLC2690_R7_00_A1_E5.fw
fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
@@ -149,6 +153,9 @@ quiet_cmd_mkdir = MKDIR $(patsubst $(objtree)/%,%,$@)
quiet_cmd_ihex = IHEX $@
cmd_ihex = $(OBJCOPY) -Iihex -Obinary $< $@
+quiet_cmd_copy = COPY $@
+ cmd_copy = cp $< $@
+
quiet_cmd_ihex2fw = IHEX2FW $@
cmd_ihex2fw = $(objtree)/$(obj)/ihex2fw $< $@
@@ -212,6 +219,9 @@ $(patsubst %,$(obj)/%.gen.o, $(fw-external-y)): $(obj)/%.gen.o: $(fwdir)/%
$(obj)/%: $(obj)/%.ihex | $(objtree)/$(obj)/$$(dir %)
$(call cmd,ihex)
+$(obj)/%: $(obj)/%.org | $(objtree)/$(obj)/$$(dir %)
+ $(call cmd,copy)
+
# Don't depend on ihex2fw if we're installing and it already exists.
# Putting it after | in the dependencies doesn't seem sufficient when
# we're installing after a cross-compile, because ihex2fw has dependencies
diff --git a/firmware/STLC2600_R6_03_01.fw.org b/firmware/STLC2600_R6_03_01.fw.org
new file mode 100755
index 00000000000..5bde4069f85
--- /dev/null
+++ b/firmware/STLC2600_R6_03_01.fw.org
Binary files differ
diff --git a/firmware/STLC2600_R6_04_02.fw.org b/firmware/STLC2600_R6_04_02.fw.org
new file mode 100755
index 00000000000..3b29496254b
--- /dev/null
+++ b/firmware/STLC2600_R6_04_02.fw.org
Binary files differ
diff --git a/firmware/STLC2600_R7_00_01.fw.org b/firmware/STLC2600_R7_00_01.fw.org
new file mode 100755
index 00000000000..1a2d14b1e0a
--- /dev/null
+++ b/firmware/STLC2600_R7_00_01.fw.org
Binary files differ
diff --git a/firmware/STLC2690_R6_03_A1_E5.fw.org b/firmware/STLC2690_R6_03_A1_E5.fw.org
new file mode 100755
index 00000000000..6a97766ac7a
--- /dev/null
+++ b/firmware/STLC2690_R6_03_A1_E5.fw.org
Binary files differ
diff --git a/firmware/STLC2690_R6_04_A2.fw.org b/firmware/STLC2690_R6_04_A2.fw.org
new file mode 100755
index 00000000000..b9f97246ddb
--- /dev/null
+++ b/firmware/STLC2690_R6_04_A2.fw.org
Binary files differ
diff --git a/firmware/STLC2690_R7_00_A1_E5.fw.org b/firmware/STLC2690_R7_00_A1_E5.fw.org
new file mode 100755
index 00000000000..1f73bc1a04a
--- /dev/null
+++ b/firmware/STLC2690_R7_00_A1_E5.fw.org
Binary files differ
diff --git a/firmware/ste_conn_patch_info.fw.org b/firmware/ste_conn_patch_info.fw.org
new file mode 100755
index 00000000000..722f1bddb23
--- /dev/null
+++ b/firmware/ste_conn_patch_info.fw.org
@@ -0,0 +1,24 @@
+########################################################################
+# ST-Ericsson Connectivity Chip Patch Information File
+#
+# All patch information must be stored as follows
+#
+# HCI_revision LMP_Subversion File_name (without .org extension)
+#
+########################################################################
+#
+#
+#################
+#
+# Patch file for ST Microelectronics - STLC2690
+#
+0x0603 0x0014 STLC2690_R6_03_A1_E5.fw
+0x0604 0x001D STLC2690_R6_04_A2.fw
+#
+#################
+#
+# Patch file for ST-Ericsson - CG2900
+#
+0x0700 0x0011 STLC2690_R7_00_A1_E5.fw
+#
+#################
diff --git a/firmware/ste_conn_settings_info.fw.org b/firmware/ste_conn_settings_info.fw.org
new file mode 100755
index 00000000000..89399d3670b
--- /dev/null
+++ b/firmware/ste_conn_settings_info.fw.org
@@ -0,0 +1,24 @@
+########################################################################
+# ST-Ericsson Connectivity Chip Factory Settings Information File
+#
+# All information must be stored as follows
+#
+# HCI_revision LMP_Subversion File_name (without .org extension)
+#
+########################################################################
+#
+#
+#################
+#
+# Factory Settings for ST Microelectronics - STLC2690
+#
+0x0603 0x0014 STLC2600_R6_03_01.fw
+0x0604 0x001D STLC2600_R6_04_02.fw
+#
+#################
+#
+# Factory Settings for ST-Ericsson - CG2900
+#
+0x0700 0x0011 STLC2600_R7_00_01.fw
+#
+#################