Remove mtac cards. mts-io version 3.0.03.0.0

17 files changed, 582 insertions, 2287 deletions

diff --git a/NEWS b/NEWS
index e69de29..149c8a0 100644
--- a/NEWS
+++ b/NEWS
@@ -0,0 +1,10 @@
+Starting with mts-io 3, the following changes were made:
+
+When unloading the module, all gpio pins that were
+acquired are freed.
+
+All MTAC (Multitech Accessory Card) related code
+was removed from the mts-io module.
+
+See the mtac driver and the various accessory card
+drivers which all have their own repositories.
diff --git a/io-module/buttons.c b/io-module/buttons.c
index 045dd22..07ac635 100644
--- a/io-module/buttons.c
+++ b/io-module/buttons.c
@@ -69,7 +69,7 @@ ssize_t mts_attr_show_button_monitor_intervals(struct device *dev, struct device
 	return ret;
 }
 
-ssize_t mts_attr_store_button_monitor_intervals(struct device *dev, struct device_attribute *attr, char *buf, size_t count)
+ssize_t mts_attr_store_button_monitor_intervals(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
 {
 	int short_int;
 	int long_int;
diff --git a/io-module/buttons.h b/io-module/buttons.h
index 9a09fac..8bbe58a 100644
--- a/io-module/buttons.h
+++ b/io-module/buttons.h
@@ -29,6 +29,7 @@
 #include <linux/io.h>
 #include <linux/module.h>
 
+#include "mts_io_module.h"
 #include "mts_io.h"
 
 #define BUTTON_CHECK_PER_SEC        8
@@ -64,7 +65,7 @@ extern void cleanup_buttons(void);
 extern int set_buttons (button_info_pt* platform_buttons);
 
 extern ssize_t mts_attr_show_button_monitor_intervals(struct device *dev, struct device_attribute *attr, char *buf);
-extern ssize_t mts_attr_store_button_monitor_intervals(struct device *dev, struct device_attribute *attr, char *buf, size_t count);
+extern ssize_t mts_attr_store_button_monitor_intervals(struct device *dev, struct device_attribute *attr, const char *buf, size_t count);
 extern ssize_t mts_attr_show_button_monitor(struct device *dev,
         struct device_attribute *attr,
         char *buf);
diff --git a/io-module/gpio.c b/io-module/gpio.c
index a01e979..0b45300 100644
--- a/io-module/gpio.c
+++ b/io-module/gpio.c
@@ -1,3 +1,4 @@
+#include <linux/delay.h>
 
 struct gpio_pin *gpio_pin_by_name(const char *name) {
 	struct gpio_pin *pin;
diff --git a/io-module/mtac.c b/io-module/mtac.c
deleted file mode 100644
index f0f1999..0000000
--- a/io-module/mtac.c
+++ /dev/null
@@ -1,258 +0,0 @@
-static struct kobj_attribute* create_attribute(const char* _name, umode_t _mode) {
-	char* attr_name;
-	struct kobj_attribute* _attr;
-	
-	_attr = kzalloc(sizeof(struct kobj_attribute), GFP_KERNEL);
-	if (! _attr) {
-		log_error("kzalloc of attribute [%s] failed", _name);
-		return NULL;
-	}
-
-	sysfs_attr_init(_attr);
-	attr_name = kstrdup(_name, GFP_KERNEL);
-	if (! attr_name) {
-		log_error("GFP_KERNEL dup failed for attribute [%s]", _name);
-		return NULL;
-	}
-
-	_attr->attr.name = attr_name;
-	_attr->attr.mode = _mode;
-
-	return _attr;
-}
-
-static int port_from_kobject(struct kobject *kobj) {
-	int port;
-	const char *name;
-
-	name = kobj->name;
-	if (! name) {
-		log_error("kobject->name is NULL");
-		return -1;
-	}
-
-	if (sscanf(name, "ap%d", &port) < 1) {
-		log_error("failed to scan port from kobject->name [%s]", name);
-		return -1;
-	}
-
-	if (port < 1 || port > NUM_AP) {
-		log_error("port number %d is invalid", port);
-		return -1;
-	}
-
-	return port;
-}
-
-static ssize_t ap_show_product_info(struct kobject *kobj, struct kobj_attribute *attr, char *buf) {
-	ssize_t value;
-	int port;
-	int port_index;
-
-	port = port_from_kobject(kobj);
-	if (port < 1) {
-		log_error("port_from_kobject returned %d", port);
-		return -1;
-	}
-	port_index = port - 1;
-
-	if (! strcmp(attr->attr.name, "vendor-id")) {
-		value = snprintf(buf, 32, "%s\n", ap_eeprom[port_index].vendor_id);
-	} else if (! strcmp(attr->attr.name, "product-id")) {
-		value = snprintf(buf, 32, "%s\n", ap_eeprom[port_index].product_id);
-	} else if (! strcmp(attr->attr.name, "device-id")) {
-		value = snprintf(buf, 32, "%s\n", ap_eeprom[port_index].device_id);
-	} else if (! strcmp(attr->attr.name, "hw-version")) {
-		value = snprintf(buf, 32, "%s\n", ap_eeprom[port_index].hw_version);
-	} else if (! strcmp(attr->attr.name, "mac-addr")) {
-		value = sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X\n",
-			ap_eeprom[port_index].mac_addr[0],
-			ap_eeprom[port_index].mac_addr[1],
-			ap_eeprom[port_index].mac_addr[2],
-			ap_eeprom[port_index].mac_addr[3],
-			ap_eeprom[port_index].mac_addr[4],
-			ap_eeprom[port_index].mac_addr[5]);
-	} else if (! strcmp(attr->attr.name, "eui")) {
-		value = sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X\n",
-			ap_eeprom[port_index].eui[0],
-			ap_eeprom[port_index].eui[1],
-			ap_eeprom[port_index].eui[2],
-			ap_eeprom[port_index].eui[3],
-			ap_eeprom[port_index].eui[4],
-			ap_eeprom[port_index].eui[5],
-			ap_eeprom[port_index].eui[6],
-			ap_eeprom[port_index].eui[7]);
-	} else {
-		log_error("attribute [%s] not found", attr->attr.name);
-		value = -1;
-	}
-
-	return value;
-}
-
-static bool ap_add_product_info_attributes(int port, int type, struct attribute** attrs, int* index) {
-	char buf[32];
-	struct kobj_attribute* kobj_attr;
-
-	switch (type) {
-		case MTAC_ETH_0_0:
-			sprintf(buf, "mac-addr");
-			kobj_attr = create_attribute(buf, MTS_ATTR_MODE_RO);
-			if (! kobj_attr) {
-				log_error("failed to create attribute [%s] in port %d", buf, port);
-				return false;
-			}
-			kobj_attr->show = ap_show_product_info;
-			attrs[(*index)++] = &kobj_attr->attr;
-			break;
-
-		case MTAC_GPIOB_0_0:
-		case MTAC_MFSER_0_0:
-		case MTAC_PULSE_1_0:
-			break;
-
-		case MTAC_LORA_0_0:
-		case MTAC_LORA_1_0:
-		case MTAC_LORA_1_1:
-		case MTAC_LORA_1_5:
-			sprintf(buf, "eui");
-			kobj_attr = create_attribute(buf, MTS_ATTR_MODE_RO);
-			if (! kobj_attr) {
-				log_error("failed to create attribute [%s] in port %d", buf, port);
-				return false;
-			}
-			kobj_attr->show = ap_show_product_info;
-			attrs[(*index)++] = &kobj_attr->attr;
-			break;
-
-		default:
-			log_error("invalid accessory card type");
-			return false;
-	}
-
-	sprintf(buf, "vendor-id");
-	kobj_attr = create_attribute(buf, MTS_ATTR_MODE_RO);
-	if (! kobj_attr) {
-		log_error("failed to create attribute [%s] in port %d", buf, port);
-		return false;
-	}
-	kobj_attr->show = ap_show_product_info;
-	attrs[(*index)++] = &kobj_attr->attr;
-
-	sprintf(buf, "product-id");
-	kobj_attr = create_attribute(buf, MTS_ATTR_MODE_RO);
-	if (! kobj_attr) {
-		log_error("failed to create attribute [%s] in port %d", buf, port);
-		return false;
-	}
-	kobj_attr->show = ap_show_product_info;
-	attrs[(*index)++] = &kobj_attr->attr;
-
-	sprintf(buf, "device-id");
-	kobj_attr = create_attribute(buf, MTS_ATTR_MODE_RO);
-	if (! kobj_attr) {
-		log_error("failed to create attribute [%s] in port %d", buf, port);
-		return false;
-	}
-	kobj_attr->show = ap_show_product_info;
-	attrs[(*index)++] = &kobj_attr->attr;
-
-	sprintf(buf, "hw-version");
-	kobj_attr = create_attribute(buf, MTS_ATTR_MODE_RO);
-	if (! kobj_attr) {
-		log_error("failed to create attribute [%s] in port %d", buf, port);
-		return false;
-	}
-	kobj_attr->show = ap_show_product_info;
-	attrs[(*index)++] = &kobj_attr->attr;
-
-	return true;
-}
-
-struct gpio_pin *ap_gpio_pin_by_attr_name(const char *name, int port) {
-	struct gpio_pin *pin;
-	char *pin_attr_name;
-	int port_index = port - 1;
-
-	pin_attr_name = port_info[port_index]->gpio_pin_name_by_attr_name(name, port);
-
-	for (pin = gpio_pins; *pin->name; pin++) {
-		if (!strcmp(pin->pin.label, pin_attr_name)) {
-			return pin;
-		}
-	}
-
-	log_error("pin with attr name [%s] not found", name);
-	return NULL;
-}
-
-static ssize_t mts_attr_show_ap_gpio_pin(struct kobject *kobj,
-			struct kobj_attribute *attr,
-			char *buf)
-{
-	int value;
-	int port;
-	struct gpio_pin *pin;
-	   
-	port = port_from_kobject(kobj);
-	if (port < 1) {
-		log_error("port_from_kobject returned %d", port);
-		return -EINVAL;
-	}
-
-	pin	= ap_gpio_pin_by_attr_name(attr->attr.name, port);
-	if (!pin) {
-		return -ENODEV;
-	}
-
-	mutex_lock(&mts_io_mutex);
-
-	value = gpio_get_value(pin->pin.gpio);
-
-	mutex_unlock(&mts_io_mutex);
-
-	if (value < 0) {
-		return value;
-	}
-
-	if (pin->active_low) {
-		value = !value;
-	}
-
-	return sprintf(buf, "%d\n", value);
-}
-
-static ssize_t mts_attr_store_ap_gpio_pin(struct kobject *kobj,
-		struct kobj_attribute *attr, const char *buf, size_t count)
-{
-	int value;
-	int port;
-	struct gpio_pin *pin;
-
-	port = port_from_kobject(kobj);
-	if (port < 1) {
-		log_error("port_from_kobject returned %d", port);
-		return -EINVAL;
-	}
-	   
-	pin	= ap_gpio_pin_by_attr_name(attr->attr.name, port);
-	if (!pin) {
-		return -ENODEV;
-	}
-
-	if (sscanf(buf, "%i", &value) != 1) {
-		return -EINVAL;
-	}
-
-	if (pin->active_low) {
-		value = !value;
-	}
-
-	mutex_lock(&mts_io_mutex);
-
-	gpio_set_value(pin->pin.gpio, value);
-
-	mutex_unlock(&mts_io_mutex);
-
-	return count;
-}
diff --git a/io-module/mtac_eth.c b/io-module/mtac_eth.c
deleted file mode 100644
index 99e8c1d..0000000
--- a/io-module/mtac_eth.c
+++ /dev/null
@@ -1,139 +0,0 @@
-static char* eth_gpio_pin_name_by_attr_name(const char* name, int port) {
-	switch (port) {
-		case port_1:
-			if (! strcmp(name, "reset")) {
-				return "ap1-reset";
-			} else {
-				log_error("attribute name [%s] is invalid for ETH in port %d", name, port);
-				return "";
-			}
-
-		case port_2:
-			if (! strcmp(name, "reset")) {
-				return "ap2-reset";
-			} else {
-				log_error("attribute name [%s] is invalid for ETH in port %d", name, port);
-				return "";
-			}
-	}
-}
-
-// 1 vendor-id
-// 1 product-id
-// 1 device-id
-// 1 hw-version
-// 1 mac-addr or eui
-// 1 reset
-// NULL
-static size_t ap_eth_attrs_size = 7;
-
-static bool eth_setup(enum ap port) {
-	int i;
-	int port_index = port - 1;
-	int index = 0;
-	int count = 0;
-	int ret;
-	char buf[32];
-	struct attribute **attrs;
-	struct kobj_attribute* attr;
-
-	log_info("loading ETH accessory card in port %d", port);
-
-	sprintf(buf, "ap%d", port);
-	ap_subdirs[port_index] = kobject_create_and_add(buf, &mts_io_platform_device->dev.kobj);
-	if (! ap_subdirs[port_index]) {
-		log_error("kobject_create_and_add for ETH in port %d failed", port);
-		return false;
-	}
-
-	// create the link to the apX directory this card is in
-	// if we're in the first slot, we get plain "eth"
-	// if we're in a different slot, we might need to use "eth-2" to differentiate
-	if (port > 1) {
-		for (i = 1; i < port; i++) {
-			if (port_info[i - 1]) {
-				if (strstr(port_info[i - 1]->product_id, PRODUCT_ID_MTAC_ETH)) {
-					count++;
-				}
-			}
-		}
-	}
-	if (count > 0) {
-		sprintf(buf, "eth-%d", count + 1);
-	} else {
-		sprintf(buf, "eth");
-	}
-	ret = sysfs_create_link(ap_subdirs[port_index]->parent, ap_subdirs[port_index], buf);
-	if (ret) {
-		log_error("failed to link [%s] to [%s], %d", buf, ap_subdirs[port_index]->name, ret);
-	}
-
-	attrs = kzalloc(sizeof(struct attribute*) * ap_eth_attrs_size, GFP_KERNEL);
-	if (! attrs) {
-		log_error("failed to allocate attribute space for port %d", port);
-		return false;
-	}
-
-	sprintf(buf, "reset");
-	attr = create_attribute(buf, MTS_ATTR_MODE_RW);
-	if (! attr) {
-		log_error("failed to create attribute [%s] for ETH in port %d", buf, port);
-		kfree(attrs);
-		return false;
-	}
-	ap_attr_groups[port_index].attrs = attrs;
-
-	attr->show = mts_attr_show_ap_gpio_pin;
-	attr->store = mts_attr_store_ap_gpio_pin;
-	attrs[index++] = &attr->attr;
-
-	// add attributes for eeprom contents
-	if (! ap_add_product_info_attributes(port, MTAC_ETH_0_0, attrs, &index)) {
-		log_error("failed to add product info attributes for ETH in port %d", port);
-		return false;
-	}
-	attrs[index] = NULL;
-
-	if (sysfs_create_group(ap_subdirs[port_index], &ap_attr_groups[port_index])) {
-		log_error("sysfs_create_group failed for ETH in port %d", port);
-		return false;
-	}
-
-	return true;
-}
-
-static bool eth_teardown(enum ap port) {
-	int i;
-	int port_index = port - 1;
-	struct attribute **attrs = ap_attr_groups[port_index].attrs;
-
-	log_info("unloading ETH accessory card in port %d", port);
-
-	// clean up allocated memory for attributes
-	for (i = 0; i < ap_eth_attrs_size; i++) {
-		if (attrs[i]) {
-			if (attrs[i]->name)
-				kfree(attrs[i]->name);
-
-			kfree(attrs[i]);
-		}
-	}
-
-	kfree(attrs);
-
-	// clean up our "apX/" kobject if it exists
-	if (ap_subdirs[port_index]) {
-		kobject_put(ap_subdirs[port_index]);
-	}
-
-	return true;
-}
-
-bool set_eth_info(struct ap_info* info) {
-	snprintf(info->product_id, 32, "%s", PRODUCT_ID_MTAC_ETH);
-	info->setup = &eth_setup;
-	info->teardown = &eth_teardown;
-	info->gpio_pin_name_by_attr_name = &eth_gpio_pin_name_by_attr_name;
-
-	return true;
-}
diff --git a/io-module/mtac_gpiob.c b/io-module/mtac_gpiob.c
deleted file mode 100644
index 3dbd828..0000000
--- a/io-module/mtac_gpiob.c
+++ /dev/null
@@ -1,598 +0,0 @@
-struct spi_device *gpiob_spi[NUM_AP][3];
-struct spi_driver gpiob_spi_drivers[NUM_AP][3];
-
-static u8 spi_ap_dout_value[NUM_AP];
-static DEFINE_MUTEX(spi_ap_dout_mutex);
-static unsigned int ap_dout_max_speed_hz = 1 * 1000 * 1000;
-module_param(ap_dout_max_speed_hz, uint, S_IRUGO);
-MODULE_PARM_DESC(
-	ap_dout_max_speed_hz,
-	"Maximum clock rate to be used with this device (default: 1 MHz)"
-);
-
-static unsigned int ap_din_max_speed_hz = 1 * 1000 * 1000;
-module_param(ap_din_max_speed_hz, uint, S_IRUGO);
-MODULE_PARM_DESC(
-	ap_din_max_speed_hz,
-	"Maximum clock rate to be used with this device (default: 1 MHz)"
-);
-
-static unsigned int ap_adc_max_speed_hz = 20 * 1000 * 1000;
-module_param(ap_adc_max_speed_hz, uint, S_IRUGO);
-MODULE_PARM_DESC(
-	ap_adc_max_speed_hz,
-	"Maximum clock rate to be used with this device (default: 20 MHz)"
-);
-
-static bool gpiob_get_dev_info_from_modalias(const char* modalias, int* port, char* buf) {
-	sscanf(modalias, "mts-io-ap%d-%s", port, buf);
-
-	return true;
-}
-
-/* Generic SPI functions */
-static inline int spi_writen(struct spi_device *spi, const u8 *buf, size_t len)
-{
-	int tmp;
-	u8 *tx;
-
-	tx = kmalloc(len, GFP_KERNEL);
-	if (!tx) {
-		return -ENOMEM;
-	}
-
-	memcpy(tx, buf, len);
-	tmp = spi_write(spi, tx, len);
-
-	kfree(tx);
-
-	return tmp;
-}
-
-static inline int spi_readn(struct spi_device *spi, u8 *buf, size_t len)
-{
-	int tmp;
-	u8 *rx;
-
-	rx = kmalloc(len, GFP_KERNEL);
-	if (!rx) {
-		return -ENOMEM;
-	}
-
-	tmp = spi_read(spi, rx, len);
-	memcpy(buf, rx, len);
-
-	kfree(rx);
-
-	return tmp;
-}
-
-static int mts_spi_ap_probe(struct spi_device *spi)
-{
-	int tmp;
-	int port;
-	int port_index;
-	char buf[16];
-	enum spi_devices dev;
-
-	gpiob_get_dev_info_from_modalias(spi->modalias, &port, buf);
-	port_index = port - 1;
-	if (port < 1 || port > NUM_AP) {
-		log_error("port %d is invalid", port);
-		return -ENODEV;
-	}
-
-	if (strstr(buf, "dout")) {
-		dev = dout;
-		spi->max_speed_hz = ap_dout_max_speed_hz;
-		spi->mode = 0;
-	} else if (strstr(buf, "din")) {
-		dev = din;
-		spi->max_speed_hz = ap_din_max_speed_hz;
-		spi->mode = SPI_CPOL;
-	} else if (strstr(buf, "adc")) {
-		dev = adc;
-		spi->max_speed_hz = ap_adc_max_speed_hz;
-		spi->mode = 0;
-	} else {
-		log_error("unknown gpiob spi device type [%s]", buf);
-		return -ENODEV;
-	}
-
-	gpiob_spi[port_index][dev] = spi;
-
-	tmp = spi_setup(gpiob_spi[port_index][dev]);
-	if (tmp < 0) {
-		log_error("spi_setup ap %d [%s] failed", port, buf);
-		return tmp;
-	}
-
-	if (dev == dout) {
-		spi_ap_dout_value[port_index] = 0x00;
-		spi_writen(gpiob_spi[port_index][dev], &spi_ap_dout_value[port_index], 1);
-	}
-
-	return 0;
-}
-
-static int mts_spi_ap_remove(struct spi_device *spi)
-{
-	int port;
-	int port_index;
-	char buf[16];
-
-	gpiob_get_dev_info_from_modalias(spi->modalias, &port, buf);
-	port_index = port - 1;
-	if (port < 1 || port > NUM_AP) {
-		log_error("port %d is invalid", port);
-		return -ENODEV;
-	}
-
-	if (strstr(buf, "dout")) {
-		gpiob_spi[port_index][dout] = NULL;
-	} else if (strstr(buf, "din")) {
-		gpiob_spi[port_index][din] = NULL;
-	} else if (strstr(buf, "adc")) {
-		gpiob_spi[port_index][adc] = NULL;
-	} else {
-		log_error("unknown gpiob spi device type [%s]", buf);
-		return -ENODEV;
-	}
-
-	return 0;
-}
-
-static char* gpiob_gpio_pin_name_by_attr_name(const char* name, int port) {
-	switch (port) {
-		case port_1:
-			if (! strcmp(name, "led1")) {
-				return "ap1-gpio3";
-			} else if (! strcmp(name, "led2")) {
-				return "ap1-gpio4";
-			} else if (! strcmp(name, "dout-enable")) {
-				return "ap1-gpio1";
-			} else if (! strcmp(name, "reset")) {
-				return "ap1-reset";
-			} else {
-				log_error("attribute name [%s] is invalid for GPIOB in port %d", name, port);
-				return "";
-			}
-
-		case port_2:
-			if (! strcmp(name, "led1")) {
-				return "ap2-gpio3";
-			} else if (! strcmp(name, "led2")) {
-				return "ap2-gpio4";
-			} else if (! strcmp(name, "dout-enable")) {
-				return "ap2-gpio1";
-			} else if (! strcmp(name, "reset")) {
-				return "ap2-reset";
-			} else {
-				log_error("attribute name [%s] is invalid for GPIOB in port %d", name, port);
-				return "";
-			}
-	}
-	log_error("gpiob: Invalid port number");
-	return "";
-}
-
-static ssize_t mts_attr_show_ap_din(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
-{
-	int tmp;
-	int channel;
-	int port;
-	int port_index;
-	u8 bit;
-	u8 byte;
-
-	sscanf(attr->attr.name, "din%d", &channel);
-	if (channel < 0 || channel > 3) {
-		log_error("channel %d is invalid", channel);
-		return -ENOENT;
-	}
-
-	port = port_from_kobject(kobj);
-	if (port < 0) {
-		log_error("port_from_kobject returned %d", port);
-		return -EINVAL;
-	}
-	port_index = port - 1;
-
-	bit = BIT(channel);
-
-	tmp = spi_readn(gpiob_spi[port_index][din], &byte, 1);
-	if (tmp) {
-		log_error("spi_read failed %d", tmp);
-		return tmp;
-	}
-
-	tmp = byte & bit ? 1 : 0;
-
-	return sprintf(buf, "%d\n", tmp);
-}
-
-static ssize_t mts_attr_store_ap_dout(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t count)
-{
-	int value;
-	int channel;
-	int port;
-	int port_index;
-	u8 bit;
-
-	sscanf(attr->attr.name, "dout%d", &channel);
-	if (channel < 0 || channel > 3) {
-		log_error("channel %d is invalid", channel);
-		return -ENOENT;
-	}
-
-	port = port_from_kobject(kobj);
-	if (port < 0) {
-		log_error("port_from_kobject returned %d", port);
-		return -EINVAL;
-	}
-	port_index = port - 1;
-
-	bit = BIT(channel);
-
-	if (sscanf(buf, "%i", &value) != 1) {
-		log_error("accessory card dout attr invalid argument %d", value);
-		return -EINVAL;
-	}
-
-	mutex_lock(&spi_ap_dout_mutex);
-
-	if (value) {
-		spi_ap_dout_value[port_index] &= ~bit;
-	} else {
-		spi_ap_dout_value[port_index] |= bit;
-	}
-
-	spi_writen(gpiob_spi[port_index][dout], &spi_ap_dout_value[port_index], 1);
-
-	mutex_unlock(&spi_ap_dout_mutex);
-
-	return count;
-}
-
-static ssize_t mts_attr_show_ap_dout(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
-{
-	int value;
-	int channel;
-	int port;
-	int port_index;
-	u8 bit;
-
-	sscanf(attr->attr.name, "dout%d", &channel);
-	if (channel < 0 || channel > 3) {
-		log_error("channel %d is invalid", channel);
-		return -ENOENT;
-	}
-
-	port = port_from_kobject(kobj);
-	if (port < 0) {
-		log_error("port_from_kobject returned %d", port);
-		return -EINVAL;
-	}
-	port_index = port - 1;
-
-	bit = BIT(channel);
-
-	mutex_lock(&spi_ap_dout_mutex);
-
-	value = spi_ap_dout_value[port_index] & bit ? 0 : 1;
-
-	mutex_unlock(&spi_ap_dout_mutex);
-
-	return sprintf(buf, "%d\n", value);
-}
-
-static ssize_t mts_attr_show_ap_adc(struct kobject *kobj, struct kobj_attribute *attr, char *buf)
-{
-	int tmp;
-	int tx_data;
-	int rx_data;
-	int channel;
-	int port;
-	int port_index;
-	int channel_mask = 0x0180;  /* 0b 0000 0001 1000 0000 */
-	int manual_mode = 0x1840;   /* 0b 0001 1000 0100 0000 */
-	uint8_t tx[2];
-	uint8_t rx[2];
-
-	memset(tx, 0, sizeof(tx));
-	memset(rx, 0, sizeof(rx));
-
-	sscanf(attr->attr.name, "adc%d", &channel);
-	if (channel < 0 || channel > 2) {
-		log_error("channel %d is invalid", channel);
-		return -ENOENT;
-	}
-
-	port = port_from_kobject(kobj);
-	if (port < 0) {
-		log_error("port_from_kobject returned %d", port);
-		return -EINVAL;
-	}
-	port_index = port - 1;
-
-	/* 1st transfer to set up (5V reference, channel to read from) */
-	tx_data = manual_mode | ((channel << 7) & channel_mask);
-	tx[0] = tx_data >> 8;
-	tx[1] = tx_data & 0xFF;
-	tmp = spi_writen(gpiob_spi[port_index][adc], tx, 2);
-	if (tmp) {
-		log_error("spi_write failed %d", tmp);
-		return tmp;
-	}
-
-	/* 2nd transfer to clock chip for ADC conversion
-	 * this can be a throw-away read or an empty write,
-	 * the ADC just needs the clock running so it can convert */
-	tx[0] = 0;
-	tx[1] = 0;
-	tmp = spi_writen(gpiob_spi[port_index][adc], tx, 2);
-	if (tmp) {
-		log_error("2nd spi_write failed %d", tmp);
-		return tmp;
-	}
-
-	/* 3rd transfer to read data */
-	tmp = spi_readn(gpiob_spi[port_index][adc], rx, 2);
-	if (tmp) {
-		log_error("spi_read failed %d", tmp);
-		return tmp;
-	}
-	rx_data = ((rx[0] & 0x0F) << 8) | (rx[1] & 0xFF);
-
-	return sprintf(buf, "%lu\n", (unsigned long) rx_data);
-}
-
-static bool gpiob_spi_driver_setup(struct spi_driver *driver, const char *driver_name) {
-	char* name = kstrdup(driver_name, GFP_KERNEL);
-	if (! name) {
-		log_error("GFP_KERNEL dup failed for driver [%s]", driver_name);
-		return false;
-	}
-	driver->driver.name = name;
-	driver->driver.bus = &spi_bus_type;
-	driver->driver.owner = THIS_MODULE;
-	driver->probe = mts_spi_ap_probe;
-	driver->remove = mts_spi_ap_remove;
-
-	return true;
-}
-
-// 4 digital inputs
-// 4 digital outputs
-// 3 analog to digital
-// 2 LEDs
-// 1 digital out enable
-// 1 reset
-// 1 vendor-id
-// 1 product-id
-// 1 device-id
-// 1 hw-version
-// NULL
-static int ap_gpiob_attrs_size = 20;
-
-static bool gpiob_setup(enum ap port) {
-	int i;
-	int port_index = port - 1;
-	int index = 0;
-	int count = 0;
-	int ret;
-	char buf[32];
-	struct kobj_attribute* attr;
-	struct attribute **attrs;
-
-	log_info("loading GPIOB accessory card in port %d", port);
-
-	sprintf(buf, "ap%d", port);
-	ap_subdirs[port_index] = kobject_create_and_add(buf, &mts_io_platform_device->dev.kobj);
-	if (! ap_subdirs[port_index]) {
-		log_error("kobject_create_and_add for port %d failed", port);
-		return false;
-	}
-
-	// create the link to the apX directory this card is in
-	// if we're in the first slot, we get plain "gpiob"
-	// if we're in a different slot, we might need to use "gpiob-2" to differentiate
-	if (port > 1) {
-		for (i = 1; i < port; i++) {
-			if (port_info[i - 1]) {
-				if (strstr(port_info[i - 1]->product_id, PRODUCT_ID_MTAC_GPIOB)) {
-					count++;
-				}
-			}
-		}
-	}
-	if (count > 0) {
-		sprintf(buf, "gpiob-%d", count + 1);
-	} else {
-		sprintf(buf, "gpiob");
-	}
-	ret = sysfs_create_link(ap_subdirs[port_index]->parent, ap_subdirs[port_index], buf);
-	if (ret) {
-		log_error("failed to link [%s] to [%s], %d", buf, ap_subdirs[port_index]->name, ret);
-	}
-
-	attrs = kzalloc(sizeof(struct attribute*) * ap_gpiob_attrs_size, GFP_KERNEL);
-	if (! attrs) {
-		log_error("failed to allocate attribute space for port %d", port);
-		return false;
-	}
-
-	// add digital inputs
-	for (i = 0; i < 4; i++) {
-		sprintf(buf, "din%d", i);
-		attr = create_attribute(buf, MTS_ATTR_MODE_RO);
-		if (! attr) {
-			log_error("failed to create attribute [%s]", buf);
-			return false;
-		}
-		attr->show = mts_attr_show_ap_din;
-		attrs[index++] = &attr->attr;
-	}
-
-	// add digital outputs
-	for (i = 0; i < 4; i++) {
-		sprintf(buf, "dout%d", i);
-		attr = create_attribute(buf, MTS_ATTR_MODE_RW);
-		if (! attr) {
-			log_error("failed to create attribute [%s] for GPIOB in port %d", buf, port);
-			return false;
-		}
-		attr->show = mts_attr_show_ap_dout;
-		attr->store = mts_attr_store_ap_dout;
-		attrs[index++] = &attr->attr;
-	}
-
-	// add analog to digital
-	for (i = 0; i < 3; i++) {
-		sprintf(buf, "adc%d", i);
-		attr = create_attribute(buf, MTS_ATTR_MODE_RO);
-		if (! attr) {
-			log_error("failed to create attribute [%s] for GPIOB in port %d", buf, port);
-			return false;
-		}
-		attr->show = mts_attr_show_ap_adc;
-		attrs[index++] = &attr->attr;
-	}
-
-	// add LEDs
-	for (i = 1; i <= 2; i++) {
-		sprintf(buf, "led%d", i);
-		attr = create_attribute(buf, MTS_ATTR_MODE_RW);
-		if (! attr) {
-			log_error("failed to create attribute [%s] for GPIOB in port %d", buf, port);
-			return false;
-		}
-		attr->show = mts_attr_show_ap_gpio_pin;
-		attr->store = mts_attr_store_ap_gpio_pin;
-		attrs[index++] = &attr->attr;
-	}
-
-	// add misc attributes
-	sprintf(buf, "dout-enable");
-	attr = create_attribute(buf, MTS_ATTR_MODE_RW);
-	if (! attr) {
-		log_error("failed to create attribute [%s] for GPIOB in port %d", buf, port);
-		return false;
-	}
-	attr->show = mts_attr_show_ap_gpio_pin;
-	attr->store = mts_attr_store_ap_gpio_pin;
-	attrs[index++] = &attr->attr;
-
-	sprintf(buf, "reset");
-	attr = create_attribute(buf, MTS_ATTR_MODE_RW);
-	if (! attr) {
-		log_error("failed to create attribute [%s] for GPIOB in port %d", buf, port);
-		return false;
-	}
-	attr->show = mts_attr_show_ap_gpio_pin;
-	attr->store = mts_attr_store_ap_gpio_pin;
-	attrs[index++] = &attr->attr;
-
-	// add attributes for eeprom contents
-	if (! ap_add_product_info_attributes(port, MTAC_GPIOB_0_0, attrs, &index)) {
-		log_error("failed to add product info attributes for GPIOB in port %d", port);
-		return false;
-	}
-
-	attrs[index] = NULL;
-
-	ap_attr_groups[port_index].attrs = attrs;
-
-	// setup and register drivers
-	log_debug("registering accessory card %d dout driver", port);
-	sprintf(buf, "mts-io-ap%d-dout", port);
-	if (! gpiob_spi_driver_setup(&gpiob_spi_drivers[port_index][dout], buf)) {
-		log_error("failed to set up spi driver [%s] for GPIOB in port %d", buf, port);
-		return false;
-	}
-	if (spi_register_driver(&gpiob_spi_drivers[port_index][dout])) {
-		log_error("failed to register accessory card %d dout driver", port);
-		spi_unregister_driver(&gpiob_spi_drivers[port_index][dout]);
-		return false;
-	}
-
-	log_debug("registering accessory card %d din driver", port);
-	sprintf(buf, "mts-io-ap%d-din", port);
-	if (! gpiob_spi_driver_setup(&gpiob_spi_drivers[port_index][din], buf)) {
-		log_error("failed to set up spi driver [%s] for GPIOB in port %d", buf, port);
-		return false;
-	}
-	if (spi_register_driver(&gpiob_spi_drivers[port_index][din])) {
-		log_error("failed to register accessory card %d din driver", port);
-		spi_unregister_driver(&gpiob_spi_drivers[port_index][din]);
-		return false;
-	}
-
-	log_debug("registering accessory card %d adc driver", port);
-	sprintf(buf, "mts-io-ap%d-adc", port);
-	if (! gpiob_spi_driver_setup(&gpiob_spi_drivers[port_index][adc], buf)) {
-		log_error("failed to set up spi driver [%s] for GPIOB in port %d", buf, port);
-		return false;
-	}
-	if (spi_register_driver(&gpiob_spi_drivers[port_index][adc])) {
-		log_error("failed to register accessory card %d adc driver", port);
-		spi_unregister_driver(&gpiob_spi_drivers[port_index][adc]);
-		return false;
-	}
-
-	if (sysfs_create_group(ap_subdirs[port_index], &ap_attr_groups[port_index])) {
-		log_error("sysfs_create_group failed for GPIOB in port %d", port);
-		return false;
-	}
-
-	return true;
-}
-
-static bool gpiob_teardown(enum ap port) {
-	int i;
-	int port_index = port - 1;
-	struct attribute **attrs = ap_attr_groups[port_index].attrs;
-
-	log_info("unloading GPIOB accessory card in port %d", port);
-
-	// clean up allocated memory for attributes
-	for (i = 0; i < ap_gpiob_attrs_size; i++) {
-		if (attrs[i]) {
-			if (attrs[i]->name)
-				kfree(attrs[i]->name);
-
-			kfree(attrs[i]);
-		}
-	}
-
-	kfree(attrs);
-
-	// clean up our "apX/" kobject if it exists
-	if (ap_subdirs[port_index]) {
-		kobject_put(ap_subdirs[port_index]);
-	}
-
-	// clean up allocated memory for SPI drivers
-	if (gpiob_spi_drivers[port_index][dout].driver.name)
-		kfree(gpiob_spi_drivers[port_index][dout].driver.name);
-	if (gpiob_spi_drivers[port_index][din].driver.name)
-		kfree(gpiob_spi_drivers[port_index][din].driver.name);
-	if (gpiob_spi_drivers[port_index][adc].driver.name)
-		kfree(gpiob_spi_drivers[port_index][adc].driver.name);
-
-	// unregister SPI drivers
-	spi_unregister_driver(