Fix LED's and button names2.0.7

2 files changed, 9 insertions, 55 deletions

diff --git a/io-module/mths.c b/io-module/mths.c
index c50951e..df7fa27 100644
--- a/io-module/mths.c
+++ b/io-module/mths.c
@@ -117,7 +117,7 @@ static struct gpio_pin gpio_pins_mths_0_0[] = {
 	.pin = {
 	    .gpio = AT91_PIN_PC16,
 	    .flags = GPIOF_OUT_INIT_HIGH,
-	    .label = "led-link-status",
+	    .label = "led-status",
 	},
 	.active_low = 1,
     },
@@ -126,7 +126,7 @@ static struct gpio_pin gpio_pins_mths_0_0[] = {
 	.pin = {
 	    .gpio = AT91_PIN_PC16,
 	    .flags = GPIOF_OUT_INIT_HIGH,
-	    .label = "led-d",
+	    .label = "led-c",
 	},
 	.active_low = 1,
     },
@@ -184,42 +184,6 @@ static struct gpio_pin gpio_pins_mths_0_0[] = {
         },
         .active_low = 1,
     },
-    {
-        .name = "RI_B",
-        .pin = {
-            .gpio = AT91_PIN_PC25,
-            .flags = GPIOF_OUT_INIT_HIGH,
-            .label = "extserial-ri",
-        },
-        .active_low = 1,
-    },
-    {
-        .name = "DTR_B",
-        .pin = {
-            .gpio = AT91_PIN_PC26,
-            .flags = GPIOF_IN,
-            .label = "extserial-dtr",
-        },
-        .active_low = 1,
-    },
-    {
-        .name = "DSR_B",
-        .pin = {
-            .gpio = AT91_PIN_PC27,
-            .flags = GPIOF_OUT_INIT_HIGH,
-            .label = "extserial-dsr",
-        },
-        .active_low = 1,
-    },
-    {
-        .name = "DCD_B",
-        .pin = {
-            .gpio = AT91_PIN_PC28,
-            .flags = GPIOF_OUT_INIT_HIGH,
-            .label = "extserial-dcd",
-        },
-        .active_low = 1,
-    },
 
     // The difference between MTRv1_0_0 and MTRv1_0_1 starts here
     {
@@ -292,7 +256,7 @@ static struct gpio_pin gpio_pins_mths_0_0[] = {
 };
 
 button_info_t mths_wps_button = {
-        .name = "User Push Button",
+        .name = "User Push Button WPS",
         .label_pin = "wps_button",
         .label_monitor = "wps_button-monitor",
         .label_monitor_intervals = "wps_button-monitor-intervals",
@@ -308,7 +272,7 @@ button_info_t mths_wps_button = {
 };
 
 button_info_t mths_bt_button = {
-        .name = "User Push Button",
+        .name = "User Push Button BT",
         .label_pin = "bt_button",
         .label_monitor = "bt_button-monitor",
         .label_monitor_intervals = "bt_button-monitor-intervals",
@@ -583,19 +547,13 @@ static DEVICE_ATTR_MTS(dev_attr_radio_reset_mths, "radio-reset",
 static DEVICE_ATTR_MTS(dev_attr_led_wifi_gpio_mths, "led-wifi",
     mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
 
-static DEVICE_ATTR_MTS(dev_attr_led_f_gpio_mths, "led-f",
-    mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-
-static DEVICE_ATTR_MTS(dev_attr_extserial_ri_gpio_mths, "extserial-ri",
+static DEVICE_ATTR_MTS(dev_attr_led_bt_gpio_mths, "led-bt",
     mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
 
-static DEVICE_ATTR_RO_MTS(dev_attr_extserial_dtr_mths, "extserial-dtr",
-    mts_attr_show_gpio_pin);
-
-static DEVICE_ATTR_MTS(dev_attr_extserial_dsr_gpio_mths, "extserial-dsr",
+static DEVICE_ATTR_MTS(dev_attr_led_f_gpio_mths, "led-f",
     mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
 
-static DEVICE_ATTR_MTS(dev_attr_extserial_dcd_gpio_mths, "extserial-dcd",
+static DEVICE_ATTR_MTS(dev_attr_led_e_gpio_mths, "led-e",
     mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
 
 static DEVICE_ATTR_RO_MTS(dev_attr_wifi_mac_mths, "mac-wifi",
@@ -654,11 +612,6 @@ static struct attribute *mths_0_0_platform_attributes[] = {
     &dev_attr_radio_reset_backoff_index.attr,
     &dev_attr_radio_reset_backoff_seconds.attr,
 
-    &dev_attr_extserial_ri_gpio_mths.attr,
-    &dev_attr_extserial_dtr_mths.attr,
-    &dev_attr_extserial_dsr_gpio_mths.attr,
-    &dev_attr_extserial_dcd_gpio_mths.attr,
-
     &dev_attr_wifi_bt_lpwkup_mths.attr,
     &dev_attr_wifi_bt_ulpwkup_mths.attr,
     &dev_attr_wifi_bt_reset_mths.attr,
@@ -674,6 +627,7 @@ static struct attribute *mths_0_0_platform_attributes[] = {
     &dev_attr_led_sig2_gpio.attr,
     &dev_attr_led_sig3_gpio.attr,
     &dev_attr_led_wifi_gpio_mths.attr,
+    &dev_attr_led_bt_gpio_mths.attr,
 
     &dev_attr_led_b_gpio.attr,
     &dev_attr_led_c_gpio.attr,
diff --git a/io-module/mts_io.h b/io-module/mts_io.h
index d17c6de..7c2f45b 100644
--- a/io-module/mts_io.h
+++ b/io-module/mts_io.h
@@ -5,7 +5,7 @@
 #include <linux/gpio.h>
 
 
-#define DRIVER_VERSION  "v2.0.6"
+#define DRIVER_VERSION  "v2.0.7"
 #define DRIVER_AUTHOR   "James Maki <jmaki@multitech.com>"
 #define DRIVER_DESC "MTS-IO Controller"
 #define DRIVER_NAME "mts-io"