Merge remote-tracking branch 'origin/6' into mpower-dev-nxp

8 files changed, 36 insertions, 22 deletions

diff --git a/recipes-bsp/multitech/mt-dt-overlay/init b/recipes-bsp/multitech/mt-dt-overlay/init
index 5bd8523..c2d9716 100755
--- a/recipes-bsp/multitech/mt-dt-overlay/init
+++ b/recipes-bsp/multitech/mt-dt-overlay/init
@@ -5,6 +5,8 @@
 # device tree.
 sysdir=/sys/devices/platform/mts-io
 
+i2c=/sys/bus/i2c/devices/
+eepromPath="/sys/devices/platform/i2c-gpio-0/i2c-0/0-0056/eeprom"
 
 DEVTREE="/sys/kernel/config/device-tree/overlays/"
 SYSFS="/usr/sbin/mts-io-sysfs"
@@ -28,7 +30,7 @@ install_dtbo_dir() {
         done
         modprobe mt_ac_gpiob
     else
-        for f in *lora.dtbo ; do
+        for f in *.dtbo ; do
             if ! [[ -f $f ]] ; then
                 continue
             fi
@@ -47,7 +49,9 @@ install_dtbo_dir() {
 #              [flag]
 #                  [file1] [file2] [file3]
 setdevtree() {
-    hw=$(${SYSFS} show hw-version)
+    hwlin=$(mts-id-eeprom --in-file "$eepromPath" 2>/dev/null | grep '^hw-version:')
+    [[ $hwlin =~ hw-version:[[:space:]]*\"([^\"]+) ]]
+    hw=${BASH_REMATCH[1]}
     mach=${hw/%-*}
     rev=${hw/#*-/}
     echo mach is $mach
diff --git a/recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb b/recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb
index 5727e14..09c8f4a 100644
--- a/recipes-bsp/multitech/mt-dt-overlay_1.0.5.bb
+++ b/recipes-bsp/multitech/mt-dt-overlay_1.1.1.bb
@@ -5,12 +5,15 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 inherit update-rc.d
 INITSCRIPT_NAME = "${PN}"
-INITSCRIPT_PARAMS = "start 40 S ."
-DEPENDS = "dtc-native"
+# mt-dt-overlay must start before mts-io
+# because the gpio-leds driver will not load
+# after mts-io.
+INITSCRIPT_PARAMS = "start 39 S ."
+DEPENDS = "dtc-native linux-at91"
 RDEPENDS_${PN} = "bash"
 
 
-COMPATIBLE_MACHINE = "(mtcap|mtcdt|mtrv1)"
+COMPATIBLE_MACHINE = "(mtcap|mtrv1|mtcdt)"
 
 # By using an overlay, we should be able to support multiple pinouts
 # using the same image.  The overlays go into /lib/dtoverlays.
@@ -21,10 +24,10 @@ COMPATIBLE_MACHINE = "(mtcap|mtcdt|mtrv1)"
 
 dt_dir = "/lib/dtoverlays"
 
-PR = "r1"
+PR = "r3"
 
 SRC_URI = " \
-    git://git.multitech.net/mt-dt-overlay.git;protocol=git \
+	git://git.multitech.net/mt-dt-overlay.git;protocol=git \
 	file://init \
 "
 
diff --git a/recipes-bsp/multitech/mtac-gpiob_1.1.4.bb b/recipes-bsp/multitech/mtac-gpiob_1.3.0.bb
index f004cec..17a4962 100644
--- a/recipes-bsp/multitech/mtac-gpiob_1.1.4.bb
+++ b/recipes-bsp/multitech/mtac-gpiob_1.3.0.bb
@@ -11,15 +11,12 @@ INC_PR = "r1"
 COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
 SRCREV = "${PV}"
 
-# AUTOREV breaks mLinux source tarballs in Thud
-# SRCREV = "${AUTOREV}"
-
 PR = "${INC_PR}.2"
 
 PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
 
 SRC_URI = " \
-    git://git@gitlab.multitech.net/mirrors/mtac-gpiob;protocol=ssh;branch=master \
+    git://git.multitech.net/mtac-gpiob.git;protocol=git;branch=master \
 "
 S = "${WORKDIR}/git"
 
@@ -49,12 +46,12 @@ do_compile () {
 
 PACKAGES = "kernel-module-${PN}"
 
-FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mt_ac_gpiob.ko"
+FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_gpiob.ko"
 
 PARALLEL_MAKE = ""
 
 fakeroot do_install () {
     install -m 0755 -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
     # use cp instead of install so the driver doesn't get stripped
-    cp ${S}/mtac_gpiob.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra/mt_ac_gpiob.ko
+    cp ${S}/mtac_gpiob.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
 }
diff --git a/recipes-bsp/multitech/mtac-lora_1.1.5.bb b/recipes-bsp/multitech/mtac-lora_1.1.9.bb
index fda4f5c..447eb6e 100644
--- a/recipes-bsp/multitech/mtac-lora_1.1.5.bb
+++ b/recipes-bsp/multitech/mtac-lora_1.1.9.bb
@@ -17,8 +17,9 @@ PR = "${INC_PR}.1"
 PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
 
 SRC_URI = " \
-    git://git.multitech.net/mtac-lora.git;protocol=git;branch=master \
+    git://git@gitlab.multitech.net/mirrors/mtac-lora;protocol=ssh;branch=master \
 "
+
 S = "${WORKDIR}/git"
 
 inherit module
diff --git a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb b/recipes-bsp/multitech/mtac-mfser_1.2.0.bb
index 213ec1d..4598beb 100644
--- a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb
+++ b/recipes-bsp/multitech/mtac-mfser_1.2.0.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 do_fetch[depends]+="virtual/kernel:do_shared_workdir"
 DEPENDS = "virtual/kernel mtac mts-io"
 RDEPENDS_${PN} = "kernel-module-mtac"
-INC_PR = "r1"
+INC_PR = "r2"
 COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
 
 SRCREV = "${PV}"
diff --git a/recipes-bsp/multitech/mtac_4.0.9.bb b/recipes-bsp/multitech/mtac_4.1.2.bb
index ecabcb3..49b97a7 100644
--- a/recipes-bsp/multitech/mtac_4.0.9.bb
+++ b/recipes-bsp/multitech/mtac_4.1.2.bb
@@ -11,9 +11,6 @@ COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
 
 SRCREV = "${AUTOREV}"
 
-# AUTOREV breaks mLinux source tarballs in Thud
-# SRCREV = "${AUTOREV}"
-
 # Some packages depend on mtac
 RPROVIDES_kernel-module-${PN} = "mtac"
 
@@ -22,7 +19,7 @@ PR = "${INC_PR}.1"
 PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
 
 SRC_URI = " \
-    git://git@gitlab.multitech.net/mirrors/mtac;protocol=ssh;branch=master \
+    git://git.multitech.net/mtac.git;protocol=git;branch=master \
 "
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc
index a00f9aa..10d4527 100644
--- a/recipes-bsp/multitech/mts-io.inc
+++ b/recipes-bsp/multitech/mts-io.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://io-module/COPYING;md5=94d55d512a9ba36caa9b7df079bae19
                     file://io-tool/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 "
 do_fetch[depends] += "virtual/kernel:do_shared_workdir"
-INC_PR = "r2"
+INC_PR = "r6"
 
 SRCREV = "${PV}"
 PR = "${INC_PR}.0"
@@ -85,6 +85,7 @@ fakeroot do_install () {
     # install headers for kernel modules
     install -d ${D}${includedir}/mts-kernel-headers/linux
     install -m 0644 ${S}/io-module/mts_io.h ${D}${includedir}/mts-kernel-headers/linux
+    install -m 0644 ${S}/io-module/mts_io_module.h ${D}${includedir}/mts-kernel-headers/linux
     install -m 0644 ${S}/io-module/mts_eeprom.h ${D}${includedir}/mts-kernel-headers/linux
     install -m 0644 ${S}/io-module/at91gpio.h ${D}${includedir}/mts-kernel-headers/linux
 
@@ -94,6 +95,7 @@ fakeroot do_install () {
     #
     install -d ${D}${includedir}/linux
     install -m 0644 ${S}/io-module/mts_io.h ${D}${includedir}/linux
+    install -m 0644 ${S}/io-module/mts_io_module.h ${D}${includedir}/linux
     install -m 0644 ${S}/io-module/mts_eeprom.h ${D}${includedir}/linux
     install -m 0644 ${S}/io-module/at91gpio.h ${D}${includedir}/linux
 
diff --git a/recipes-bsp/multitech/mts-io/mts-io.init b/recipes-bsp/multitech/mts-io/mts-io.init
index 2dd5405..cd93fbb 100755
--- a/recipes-bsp/multitech/mts-io/mts-io.init
+++ b/recipes-bsp/multitech/mts-io/mts-io.init
@@ -80,7 +80,10 @@ HWNAME=""
 HWLVL=""
 
 
-RST[0]="${sysdir}/wifi-bt-reset"
+# WIFIBTRESET is used later, so it must match
+# the index of the RST variable for wifi-bt-reset.
+WIFIBTRESET=0
+RST[${WIFIBTRESET}]="${sysdir}/wifi-bt-reset"
 RST[1]="${sysdir}/mtq-reset"
 RST[2]="${sysdir}/ap1/reset"
 RST[3]="${sysdir}/ap1/creset"
@@ -313,7 +316,7 @@ set_links() {
     fi
     # Default MTCDT-0.1
     echo "u-blox" >"$GPSCONFIGTYPE"
-    ln -sf /dev/ttyXRUSB2 /dev/gps0
+    # Link up GPS for MTCDT and MTCDTIP in udev
 }
 
 case $1 in
@@ -355,6 +358,13 @@ case $1 in
     /usr/bin/logger -t "mts-io" -p daemon.info -s "Resetting system modules"
     read_card_info
     /bin/busybox usleep $USLPTIME
+
+    # MTCDT-0.2 has issues with resetting RS9113 twice.
+    # RS9113 is reset in /etc/init.d/rs9113.
+    # Remove for MTRV1 reset as well, as it is redundant.
+    if [[ $hw_name == MTCDT ]] || [[ $hw_name == MTRV1 ]] ; then
+	RST[${WIFIBTRESET}]="/dev/null"
+    fi
     reset_array
     # use radio-reset init script for radio-reset
     mfser_init