From 1fb6c06a34536b26bd65290205a18c3dd6d61def Mon Sep 17 00:00:00 2001
From: Vyacheslav Pedash <vyacheslav.pedash@globallogic.com>
Date: Fri, 1 Jul 2022 15:04:58 +0300
Subject: MTX-4532 MTCDT3AC: Use gpiod for mtcpmhs

---
 recipes-bsp/multitech/mtac-lora_1.1.12.bb | 59 ---------------------------
 recipes-bsp/multitech/mtac-lora_1.1.13.bb | 59 +++++++++++++++++++++++++++
 recipes-bsp/multitech/mtac_4.1.4.bb       | 66 -------------------------------
 recipes-bsp/multitech/mtac_4.1.5.bb       | 65 ++++++++++++++++++++++++++++++
 recipes-bsp/multitech/mts-io.inc          |  2 +-
 recipes-bsp/multitech/mts-io_4.9.6.bb     |  2 -
 recipes-bsp/multitech/mts-io_4.9.7.bb     |  2 +
 7 files changed, 127 insertions(+), 128 deletions(-)
 delete mode 100644 recipes-bsp/multitech/mtac-lora_1.1.12.bb
 create mode 100644 recipes-bsp/multitech/mtac-lora_1.1.13.bb
 delete mode 100644 recipes-bsp/multitech/mtac_4.1.4.bb
 create mode 100644 recipes-bsp/multitech/mtac_4.1.5.bb
 delete mode 100644 recipes-bsp/multitech/mts-io_4.9.6.bb
 create mode 100644 recipes-bsp/multitech/mts-io_4.9.7.bb

diff --git a/recipes-bsp/multitech/mtac-lora_1.1.12.bb b/recipes-bsp/multitech/mtac-lora_1.1.12.bb
deleted file mode 100644
index 49e658f..0000000
--- a/recipes-bsp/multitech/mtac-lora_1.1.12.bb
+++ /dev/null
@@ -1,59 +0,0 @@
-DESCRIPTION = "MTAC LoRa Card"
-HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-lora/"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-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"
-COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
-
-SRCREV = "${PV}"
-
-PR = "${INC_PR}.1"
-
-PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
-
-SRC_URI = " \
-        git://git.multitech.net/mtac-lora.git;protocol=git;branch=master \
-"
-
-S = "${WORKDIR}/git"
-
-inherit module
-
-MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers \
-                   ${STAGING_INCDIR}/mtac/Module.symvers"
-
-COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \
-                KBUILD_VERBOSE=1 \
-                KBUILD_EXTRA_SYMBOLS='${MTS_EXTRA_SYMBOLS}' \
-                M=${S} \
-                modules \
-                "
-
-EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \
-                                    -D SAM9G25'"
-EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \
-                                    -D TI43X'"
-
-do_compile () {
-    bbnote make   "$@"
-    make   "$@"
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-    oe_runmake
-}
-
-PACKAGES = "kernel-module-${PN}"
-
-FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_lora.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_lora.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
-}
diff --git a/recipes-bsp/multitech/mtac-lora_1.1.13.bb b/recipes-bsp/multitech/mtac-lora_1.1.13.bb
new file mode 100644
index 0000000..9b9d194
--- /dev/null
+++ b/recipes-bsp/multitech/mtac-lora_1.1.13.bb
@@ -0,0 +1,59 @@
+DESCRIPTION = "MTAC LoRa Card"
+HOMEPAGE = "http://www.multitech.net/developer/products/multiconnect-conduit-platform/accessory-cards/mtac-lora/"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+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"
+COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
+
+SRCREV = "${PV}"
+
+PR = "${INC_PR}.2"
+
+PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
+
+SRC_URI = " \
+        git://git.multitech.net/mtac-lora.git;protocol=git;branch=master \
+"
+
+S = "${WORKDIR}/git"
+
+inherit module
+
+MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers \
+                   ${STAGING_INCDIR}/mtac/Module.symvers"
+
+COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \
+                KBUILD_VERBOSE=1 \
+                KBUILD_EXTRA_SYMBOLS='${MTS_EXTRA_SYMBOLS}' \
+                M=${S} \
+                modules \
+                "
+
+EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \
+                                    -D SAM9G25'"
+EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \
+                                    -D TI43X'"
+
+do_compile () {
+    bbnote make   "$@"
+    make   "$@"
+    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+    oe_runmake
+}
+
+PACKAGES = "kernel-module-${PN}"
+
+FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac_lora.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_lora.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+}
diff --git a/recipes-bsp/multitech/mtac_4.1.4.bb b/recipes-bsp/multitech/mtac_4.1.4.bb
deleted file mode 100644
index c6de690..0000000
--- a/recipes-bsp/multitech/mtac_4.1.4.bb
+++ /dev/null
@@ -1,66 +0,0 @@
-DESCRIPTION = "mtac drivers"
-HOMEPAGE = "http://www.multitech.net/"
-SECTION = "base"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-do_fetch[depends]+="virtual/kernel:do_shared_workdir"
-DEPENDS = "virtual/kernel mts-io"
-INC_PR = "r0"
-COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
-
-SRCREV = "${PV}"
-
-# Some packages depend on mtac
-RPROVIDES_kernel-module-${PN} = "mtac"
-
-PR = "${INC_PR}.1"
-
-PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
-
-SRC_URI = " \
-    git://git.multitech.net/mtac.git;protocol=git;branch=master \
-"
-S = "${WORKDIR}/git"
-
-inherit module
-
-MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers"
-
-COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \
-                KBUILD_VERBOSE=1 \
-                KBUILD_EXTRA_SYMBOLS="${MTS_EXTRA_SYMBOLS}" \
-                M=${S} \
-                modules \
-                "
-
-EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \
-                                    -D ${MACHINE}'"
-EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \
-                                    -D ${MACHINE} -D CONFIG_MTS_NUM_ACCESSORY_PORTS=2'"
-
-do_compile () {
-    bbnote make   "$@"
-    make   "$@"
-    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-    oe_runmake
-}
-
-PACKAGES = "kernel-module-${PN} ${PN}-dev"
-
-FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac.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.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
-
-    install -Dm0644 ${S}/Module.symvers ${D}${includedir}/${BPN}/Module.symvers
-
-    install -d ${D}${includedir}/mts-kernel-headers/linux
-    install -m 0644 ${S}/mtac.h ${D}${includedir}/mts-kernel-headers/linux
-    cp ${S}/machine/* ${D}${includedir}/mts-kernel-headers/linux
-    chmod -R 0644 ${D}${includedir}/mts-kernel-headers/linux
-}
diff --git a/recipes-bsp/multitech/mtac_4.1.5.bb b/recipes-bsp/multitech/mtac_4.1.5.bb
new file mode 100644
index 0000000..7206f3f
--- /dev/null
+++ b/recipes-bsp/multitech/mtac_4.1.5.bb
@@ -0,0 +1,65 @@
+DESCRIPTION = "mtac drivers"
+HOMEPAGE = "http://www.multitech.net/"
+SECTION = "base"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+do_fetch[depends]+="virtual/kernel:do_shared_workdir"
+DEPENDS = "virtual/kernel mts-io"
+INC_PR = "r0"
+COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
+
+SRCREV = "${PV}"
+
+# Some packages depend on mtac
+RPROVIDES_kernel-module-${PN} = "mtac"
+
+PR = "${INC_PR}.2"
+
+PKGR = "${PR}${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
+
+SRC_URI = " \
+    git://git.multitech.net/mtac.git;protocol=git;branch=master \
+"
+S = "${WORKDIR}/git"
+
+inherit module
+
+MTS_EXTRA_SYMBOLS="${STAGING_INCDIR}/mts-io/Module.symvers"
+
+COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \
+                KBUILD_VERBOSE=1 \
+                KBUILD_EXTRA_SYMBOLS="${MTS_EXTRA_SYMBOLS}" \
+                M=${S} \
+                modules \
+                "
+
+EXTRA_OEMAKE_mtcdt = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \
+                                    -D ${MACHINE}'"
+EXTRA_OEMAKE_mtcpmhs = "${COMMON_OEMAKE} EXTRA_CFLAGS='-I${STAGING_INCDIR}/mts-kernel-headers \
+                                    -D ${MACHINE} -D CONFIG_MTS_NUM_ACCESSORY_PORTS=2'"
+
+do_compile () {
+    bbnote make   "$@"
+    make   "$@"
+    unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
+    oe_runmake
+}
+
+PACKAGES = "kernel-module-${PN} ${PN}-dev"
+
+FILES_kernel-module-${PN} = "${base_libdir}/modules/${KERNEL_VERSION}/extra/mtac.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.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/extra
+
+    install -Dm0644 ${S}/Module.symvers ${D}${includedir}/${BPN}/Module.symvers
+
+    install -d ${D}${includedir}/mts-kernel-headers/linux
+    install -m 0644 ${S}/mtac.h ${D}${includedir}/mts-kernel-headers/linux
+    chmod -R 0644 ${D}${includedir}/mts-kernel-headers/linux
+}
diff --git a/recipes-bsp/multitech/mts-io.inc b/recipes-bsp/multitech/mts-io.inc
index bcc28e6..fc91efe 100644
--- a/recipes-bsp/multitech/mts-io.inc
+++ b/recipes-bsp/multitech/mts-io.inc
@@ -11,7 +11,7 @@ INC_PR = "r0"
 
 SRCREV = "${PV}"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 PKGR = "${PR}-${KERNEL_MODULE_PACKAGE_SUFFIX}${EXTENDPRAUTO}"
 
 # Some package needs to provide mts-io
diff --git a/recipes-bsp/multitech/mts-io_4.9.6.bb b/recipes-bsp/multitech/mts-io_4.9.6.bb
deleted file mode 100644
index ee4fcfa..0000000
--- a/recipes-bsp/multitech/mts-io_4.9.6.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require mts-io.inc
-
diff --git a/recipes-bsp/multitech/mts-io_4.9.7.bb b/recipes-bsp/multitech/mts-io_4.9.7.bb
new file mode 100644
index 0000000..ee4fcfa
--- /dev/null
+++ b/recipes-bsp/multitech/mts-io_4.9.7.bb
@@ -0,0 +1,2 @@
+require mts-io.inc
+
-- 
cgit v1.2.3