summaryrefslogtreecommitdiff
path: root/io-module
diff options
context:
space:
mode:
authorMike Nicholson <mikempls@users.noreply.github.com>2019-08-09 17:26:01 -0500
committerMike Nicholson <mikempls@users.noreply.github.com>2019-08-09 17:26:01 -0500
commit43468a14981d2b34ad7a1c6bb43cd9650db5e479 (patch)
treeb3241f202160305ee62d6b40084c40b07ea31d3c /io-module
parent9cae1b197308e0ed093596c984bae21ded4e7ec8 (diff)
downloadmts-io-43468a14981d2b34ad7a1c6bb43cd9650db5e479.tar.gz
mts-io-43468a14981d2b34ad7a1c6bb43cd9650db5e479.tar.bz2
mts-io-43468a14981d2b34ad7a1c6bb43cd9650db5e479.zip
Fix Wi-Fi/GNSS capabilities in CDT3; Add CDT3 Reset
Diffstat (limited to 'io-module')
-rw-r--r--io-module/machine/mtcdt3.c28
-rw-r--r--io-module/mts-io.c7
2 files changed, 11 insertions, 24 deletions
diff --git a/io-module/machine/mtcdt3.c b/io-module/machine/mtcdt3.c
index 621f3cd..7c8e781 100644
--- a/io-module/machine/mtcdt3.c
+++ b/io-module/machine/mtcdt3.c
@@ -29,7 +29,7 @@ static struct gpio_pin gpio_pins_mtcdt3[] = {
{
.name = "DEVICE_RESET",
.pin = {
- .gpio = 0, /* This is a special register */
+ .gpio = OMAP_GPIO(1,29),
.flags = GPIOF_IN,
.label = "reset",
},
@@ -42,7 +42,7 @@ static struct gpio_pin gpio_pins_mtcdt3[] = {
.flags = GPIOF_IN,
.label = "wifi-bt-int",
},
- .capability = CAPA_WIFI,
+ .capability = CAPA_BLUETOOTH,
},
{
.name = "WIFI_RESET",
@@ -61,7 +61,7 @@ static struct gpio_pin gpio_pins_mtcdt3[] = {
.flags = GPIOF_OUT_INIT_HIGH,
.label = "bt-reset",
},
- .capability = CAPA_WIFI,
+ .capability = CAPA_BLUETOOTH,
.active_low = 1,
},
{
@@ -209,33 +209,27 @@ static struct attribute *mtcdt3_platform_attributes[] = {
// easily remove radio.
// is_radio_power_attr_mtcdt() searches
// for this for truncation.
- &dev_attr_radio_power.attr, /* Must be first radio attribute */
+ &dev_attr_radio_power.attr, /* Must be first radio attribute */
&dev_attr_radio_reset.attr,
&dev_attr_radio_reset_backoffs.attr,
&dev_attr_radio_reset_backoff_index.attr,
&dev_attr_radio_reset_backoff_seconds.attr,
+
+ &dev_attr_wifi_reset_mtcdt3.attr,
+ &dev_attr_bt_reset_mtcdt3.attr,
+ &dev_attr_wifi_bt_int_mtcdt3.attr,
+
+ &dev_attr_gnss_reset_mtcdt3.attr,
+ &dev_attr_gnss_int_mtcdt3.attr,
NULL,
};
-static struct attribute *mtcdt3_wifi_bt_attributes[] = {
- &dev_attr_wifi_reset_mtcdt3.attr,
- &dev_attr_bt_reset_mtcdt3.attr,
- &dev_attr_wifi_bt_int_mtcdt3.attr,
-};
-
-static struct attribute *mtcdt3_gnss_attributes[] = {
- &dev_attr_gnss_reset_mtcdt3.attr,
- &dev_attr_gnss_int_mtcdt3.attr,
-};
-
-
static struct attribute_group mtcdt3_platform_attribute_group = {
.attrs = mtcdt3_platform_attributes
};
-
static int
is_radio_power_attr_mtcdt3(struct attribute *attr)
{
diff --git a/io-module/mts-io.c b/io-module/mts-io.c
index 56faea2..3c6dbe4 100644
--- a/io-module/mts-io.c
+++ b/io-module/mts-io.c
@@ -830,13 +830,6 @@ mts_id_eeprom_load(void)
if (DEVICE_CAPA(id_eeprom.capa, CAPA_LORA)) {
attr_group_lora = &mtcdt3_lora_attribute_group;
}
- if(DEVICE_CAPA(id_eeprom.capa, CAPA_WIFI)) {
- attr_blength += sizeof mtcdt3_wifi_bt_attributes;
- }
- if(DEVICE_CAPA(id_eeprom.capa, CAPA_GPS)) {
- attr_blength += sizeof mtcdt3_gnss_attributes;
- }
-
attr_group = &mtcdt3_platform_attribute_group;
gpio_pins = gpio_pins_mtcdt3;
set_buttons(default_buttons);