From 7ab9527d773bbbd5a0dd467e9731d39df523ee58 Mon Sep 17 00:00:00 2001 From: John Klug Date: Mon, 22 Nov 2021 15:31:24 -0600 Subject: Remove secure reset (conflict in MTCDT-0.2), fix unsupported sleep/wakeup signals --- io-module/machine/mtcdt.c | 34 +++++++++------------------------- io-module/version.h | 2 +- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/io-module/machine/mtcdt.c b/io-module/machine/mtcdt.c index f8b5f0b..5ee77cb 100644 --- a/io-module/machine/mtcdt.c +++ b/io-module/machine/mtcdt.c @@ -265,7 +265,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_1[] = { .name = "WIFI_BT_ULPWKUP", .pin = { .gpio = AT91_PIN_PA0, - .flags = GPIOF_IN, + .flags = GPIOF_OUT_INIT_LOW, .label = "wifi-bt-ulpwkup", }, .capability = CAPA_WIFI, @@ -274,7 +274,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_1[] = { .name = "WIFI_BT_LPWKUP", .pin = { .gpio = AT91_PIN_PA6, - .flags = GPIOF_IN, + .flags = GPIOF_OUT_INIT_HIGH, .label = "wifi-bt-lpwkup", }, .capability = CAPA_WIFI, @@ -292,7 +292,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_1[] = { .name = "WIFI_BT_RESET", .pin = { .gpio = AT91_PIN_PD14, - .flags = GPIOF_OUT_INIT_HIGH, + .flags = GPIOF_OUT_INIT_LOW, .label = "wifi-bt-reset", }, .capability = CAPA_WIFI, @@ -306,14 +306,6 @@ static struct gpio_pin gpio_pins_mtcdt_0_1[] = { }, .capability = CAPA_GPS, }, - { - .name = "SECURE_RESET", - .pin = { - .gpio = AT91_PIN_PD16, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "secure-reset", - } - }, { .name = "MTQ_RESET", .pin = { @@ -326,7 +318,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_1[] = { .name = "USBHUB_RESET", .pin = { .gpio = AT91_PIN_PD18, - .flags = GPIOF_OUT_INIT_HIGH, + .flags = GPIOF_OUT_INIT_LOW, .label = "usbhub-reset", } }, @@ -334,7 +326,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_1[] = { .name = "GNSS_INT", .pin = { .gpio = AT91_PIN_PD19, - .flags = GPIOF_OUT_INIT_HIGH, + .flags = GPIOF_OUT_INIT_LOW, .label = "gnss-int", }, .capability = CAPA_GPS, @@ -492,7 +484,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_2[] = { .name = "WIFI_BT_ULPWKUP", .pin = { .gpio = AT91_PIN_PA0, - .flags = GPIOF_IN, + .flags = GPIOF_OUT_INIT_LOW, .label = "wifi-bt-ulpwkup", }, .capability = CAPA_WIFI, @@ -501,7 +493,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_2[] = { .name = "WIFI_BT_LPWKUP", .pin = { .gpio = PCA9557_0_IO1, - .flags = GPIOF_IN, + .flags = GPIOF_OUT_INIT_HIGH, .label = "wifi-bt-lpwkup", }, .capability = CAPA_WIFI, @@ -519,7 +511,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_2[] = { .name = "WIFI_BT_RESET", .pin = { .gpio = AT91_PIN_PD14, - .flags = GPIOF_OUT_INIT_HIGH, + .flags = GPIOF_OUT_INIT_LOW, .label = "wifi-bt-reset", }, .capability = CAPA_WIFI, @@ -533,14 +525,6 @@ static struct gpio_pin gpio_pins_mtcdt_0_2[] = { }, .capability = CAPA_GPS, }, - { - .name = "SECURE_RESET", - .pin = { - .gpio = AT91_PIN_PD16, - .flags = GPIOF_OUT_INIT_HIGH, - .label = "secure-reset", - } - }, { .name = "MTQ_RESET", .pin = { @@ -553,7 +537,7 @@ static struct gpio_pin gpio_pins_mtcdt_0_2[] = { .name = "USBHUB_RESET", .pin = { .gpio = AT91_PIN_PD18, - .flags = GPIOF_OUT_INIT_HIGH, + .flags = GPIOF_OUT_INIT_LOW, .label = "usbhub-reset", } }, diff --git a/io-module/version.h b/io-module/version.h index fff0a7a..ab569e7 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.0" +#define DRIVER_VERSION "v4.8.1" #define DRIVER_AUTHOR "Multitech Systems" #define DRIVER_DESC "MTS-IO Controller" #define DRIVER_NAME "mts-io" -- cgit v1.2.3