aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/linux
diff options
context:
space:
mode:
authorsledz <sledz@e6edf6fb-f266-4316-afb4-e53d95876a76>2011-06-07 10:30:32 +0000
committerSteffen Sledz <sledz@dresearch-fe.de>2011-06-07 12:59:21 +0200
commitbd6fa71311d06f19b2797a3940d8b6779e32ae66 (patch)
treea089fbeefb7398b7fb678f5fcf17a1c6a6c5c3b4 /recipes/linux
parent46399f12a090a00c27c0cedb103cfb75075a0c5c (diff)
downloadopenembedded-bd6fa71311d06f19b2797a3940d8b6779e32ae66.tar.gz
linux-2.6.24: add another 4N-GALAXY.DE PID to ftdi_sio driver
Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
Diffstat (limited to 'recipes/linux')
-rw-r--r--recipes/linux/linux-2.6.24/ftdi-4n-galaxy.patch22
-rw-r--r--recipes/linux/linux_2.6.24.bb3
2 files changed, 24 insertions, 1 deletions
diff --git a/recipes/linux/linux-2.6.24/ftdi-4n-galaxy.patch b/recipes/linux/linux-2.6.24/ftdi-4n-galaxy.patch
new file mode 100644
index 0000000000..133aae856b
--- /dev/null
+++ b/recipes/linux/linux-2.6.24/ftdi-4n-galaxy.patch
@@ -0,0 +1,22 @@
+diff -Nurd linux-2.6.24.orig/drivers/usb/serial/ftdi_sio.c linux-2.6.24/drivers/usb/serial/ftdi_sio.c
+--- linux-2.6.24.orig/drivers/usb/serial/ftdi_sio.c 2011-06-07 12:15:01.418982729 +0200
++++ linux-2.6.24/drivers/usb/serial/ftdi_sio.c 2011-06-07 12:16:20.107926616 +0200
+@@ -523,6 +523,7 @@
+ { USB_DEVICE(FTDI_VID, EVER_ECO_PRO_CDS) },
+ { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_1_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_2_PID) },
++ { USB_DEVICE(FTDI_VID, FTDI_4N_GALAXY_DE_3_PID) },
+ { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_0_PID) },
+ { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_1_PID) },
+ { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_2_PID) },
+diff -Nurd linux-2.6.24.orig/drivers/usb/serial/ftdi_sio.h linux-2.6.24/drivers/usb/serial/ftdi_sio.h
+--- linux-2.6.24.orig/drivers/usb/serial/ftdi_sio.h 2011-06-07 12:15:01.413983114 +0200
++++ linux-2.6.24/drivers/usb/serial/ftdi_sio.h 2011-06-07 12:16:11.652577907 +0200
+@@ -387,6 +387,7 @@
+ */
+ #define FTDI_4N_GALAXY_DE_1_PID 0xF3C0
+ #define FTDI_4N_GALAXY_DE_2_PID 0xF3C1
++#define FTDI_4N_GALAXY_DE_3_PID 0xF3C2
+
+ /*
+ * Mobility Electronics products.
diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb
index 85696906ca..e9844bbeae 100644
--- a/recipes/linux/linux_2.6.24.bb
+++ b/recipes/linux/linux_2.6.24.bb
@@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_hipox = "1"
DEFAULT_PREFERENCE_cs-e9302 = "1"
DEFAULT_PREFERENCE_smartq5 = "1"
-PR = "r42"
+PR = "r44"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \
${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \
@@ -20,6 +20,7 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=k
file://ubifs-v2.6.24-silent-get-sb.patch \
file://cfi-amic.patch \
file://make-3.82.patch \
+ file://ftdi-4n-galaxy.patch \
file://defconfig"
# Moved away temporarely until committed properly (work in progress).