summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2021-12-07 12:14:14 -0600
committerJohn Klug <john.klug@multitech.com>2021-12-07 12:33:29 -0600
commit7be1736916541d27aff1690dc06523e9154ad298 (patch)
tree1233f207d6e538075ed48d92d037a28994be7cff
parentf2b8da6cde5885626f790eaaa851fcac529842d3 (diff)
downloadmts-io-7be1736916541d27aff1690dc06523e9154ad298.tar.gz
mts-io-7be1736916541d27aff1690dc06523e9154ad298.tar.bz2
mts-io-7be1736916541d27aff1690dc06523e9154ad298.zip
mts-io version 4.8.2 for MTCDTIP-0.14.8.2
-rw-r--r--configure.ac2
-rw-r--r--io-module/mts-io.c7
-rw-r--r--io-module/mts_io_module.h6
-rw-r--r--io-module/version.h2
4 files changed, 11 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 7acf06f..249d84a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([mts-io], [4.8.1])
+AC_INIT([mts-io], [4.8.2])
AC_CONFIG_SRCDIR([util/mts_util_lora2_reset.c])
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER([config.h])
diff --git a/io-module/mts-io.c b/io-module/mts-io.c
index 8b1fbec..2ccdab5 100644
--- a/io-module/mts-io.c
+++ b/io-module/mts-io.c
@@ -973,7 +973,8 @@ mts_id_eeprom_load(void)
gpio_pins = gpio_pins_mtcdt_0_1;
set_buttons(default_buttons);
log_info("detected board %s", tmp);
- } else if ((tmp=HW_VERSION_MTCDT_0_2),(mts_hw_version=MTCDT_0_2),strncmp(id_eeprom.hw_version, tmp, strlen(tmp)) == 0) {
+ } else if (((tmp=HW_VERSION_MTCDT_0_2),(mts_hw_version=MTCDT_0_2),strncmp(id_eeprom.hw_version, tmp, strlen(tmp)) == 0) ||
+ ((tmp=HW_VERSION_MTCDTIP_0_1),(mts_hw_version=MTCDTIP_0_1),strncmp(id_eeprom.hw_version, tmp, strlen(tmp)) == 0)) {
need_append = 0;
current_blength = attr_blength = sizeof mtcdt_0_2_platform_attributes;
current_blength -= sizeof(struct attribute *); /* Length without terminating NULL */
@@ -1361,7 +1362,9 @@ static int __init mts_io_init(void)
if (pin->capability == 0 || DEVICE_CAPA(id_eeprom.capa,pin->capability)) {
ret = gpio_request_one(pin->pin.gpio, pin->pin.flags, pin->pin.label);
if (ret)
- log_debug("could not request pin %s (%d) but it could have already been requested under a different pin name", pin->name, ret);
+ dev_dbg(&mts_io_platform_device->dev,
+ "could not request pin %s (%d) but it could have already been requested under a different pin name",
+ pin->name, ret);
}
}
diff --git a/io-module/mts_io_module.h b/io-module/mts_io_module.h
index 4eb0ff0..3897797 100644
--- a/io-module/mts_io_module.h
+++ b/io-module/mts_io_module.h
@@ -34,11 +34,12 @@
#define HW_VERSION_MTCDT_0_1 "MTCDT-0.1" // Conduit refresh with GPS and WiFi possible
#define HW_VERSION_MTCDT_0_2 "MTCDT-0.2" // Atmel Serial and PCA9557
#define HW_VERSION_MTCDTIP_0_0 "MTCDTIP-0.0"
+#define HW_VERSION_MTCDTIP_0_1 "MTCDTIP-0.1" // Atmel Serial and PCA9557
#define HW_VERSION_MTCDTIPHP_0_0 "MTCDTIPHP-0.0" // Also known as LoRa 2.1
#define HW_VERSION_MTCAP_0_0 "MTCAP-0.0"
#define HW_VERSION_MTCAP_0_1 "MTCAP-0.1"
#define HW_VERSION_MTCAP_0_2 "MTCAP-0.2" // MTCAP 2 with POE
-#define HW_VERSION_MTCAP_0_3 "MTCAP-0.3" // MTCDTIP2 with super-cap
+#define HW_VERSION_MTCAP_0_3 "MTCAP-0.3" // MTCDTIP2 with super-cap
#define HW_VERSION_MTHS_0_0 "MTHS-0.0" // Never released
#define HW_VERSION_MTHS_0_1 "MTHS-0.1"
@@ -77,8 +78,9 @@ enum {
MTHS_0_1,
MTCPM_0_0,
MTCPM_0_1,
- MTCAP3_0_0,
+ MTCAP3_0_0,
MTCDT_0_2,
+ MTCDTIP_0_1, // MTCDTIP revision
};
/* Commented because it is not used. Сonflicts with <linux/leds.h> */
diff --git a/io-module/version.h b/io-module/version.h
index ab569e7..001a196 100644
--- a/io-module/version.h
+++ b/io-module/version.h
@@ -1,7 +1,7 @@
#ifndef __VERSION_H
#define __VERSION_H
-#define DRIVER_VERSION "v4.8.1"
+#define DRIVER_VERSION "v4.8.2"
#define DRIVER_AUTHOR "Multitech Systems"
#define DRIVER_DESC "MTS-IO Controller"
#define DRIVER_NAME "mts-io"