From db6d57284ad2df9dd94ead07a3b93ef65858268b Mon Sep 17 00:00:00 2001 From: Salvador Penalva Date: Thu, 11 May 2017 09:55:41 +0200 Subject: [PATCH] modemmanager: update to fix QMI bug and add Ublox patches for XBee QMI modems didn't work with the version of modemmanager that the dey-2.2-r1 release was using. We were using two patches for uBlox plugin to use XBee Cellular 3G that are now merged in modemmanager master. This updates modemmanager to use the commit where QMI problem was fixed and also include uBlox patches. https://jira.digi.com/browse/DEL-4192 Signed-off-by: Salvador Penalva (cherry picked from commit a2063b11a349a4ef542b7f4788eddb19fc615760) --- ...port-modems-connected-to-serial-port.patch | 32 ------------------ ...B230400-and-B921600-missing-baudrate.patch | 33 ------------------- .../modemmanager/modemmanager_git.bb | 4 +-- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0002-ublox-support-modems-connected-to-serial-port.patch delete mode 100644 meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0003-port-serial-add-B230400-and-B921600-missing-baudrate.patch diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0002-ublox-support-modems-connected-to-serial-port.patch b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0002-ublox-support-modems-connected-to-serial-port.patch deleted file mode 100644 index 8d25e6036..000000000 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0002-ublox-support-modems-connected-to-serial-port.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Javier Viguera -Date: Thu, 4 May 2017 17:03:37 +0200 -Subject: [PATCH] ublox: support modems connected to serial port - -Add the vendor string, so it can be probed via AT commands. This allows -to support modems that are connected to a serial port. - -Upstream-Status: Pending - -Signed-off-by: Javier Viguera ---- - plugins/ublox/mm-plugin-ublox.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/plugins/ublox/mm-plugin-ublox.c b/plugins/ublox/mm-plugin-ublox.c -index 890f520754aa..0ca74d903f88 100644 ---- a/plugins/ublox/mm-plugin-ublox.c -+++ b/plugins/ublox/mm-plugin-ublox.c -@@ -66,11 +66,13 @@ mm_plugin_create (void) - { - static const gchar *subsystems[] = { "tty", "net", NULL }; - static const guint16 vendor_ids[] = { 0x1546, 0 }; -+ static const gchar *vendor_strings[] = { "u-blox", NULL }; - - return MM_PLUGIN (g_object_new (MM_TYPE_PLUGIN_UBLOX, - MM_PLUGIN_NAME, "u-blox", - MM_PLUGIN_ALLOWED_SUBSYSTEMS, subsystems, - MM_PLUGIN_ALLOWED_VENDOR_IDS, vendor_ids, -+ MM_PLUGIN_ALLOWED_VENDOR_STRINGS, vendor_strings, - MM_PLUGIN_ALLOWED_AT, TRUE, - MM_PLUGIN_CUSTOM_AT_PROBE, custom_at_probe, - NULL)); diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0003-port-serial-add-B230400-and-B921600-missing-baudrate.patch b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0003-port-serial-add-B230400-and-B921600-missing-baudrate.patch deleted file mode 100644 index 2eedc9ea2..000000000 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0003-port-serial-add-B230400-and-B921600-missing-baudrate.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Javier Viguera -Date: Wed, 19 Apr 2017 14:13:56 +0200 -Subject: [PATCH] port-serial: add B230400 and B921600 missing baudrates - -So MM can use them when opening a specific serial port. - -Upstream-Status: Pending - -Signed-off-by: Javier Viguera ---- - src/mm-port-serial.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/mm-port-serial.c b/src/mm-port-serial.c -index 04ab17fe1675..b6359d28acd3 100644 ---- a/src/mm-port-serial.c -+++ b/src/mm-port-serial.c -@@ -260,9 +260,15 @@ parse_baudrate (guint baudrate_num, - case 115200: - speed = B115200; - break; -+ case 230400: -+ speed = B230400; -+ break; - case 460800: - speed = B460800; - break; -+ case 921600: -+ speed = B921600; -+ break; - default: - return FALSE; - } diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_git.bb b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_git.bb index 064e68dc8..623a8db0a 100644 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_git.bb +++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_git.bb @@ -15,10 +15,8 @@ PV = "1.7.0+git${SRCPV}" SRC_URI = " \ git://anongit.freedesktop.org/git/ModemManager/ModemManager.git;protocol=https \ file://0001-configure.ac-add-foreign-automake-option.patch \ - file://0002-ublox-support-modems-connected-to-serial-port.patch \ - file://0003-port-serial-add-B230400-and-B921600-missing-baudrate.patch \ " -SRCREV = "d09bc8baaa9fe93a72bb715530b1403a7a81c891" +SRCREV = "d41d717112e6a183a0df510c210e80a86fc11060" S = "${WORKDIR}/git"