I have made the following changes intended for : CE:Adaptation:N950-N9 / kernel-adaptation-n950
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/6795 Thank You, rojkov [This message was auto-generated] --- Request # 6795: Messages from BOSS: State: review at 2012-09-26T15:05:10 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:rojkov:branches:CE:Adaptation:N950-N9 / kernel-adaptation-n950 -> CE:Adaptation:N950-N9 / kernel-adaptation-n950 changes files: -------------- --- kernel-adaptation-n950.changes +++ kernel-adaptation-n950.changes @@ -0,0 +1,3 @@ +* Wed Sep 26 2012 Dmitry Rozhkov <[email protected]> - 2.6.32.20112201 +- Load correct bluetooth firmware for N9. + new: ---- 0107-Load-correct-bluetooth-firmware-for-Nokia-N9.patch spec files: ----------- --- kernel-adaptation-n950-debug.spec +++ kernel-adaptation-n950-debug.spec @@ -1,6 +1,6 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.25 +# Generated by: spectacle version 0.24.1 # Name: kernel-adaptation-n950-debug @@ -123,6 +123,7 @@ Patch95: 000-kcflag-mno-unaligned-access.patch Patch96: linux-2.6.38-tty-add-active-sysfs-attribute-to-tty0-and-console-d.patch Patch97: 0001-backport-g_ffs-from-2.6.35.patch +Patch98: 0107-Load-correct-bluetooth-firmware-for-Nokia-N9.patch BuildRequires: pkgconfig(ncurses) BuildRequires: mer-kernel-checks BuildRequires: perl @@ -448,6 +449,9 @@ # backport of g_ffs from 2.6.35 # 0001-backport-g_ffs-from-2.6.35.patch %patch97 -p1 +# Fix for NEMO#455 +# 0107-Load-correct-bluetooth-firmware-for-Nokia-N9.patch +%patch98 -p1 # >> setup # This should go in the macro section # Determine the kernel arch and what we're building --- kernel-adaptation-n950.spec +++ kernel-adaptation-n950.spec @@ -1,6 +1,6 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.25 +# Generated by: spectacle version 0.24.1 # Name: kernel-adaptation-n950 @@ -123,6 +123,7 @@ Patch95: 000-kcflag-mno-unaligned-access.patch Patch96: linux-2.6.38-tty-add-active-sysfs-attribute-to-tty0-and-console-d.patch Patch97: 0001-backport-g_ffs-from-2.6.35.patch +Patch98: 0107-Load-correct-bluetooth-firmware-for-Nokia-N9.patch BuildRequires: pkgconfig(ncurses) BuildRequires: mer-kernel-checks BuildRequires: perl @@ -448,6 +449,9 @@ # backport of g_ffs from 2.6.35 # 0001-backport-g_ffs-from-2.6.35.patch %patch97 -p1 +# Fix for NEMO#455 +# 0107-Load-correct-bluetooth-firmware-for-Nokia-N9.patch +%patch98 -p1 # >> setup # This should go in the macro section # Determine the kernel arch and what we're building other changes: -------------- ++++++ 0107-Load-correct-bluetooth-firmware-for-Nokia-N9.patch (new) --- 0107-Load-correct-bluetooth-firmware-for-Nokia-N9.patch +++ 0107-Load-correct-bluetooth-firmware-for-Nokia-N9.patch @@ -0,0 +1,24 @@ +From c9221cfef3457106f2bed4e75fcbe8781fc4d3c5 Mon Sep 17 00:00:00 2001 +From: Dmitry Rozhkov <[email protected]> +Date: Wed, 26 Sep 2012 15:45:32 +0300 +Subject: [PATCH] Load correct bluetooth firmware for Nokia N9 + +--- + drivers/bluetooth/hci_h4p/fw.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/bluetooth/hci_h4p/fw.c b/drivers/bluetooth/hci_h4p/fw.c +index dac7cb7..64c8879 100644 +--- a/drivers/bluetooth/hci_h4p/fw.c ++++ b/drivers/bluetooth/hci_h4p/fw.c +@@ -47,6 +47,7 @@ static int hci_h4p_open_firmware(struct hci_h4p_info *info, + err = request_firmware(fw_entry, "ti1273_prele.bin", + info->dev); + break; ++ case 0xd1: + case 0xf1: + err = request_firmware(fw_entry, "ti1273_le.bin", + info->dev); +-- +1.7.9.5 + ++++++ series.conf --- series.conf +++ series.conf @@ -127,3 +127,6 @@ # backport of g_ffs from 2.6.35 0001-backport-g_ffs-from-2.6.35.patch + +# Fix for NEMO#455 +0107-Load-correct-bluetooth-firmware-for-Nokia-N9.patch
