From 21d176762fa23d30cea5fcf960bf1243a00f8530 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Thu, 5 Nov 2020 11:09:45 -0600
Subject: Revise AP1 GPIO2-4 for MTCDT3AC all mtac drivers

---
 recipes-bsp/multitech/mtac-eth_1.1.1.bb   |  2 +-
 recipes-bsp/multitech/mtac-gpiob_1.1.2.bb |  2 +-
 recipes-bsp/multitech/mtac-lora_1.1.5.bb  |  2 +-
 recipes-bsp/multitech/mtac-mfser_1.1.1.bb |  2 +-
 recipes-bsp/multitech/mtac-pulse_1.1.1.bb |  2 +-
 recipes-bsp/multitech/mtac-xdot_1.1.1.bb  |  2 +-
 recipes-bsp/multitech/mtac_4.0.6.bb       | 60 -------------------------------
 recipes-bsp/multitech/mtac_4.0.7.bb       | 60 +++++++++++++++++++++++++++++++
 8 files changed, 66 insertions(+), 66 deletions(-)
 delete mode 100644 recipes-bsp/multitech/mtac_4.0.6.bb
 create mode 100644 recipes-bsp/multitech/mtac_4.0.7.bb

diff --git a/recipes-bsp/multitech/mtac-eth_1.1.1.bb b/recipes-bsp/multitech/mtac-eth_1.1.1.bb
index 8d5f753..ee16128 100644
--- a/recipes-bsp/multitech/mtac-eth_1.1.1.bb
+++ b/recipes-bsp/multitech/mtac-eth_1.1.1.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 = "r0"
+INC_PR = "r1"
 COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
 
 SRCREV = "${PV}"
diff --git a/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb b/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb
index 91ebb93..6b7a3ab 100644
--- a/recipes-bsp/multitech/mtac-gpiob_1.1.2.bb
+++ b/recipes-bsp/multitech/mtac-gpiob_1.1.2.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 = "r0"
+INC_PR = "r1"
 COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
 
 SRCREV = "${AUTOREV}"
diff --git a/recipes-bsp/multitech/mtac-lora_1.1.5.bb b/recipes-bsp/multitech/mtac-lora_1.1.5.bb
index 5454939..a3f5141 100644
--- a/recipes-bsp/multitech/mtac-lora_1.1.5.bb
+++ b/recipes-bsp/multitech/mtac-lora_1.1.5.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 = "r0"
+INC_PR = "r1"
 COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
 
 SRCREV = "${PV}"
diff --git a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb b/recipes-bsp/multitech/mtac-mfser_1.1.1.bb
index 5105e95..e5c00df 100644
--- a/recipes-bsp/multitech/mtac-mfser_1.1.1.bb
+++ b/recipes-bsp/multitech/mtac-mfser_1.1.1.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 = "r0"
+INC_PR = "r1"
 COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
 
 SRCREV = "${PV}"
diff --git a/recipes-bsp/multitech/mtac-pulse_1.1.1.bb b/recipes-bsp/multitech/mtac-pulse_1.1.1.bb
index a8485bc..ee0cb8d 100644
--- a/recipes-bsp/multitech/mtac-pulse_1.1.1.bb
+++ b/recipes-bsp/multitech/mtac-pulse_1.1.1.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 = "r0"
+INC_PR = "r1"
 COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
 
 SRCREV = "${PV}"
diff --git a/recipes-bsp/multitech/mtac-xdot_1.1.1.bb b/recipes-bsp/multitech/mtac-xdot_1.1.1.bb
index f9facb0..1f5ae79 100644
--- a/recipes-bsp/multitech/mtac-xdot_1.1.1.bb
+++ b/recipes-bsp/multitech/mtac-xdot_1.1.1.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 = "r2"
+INC_PR = "r3"
 COMPATIBLE_MACHINE = "(mtcdt|mtcpmhs)"
 
 SRCREV = "${PV}"
diff --git a/recipes-bsp/multitech/mtac_4.0.6.bb b/recipes-bsp/multitech/mtac_4.0.6.bb
deleted file mode 100644
index 809b0a4..0000000
--- a/recipes-bsp/multitech/mtac_4.0.6.bb
+++ /dev/null
@@ -1,60 +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}"
-SRCREV = "${AUTOREV}"
-
-# Some packages depend on mtac
-RPROVIDES_kernel-module-${PN} = "mtac"
-
-PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
-
-SRC_URI = " \
-    git://git.multitech.net/mtac.git;protocol=git \
-" 
-S = "${WORKDIR}/git"
-
-inherit module
-
-COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \
-                KBUILD_VERBOSE=1 \
-                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 -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.0.7.bb b/recipes-bsp/multitech/mtac_4.0.7.bb
new file mode 100644
index 0000000..809b0a4
--- /dev/null
+++ b/recipes-bsp/multitech/mtac_4.0.7.bb
@@ -0,0 +1,60 @@
+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}"
+SRCREV = "${AUTOREV}"
+
+# Some packages depend on mtac
+RPROVIDES_kernel-module-${PN} = "mtac"
+
+PR = "${INC_PR}.1${KERNEL_MODULE_PACKAGE_SUFFIX}"
+
+SRC_URI = " \
+    git://git.multitech.net/mtac.git;protocol=git \
+" 
+S = "${WORKDIR}/git"
+
+inherit module
+
+COMMON_OEMAKE = " -C ${STAGING_KERNEL_DIR} \
+                KBUILD_VERBOSE=1 \
+                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 -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
+}
-- 
cgit v1.2.3