From 9e00f02456561aa4efc4da7cb998d891dd8777ff Mon Sep 17 00:00:00 2001 From: Sebastian Pastor Date: Mon, 16 Oct 2017 18:36:53 +0200 Subject: [PATCH] modemmanager: split udev rules for XBee Cellular The XBee Cellular modem is expected to be at ttymxc1 on CC6UL and at ttymxc4 on CC6. The changes are needed because in v4.9.11 kernel the /sys/devices entry for CC6UL and CC6 are the same for the TTYs, causing that on CC6UL ModemManager was also searching for modems on ttymxc4. Signed-off-by: Sebastian Pastor https://jira.digi.com/browse/DEL-5163 --- .../{ => ccimx6}/78-mm-digi-xbee-cellular.rules | 6 ++---- .../ccimx6ul/78-mm-digi-xbee-cellular.rules | 11 +++++++++++ .../modemmanager/modemmanager_%.bbappend | 2 ++ 3 files changed, 15 insertions(+), 4 deletions(-) rename meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/{ => ccimx6}/78-mm-digi-xbee-cellular.rules (73%) create mode 100644 meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6ul/78-mm-digi-xbee-cellular.rules diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/78-mm-digi-xbee-cellular.rules b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6/78-mm-digi-xbee-cellular.rules similarity index 73% rename from meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/78-mm-digi-xbee-cellular.rules rename to meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6/78-mm-digi-xbee-cellular.rules index e3ddda0ec..9f999dd1c 100644 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/78-mm-digi-xbee-cellular.rules +++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6/78-mm-digi-xbee-cellular.rules @@ -3,11 +3,9 @@ ACTION!="add|change|move", GOTO="mm_digi_xbee_cellular_modem_end" # By default, ModemManager expects a default baudrate of 57600bps. Different # baudrates may be used by setting the ID_MM_TTY_BAUDRATE udev tag. -# ConnectCore 6 SBC +# ModemManager documentation states that the best practice is to use the DEVPATH +# this way rather than other rules such as KERNEL, so be careful when modifying DEVPATH=="/devices/soc0/soc.0/2100000.aips-bus/21f4000.serial/tty/ttymxc4", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" DEVPATH=="/devices/soc0/soc/2100000.aips-bus/21f4000.serial/tty/ttymxc4", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" -# ConnectCore 6UL SBC Pro -DEVPATH=="/devices/platform/soc/2100000.aips-bus/21e8000.serial/tty/ttymxc1", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" - LABEL="mm_digi_xbee_cellular_modem_end" diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6ul/78-mm-digi-xbee-cellular.rules b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6ul/78-mm-digi-xbee-cellular.rules new file mode 100644 index 000000000..31fbcc68e --- /dev/null +++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx6ul/78-mm-digi-xbee-cellular.rules @@ -0,0 +1,11 @@ +ACTION!="add|change|move", GOTO="mm_digi_xbee_cellular_modem_end" + +# By default, ModemManager expects a default baudrate of 57600bps. Different +# baudrates may be used by setting the ID_MM_TTY_BAUDRATE udev tag. + +# ModemManager documentation states that the best practice is to use the DEVPATH +# this way rather than other rules such as KERNEL, so be careful when modifying +DEVPATH=="/devices/platform/soc/2100000.aips-bus/21e8000.serial/tty/ttymxc1", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" +DEVPATH=="/devices/soc0/soc/2100000.aips-bus/21e8000.serial/tty/ttymxc1", ENV{ID_MM_PLATFORM_DRIVER_PROBE}="1", ENV{ID_MM_PHYSDEV_UID}="Digi XBee Cellular" + +LABEL="mm_digi_xbee_cellular_modem_end" diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend index b1d763aea..1fe0adcf9 100644 --- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend +++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend @@ -16,3 +16,5 @@ do_install_append() { install -d ${D}${nonarch_base_libdir}/udev/rules.d install -m 0644 ${WORKDIR}/78-mm-digi-xbee-cellular.rules ${D}${nonarch_base_libdir}/udev/rules.d/ } + +PACKAGE_ARCH = "${MACHINE_ARCH}"