Merge branch 'mtr2d2' into 'master'

Conflicts:
	io-module/mtdc_gpiob.c - remove, replaced by mtac_gpiob.c
	io-module/mtr2.c - remove, dropping support for this HW
	io-module/mts_io.c - keep changes from mtr2d2 branch
	io-module/spi.c - remove, no longer needed

16 files changed, 1438 insertions, 3381 deletions

diff --git a/io-module/Makefile b/io-module/Makefile
index f95a55e..5d036f4 100644
--- a/io-module/Makefile
+++ b/io-module/Makefile
@@ -1,5 +1,4 @@
 obj-m := mts_io.o
-CFLAGS_mts_io.o := ${DAUGHTER_CARD}
 
 clean:
 	rm -f *.ko *.o
diff --git a/io-module/adc.c b/io-module/adc.c
deleted file mode 100644
index bcb3598..0000000
--- a/io-module/adc.c
+++ /dev/null
@@ -1,87 +0,0 @@
-
-#define ADC_SHTIME_DEFAULT			0x05
-#define ADC_STARTUP_DEFAULT			0x04
-#define ADC_PRESCALE_DEFAULT			0x3F
-#define ADC_MODE_DEFAULT \
-	((ADC_SHTIME_DEFAULT & 0x0F) << 24) | \
-	((ADC_STARTUP_DEFAULT & 0x1F) << 16) | \
-	((ADC_PRESCALE_DEFAULT & 0x3F) << 8)
-
-#define ADC_CR_OFFSET			0x00
-#define ADC_MR_OFFSET			0x04
-#define ADC_CHER_OFFSET			0x10
-#define ADC_CHDR_OFFSET			0x14
-#define ADC_CHSR_OFFSET			0x18
-#define ADC_SR_OFFSET			0x1C
-#define ADC_LDCR_OFFSET			0x20
-#define ADC_IER_OFFSET			0x14
-#define ADC_IDR_OFFSET			0x28
-#define ADC_IMR_OFFSET			0x2C
-#define ADC_CDR0_OFFSET			0x30
-#define ADC_CDR1_OFFSET			0x34
-#define ADC_CDR2_OFFSET			0x38
-#define ADC_CDR3_OFFSET			0x3C
-
-void __iomem *adc_base;
-struct clk *adc_clk;
-
-#define ADC_CONVERT_RESET(base)			writel(0x01, (base) + ADC_CR_OFFSET)
-#define ADC_CONVERT_START(base)			writel(0x02, (base) + ADC_CR_OFFSET)
-
-static ssize_t mts_attr_show_adc(struct device *dev,
-			struct device_attribute *attr,
-			char *buf)
-{
-	int offset;
-	u32 value;
-	u32 chan_mask;
-
-	if (!DEVICE_CAPA(id_eeprom.capa, CAPA_ADC)) {
-		log_debug("ADC not available");
-		return -ENODEV;
-	}
-
-	if (!strcmp(attr->attr.name, "adc0")) {
-		offset = ADC_CDR0_OFFSET;
-		chan_mask = 0x01;
-	} else if (!strcmp(attr->attr.name, "adc1")) {
-		offset = ADC_CDR1_OFFSET;
-		chan_mask = 0x02;
-	} else if (!strcmp(attr->attr.name, "adc2")) {
-		offset = ADC_CDR2_OFFSET;
-		chan_mask = 0x04;
-	} else if (!strcmp(attr->attr.name, "adc3")) {
-		offset = ADC_CDR3_OFFSET;
-		chan_mask = 0x08;
-	} else {
-		log_notice("adc attr does not exist");
-		return -ENOENT;
-	}
-
-	mutex_lock(&mts_io_mutex);
-
-	// disable all channels and enable the one we want
-	writel(0x0F, adc_base + ADC_CHDR_OFFSET);
-	writel(chan_mask, adc_base + ADC_CHER_OFFSET);
-
-	ADC_CONVERT_START(adc_base);
-
-	// wait for conversion to complete (EOC bit set)
-	value = 0;
-	while (value != chan_mask) {
-		value = readl(adc_base + ADC_SR_OFFSET) & chan_mask;
-		log_debug("ADC_SR EOC [%X]", value);
-	}
-
-	// read result
-	value = readl(adc_base + offset);
-
-	mutex_unlock(&mts_io_mutex);
-
-	return sprintf(buf, "%lu\n", (unsigned long) value);
-}
-
-static DEVICE_ATTR_RO_MTS(dev_attr_adc0, "adc0", mts_attr_show_adc);
-static DEVICE_ATTR_RO_MTS(dev_attr_adc1, "adc1", mts_attr_show_adc);
-static DEVICE_ATTR_RO_MTS(dev_attr_adc2, "adc2", mts_attr_show_adc);
-static DEVICE_ATTR_RO_MTS(dev_attr_adc3, "adc3", mts_attr_show_adc);
diff --git a/io-module/mt100eocg.c b/io-module/mt100eocg.c
deleted file mode 100644
index 8d2338d..0000000
--- a/io-module/mt100eocg.c
+++ /dev/null
@@ -1,221 +0,0 @@
-
-static struct gpio_pin gpio_pins_mt100eocg_0_0[] = {
-	{
-		.name = "ENIO",
-		.pin = AT91_PIN_PC15,
-		.direction = GPIO_DIR_OUTPUT,
-		.output_value = 1,
-		.use_pullup = 0,
-	},
-	{
-		.name = "ETH0_ENABLED",
-		.attr_name = "eth0-enabled",
-		.pin = AT91_PIN_PB31,
-		.direction = GPIO_DIR_OUTPUT,
-		.output_value = 1,
-		.use_pullup = 0,
-	},
-	{
-		.name = "RADIO_RESET",
-		.attr_name = "radio-reset",
-		.pin = AT91_PIN_PB30,
-		.direction = GPIO_DIR_OUTPUT,
-		.output_value = 1,
-		.use_pullup = 0,
-	},
-	{
-		.name = "DEVICE_RESET",
-		.attr_name = "reset",
-		.pin = AT91_PIN_PA22,
-		.direction = GPIO_DIR_INPUT,
-		.output_value = 0,
-		.use_pullup = 0,
-		.active_low = 1,
-	},
-	{
-		.name = "LED3",
-		.attr_name = "led3",
-		.pin = AT91_PIN_PC9,
-#if LED_LS_CONTROLLABLE
-		.direction = GPIO_DIR_OUTPUT,
-#else
-		.direction = GPIO_DIR_INPUT,
-#endif
-		.output_value = 1,
-		.use_pullup = 0,
-		.active_low = 1,
-	},
-	{
-		.name = "LED2",
-		.attr_name = "led2",
-		.pin = AT91_PIN_PA30,
-		.direction = GPIO_DIR_OUTPUT,
-		.output_value = 1,
-		.use_pullup = 0,
-		.active_low = 1,
-	},
-	{
-		.name = "RSERSRC",
-		.attr_name = "rsersrc",
-		.pin = AT91_PIN_PC7,
-		.direction = GPIO_DIR_OUTPUT,
-		.output_value = 1,
-		.use_pullup = 0,
-		.active_low = 1,
-	},
-	{
-		.name = "TXD1",
-		.pin = AT91_PIN_PB17,
-		.direction = GPIO_DIR_INPUT,
-		.output_value = 0,
-		.use_pullup = 0,
-	},
-	{
-		.name = "DTR1",
-		.attr_name = "extserial-dtr",
-		.pin = AT91_PIN_PB18,
-		.direction = GPIO_DIR_INPUT,
-		.output_value = 0,
-		.use_pullup = 0,
-		.active_low = 1,
-	},
-	{
-		.name = "DCD1",
-		.attr_name = "extserial-dcd",
-		.pin = AT91_PIN_PB3,
-		.direction = GPIO_DIR_OUTPUT,
-		.output_value = 1,
-		.use_pullup = 0,
-		.active_low = 1,
-	},
-	{
-		.name = "GPIO11",
-		.attr_name = "gpio11",
-		.pin = AT91_PIN_PB19,
-		.direction = GPIO_DIR_OD,
-		.output_value = 1,
-		.use_pullup = 1,
-	},
-	{
-		.name = "GPIO12",
-		.attr_name = "gpio12",
-		.pin = AT91_PIN_PB20,
-		.direction = GPIO_DIR_OD,
-		.output_value = 1,
-		.use_pullup = 1,
-	},
-	{
-		.name = "ADC0",
-		.pin = AT91_PIN_PC0,
-		.direction = GPIO_DIR_INPUT,
-		.output_value = 0,
-		.use_pullup = 0,
-	},
-	{
-		.name = "ADC1",
-		.pin = AT91_PIN_PC1,
-		.direction = GPIO_DIR_INPUT,
-		.output_value = 0,
-		.use_pullup = 0,
-	},
-	{
-		.name = "ADC2",
-		.pin = AT91_PIN_PC2,
-		.direction = GPIO_DIR_INPUT,
-		.output_value = 0,
-		.use_pullup = 0,
-	},
-	{
-		.name = "ADC3",
-		.pin = AT91_PIN_PC3,
-		.direction = GPIO_DIR_INPUT,
-		.output_value = 0,
-		.use_pullup = 0,
-	},
-	{ },
-};
-
-/* mt100eocg specific attributes */
-static DEVICE_ATTR_MTS(dev_attr_gpo1, "gpo1",
-	mts_attr_show_dout, mts_attr_store_dout);
-static DEVICE_ATTR_MTS(dev_attr_gpo2, "gpo2",
-	mts_attr_show_dout, mts_attr_store_dout);
-static DEVICE_ATTR_MTS(dev_attr_gpo3, "gpo3",
-	mts_attr_show_dout, mts_attr_store_dout);
-static DEVICE_ATTR_MTS(dev_attr_gpo4, "gpo4",
-	mts_attr_show_dout, mts_attr_store_dout);
-
-
-static DEVICE_ATTR_MTS(dev_attr_led1, "led1",
-	mts_attr_show_dout, mts_attr_store_dout);
-static DEVICE_ATTR_MTS(dev_attr_led2, "led2",
-	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-
-#if LED_LS_CONTROLLABLE
-static DEVICE_ATTR_MTS(dev_attr_led3, "led3",
-	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-#else
-static DEVICE_ATTR_RO_MTS(dev_attr_led3, "led3", mts_attr_show_gpio_pin);
-#endif
-
-static DEVICE_ATTR_MTS(dev_attr_led4, "led4",
-	mts_attr_show_dout, mts_attr_store_dout);
-static DEVICE_ATTR_MTS(dev_attr_led5, "led5",
-	mts_attr_show_dout, mts_attr_store_dout);
-static DEVICE_ATTR_MTS(dev_attr_led6, "led6",
-	mts_attr_show_dout, mts_attr_store_dout);
-
-static DEVICE_ATTR_MTS(dev_attr_gpio11, "gpio11",
-	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-static DEVICE_ATTR_MTS(dev_attr_gpio12, "gpio12",
-	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-
-static DEVICE_ATTR_MTS(dev_attr_rsersrc, "rsersrc",
-	mts_attr_show_gpio_pin, mts_attr_store_gpio_pin);
-
-static struct attribute *mt100eocg_platform_attributes[] = {
-	&dev_attr_vendor_id.attr,
-	&dev_attr_product_id.attr,
-	&dev_attr_device_id.attr,
-	&dev_attr_hw_version.attr,
-	&dev_attr_imei.attr,
-	&dev_attr_eth_mac.attr,
-	&dev_attr_extserial_dtr.attr,
-	&dev_attr_extserial_dcd_gpio.attr,
-	&dev_attr_rsersrc.attr,
-	&dev_attr_radio_reset.attr,
-	&dev_attr_eth0_enabled.attr,
-	&dev_attr_gpio11.attr,
-	&dev_attr_gpio12.attr,
-
-	&dev_attr_gpo1.attr,
-	&dev_attr_gpo2.attr,
-	&dev_attr_gpo3.attr,
-	&dev_attr_gpo4.attr,
-	&dev_attr_led1.attr,
-	&dev_attr_led2.attr,
-	&dev_attr_led3.attr,
-	&dev_attr_led4.attr,
-	&dev_attr_led5.attr,
-	&dev_attr_led6.attr,
-
-	&dev_attr_gpi5.attr,
-	&dev_attr_gpi6.attr,
-	&dev_attr_gpi7.attr,
-	&dev_attr_gpi8.attr,
-	&dev_attr_gpi9.attr,
-	&dev_attr_gpi10.attr,
-
-	&dev_attr_board_temperature.attr,
-
-	&dev_attr_adc0.attr,
-	&dev_attr_adc1.attr,
-	&dev_attr_adc2.attr,
-	&dev_attr_adc3.attr,
-
-	NULL,
-};
-
-static struct attribute_group mt100eocg_platform_attribute_group = {
-	.attrs = mt100eocg_platform_attributes
-};
diff --git a/io-module/mtac.c b/io-module/mtac.c
new file mode 100644
index 0000000..9b27e0d
--- /dev/null
+++ b/io-module/mtac.c
@@ -0,0 +1,232 @@
+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-eth")) {
+		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 {
+		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-eth");
+			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:
+			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_gpiob.c b/io-module/mtac_gpiob.c
new file mode 100644
index 0000000..0485494
--- /dev/null
+++ b/io-module/mtac_gpiob.c
@@ -0,0 +1,596 @@
+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("attirbute 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("attirbute name [%s] is invalid for GPIOB in port %d", name, port);
+				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(b