From 64d8ebafbf55fa4a4547184bfbdc73ad43eb6a4c Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Wed, 10 Sep 2014 11:26:03 -0500 Subject: rename mtdc_gpiob.c to mtac_gpiob.c --- io-module/mtac_gpiob.c | 409 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 409 insertions(+) create mode 100644 io-module/mtac_gpiob.c (limited to 'io-module/mtac_gpiob.c') diff --git a/io-module/mtac_gpiob.c b/io-module/mtac_gpiob.c new file mode 100644 index 0000000..5a592b7 --- /dev/null +++ b/io-module/mtac_gpiob.c @@ -0,0 +1,409 @@ +struct gpio_pin *ap_gpio_pin_by_attr_name(const char *name) { + struct gpio_pin *pin; + char *pin_attr_name; + + if (!strcmp(name, "ap1-led1")) { + pin_attr_name = "ap1-gpio3"; + } else if (!strcmp(name, "ap1-led2")) { + pin_attr_name = "ap1-gpio4"; + } else if (!strcmp(name, "ap1-dout-enable")) { + pin_attr_name = "ap1-gpio1"; + } else if (!strcmp(name, "ap1-reset")) { + pin_attr_name = "ap1-reset"; + } else if (!strcmp(name, "ap2-led1")) { + pin_attr_name = "ap2-gpio3"; + } else if (!strcmp(name, "ap2-led2")) { + pin_attr_name = "ap2-gpio4"; + } else if (!strcmp(name, "ap2-dout-enable")) { + pin_attr_name = "ap2-gpio1"; + } else if (!strcmp(name, "ap2-reset")) { + pin_attr_name = "ap2-reset"; + } else { + log_error("accessory card attribute %s not available", name); + return NULL; + } + + 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 device *dev, + struct device_attribute *attr, + char *buf) +{ + int value; + struct gpio_pin *pin = ap_gpio_pin_by_attr_name(attr->attr.name); + + 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 device *dev, + struct device_attribute *attr, const char *buf, size_t count) +{ + int value; + struct gpio_pin *pin = ap_gpio_pin_by_attr_name(attr->attr.name); + + 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; +} + +static ssize_t mts_attr_show_ap_din(struct device *dev, struct device_attribute *attr, char *buf) +{ + int tmp; + u8 bit; + u8 byte; + struct spi_device* spi_dev; + + if (strstr(attr->attr.name, ":0")) { + if (!spi_ap1_din_dev) { + log_error("accessory card 1 din device not present"); + return -ENODEV; + } + + spi_dev = spi_ap1_din_dev; + } else if (strstr(attr->attr.name, ":1")) { + if (!spi_ap2_din_dev) { + log_error("accessory card 2 din device not present"); + return -ENODEV; + } + + spi_dev = spi_ap2_din_dev; + } else { + log_error("unknown din device %s", attr->attr.name); + return -ENODEV; + } + + if (strstr(attr->attr.name, "din0")) { + bit = BIT(0); + } else if (strstr(attr->attr.name, "din1")) { + bit = BIT(1); + } else if (strstr(attr->attr.name, "din2")) { + bit = BIT(2); + } else if (strstr(attr->attr.name, "din3")) { + bit = BIT(3); + } else { + log_error("accessory card din attr does not exist"); + return -ENOENT; + } + + tmp = spi_readn(spi_dev, &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 device *dev, struct device_attribute *attr, const char *buf, size_t count) +{ + int value; + u8 bit; + struct spi_device* spi_dev; + + if (strstr(attr->attr.name, ":0")) { + if (!spi_ap1_dout_dev) { + log_error("accessory card 1 dout device not present"); + return -ENODEV; + } + + spi_dev = spi_ap1_dout_dev; + } else if (strstr(attr->attr.name, ":1")) { + if (!spi_ap2_dout_dev) { + log_error("accessory card 2 dout device not present"); + return -ENODEV; + } + + spi_dev = spi_ap2_dout_dev; + } else { + log_error("unknown dout device %s", attr->attr.name); + return -ENODEV; + } + + if (strstr(attr->attr.name, "dout0")) { + bit = BIT(0); + } else if (strstr(attr->attr.name, "dout1")) { + bit = BIT(1); + } else if (strstr(attr->attr.name, "dout2")) { + bit = BIT(2); + } else if (strstr(attr->attr.name, "dout3")) { + bit = BIT(3); + } else { + log_error("accessory card dout attr does not exist"); + return -ENOENT; + } + + if (sscanf(buf, "%i", &value) != 1) { + log_error("accessory card dout attr invalid argument"); + return -EINVAL; + } + + mutex_lock(&spi_ap_dout_mutex); + + if (value) { + spi_ap_dout_value &= ~bit; + } else { + spi_ap_dout_value |= bit; + } + + spi_writen(spi_dev, &spi_ap_dout_value, 1); + + mutex_unlock(&spi_ap_dout_mutex); + + return count; +} + +static ssize_t mts_attr_show_ap_dout(struct device *dev, struct device_attribute *attr, char *buf) +{ + int value; + u8 bit; + struct spi_device* spi_dev; + + if (strstr(attr->attr.name, ":0")) { + if (!spi_ap1_dout_dev) { + log_error("accessory card 1 dout device not present"); + return -ENODEV; + } + + spi_dev = spi_ap1_dout_dev; + } else if (strstr(attr->attr.name, ":1")) { + if (!spi_ap2_dout_dev) { + log_error("accessory card 2 dout device not present"); + return -ENODEV; + } + + spi_dev = spi_ap2_dout_dev; + } else { + log_error("unknown dout device %s", attr->attr.name); + return -ENODEV; + } + + if (strstr(attr->attr.name, "dout0")) { + bit = BIT(0); + } else if (strstr(attr->attr.name, "dout1")) { + bit = BIT(1); + } else if (strstr(attr->attr.name, "dout2")) { + bit = BIT(2); + } else if (strstr(attr->attr.name, "dout3")) { + bit = BIT(3); + } else { + log_error("accessory card dout attr does not exist"); + return -ENOENT; + } + + mutex_lock(&spi_ap_dout_mutex); + + value = spi_ap_dout_value & bit ? 0 : 1; + + mutex_unlock(&spi_ap_dout_mutex); + + return sprintf(buf, "%d\n", value); +} + +static ssize_t mts_attr_show_ap_adc(struct device *dev, struct device_attribute *attr, char *buf) +{ + int tmp; + int tx_data; + int rx_data; + int channel; + 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]; + struct spi_device* spi_dev; + + memset(tx, 0, sizeof(tx)); + memset(rx, 0, sizeof(rx)); + + if (strstr(attr->attr.name, ":0")) { + if (!spi_ap1_adc_dev) { + log_error("accessory card 1 adc device not present"); + return -ENODEV; + } + + spi_dev = spi_ap1_adc_dev; + } else if (strstr(attr->attr.name, ":1")) { + if (!spi_ap2_adc_dev) { + log_error("accessory card 2 adc device not present"); + return -ENODEV; + } + + spi_dev = spi_ap2_adc_dev; + } else { + log_error("unknown adc device %s", attr->attr.name); + return -ENODEV; + } + + if (strstr(attr->attr.name, "adc0")) { + channel = 0; + } else if (strstr(attr->attr.name, "adc1")) { + channel = 1; + } else if (strstr(attr->attr.name, "adc2")) { + channel = 2; + } else { + log_error("accessory card adc attr does not exist"); + return -ENOENT; + } + + /* 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(spi_dev, 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(spi_dev, tx, 2); + if (tmp) { + log_error("2nd spi_write failed %d", tmp); + return tmp; + } + + /* 3rd transfer to read data */ + tmp = spi_readn(spi_dev, 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); +} + +/* accessory port 1 gpiob attributes */ +static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_din0, "din0:0", mts_attr_show_ap_din); +static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_din1, "din1:0", mts_attr_show_ap_din); +static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_din2, "din2:0", mts_attr_show_ap_din); +static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_din3, "din3:0", mts_attr_show_ap_din); +static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_dout0, "dout0:0", mts_attr_show_ap_dout, mts_attr_store_ap_dout); +static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_dout1, "dout1:0", mts_attr_show_ap_dout, mts_attr_store_ap_dout); +static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_dout2, "dout2:0", mts_attr_show_ap_dout, mts_attr_store_ap_dout); +static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_dout3, "dout3:0", mts_attr_show_ap_dout, mts_attr_store_ap_dout); +static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_adc0, "adc0:0", mts_attr_show_ap_adc); +static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_adc1, "adc1:0", mts_attr_show_ap_adc); +static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_adc2, "adc2:0", mts_attr_show_ap_adc); +static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_led1, "ap1-led1", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); +static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_led2, "ap1-led2", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); +static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_oe, "ap1-dout-enable", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); +static DEVICE_ATTR_MTS(dev_attr_ap1_reset, "ap1-reset", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); + +static int ap1_gpio_attributes_size = 15; // not including NULL at end + +static struct attribute *ap1_gpio_attributes[] = { + &dev_attr_ap1_reset.attr, + + &dev_attr_ap1_gpio_oe.attr, // gpio1 + &dev_attr_ap1_gpio_led1.attr, // gpio3 + &dev_attr_ap1_gpio_led2.attr, // gpio4 + + &dev_attr_ap1_gpio_din0.attr, + &dev_attr_ap1_gpio_din1.attr, + &dev_attr_ap1_gpio_din2.attr, + &dev_attr_ap1_gpio_din3.attr, + + &dev_attr_ap1_gpio_dout0.attr, + &dev_attr_ap1_gpio_dout1.attr, + &dev_attr_ap1_gpio_dout2.attr, + &dev_attr_ap1_gpio_dout3.attr, + + &dev_attr_ap1_gpio_adc0.attr, + &dev_attr_ap1_gpio_adc1.attr, + &dev_attr_ap1_gpio_adc2.attr, + + NULL, +}; + +/* accessory port 2 gpiob attributes */ +static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_din0, "din0:1", mts_attr_show_ap_din); +static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_din1, "din1:1", mts_attr_show_ap_din); +static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_din2, "din2:1", mts_attr_show_ap_din); +static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_din3, "din3:1", mts_attr_show_ap_din); +static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_dout0, "dout0:1", mts_attr_show_ap_dout, mts_attr_store_ap_dout); +static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_dout1, "dout1:1", mts_attr_show_ap_dout, mts_attr_store_ap_dout); +static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_dout2, "dout2:1", mts_attr_show_ap_dout, mts_attr_store_ap_dout); +static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_dout3, "dout3:1", mts_attr_show_ap_dout, mts_attr_store_ap_dout); +static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_adc0, "adc0:1", mts_attr_show_ap_adc); +static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_adc1, "adc1:1", mts_attr_show_ap_adc); +static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_adc2, "adc2:1", mts_attr_show_ap_adc); +static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_led1, "ap2-led1", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); +static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_led2, "ap2-led2", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); +static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_oe, "ap2-dout-enable", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); +static DEVICE_ATTR_MTS(dev_attr_ap2_reset, "ap2-reset", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); + +static int ap2_gpio_attributes_size = 15; // not including NULL at end + +static struct attribute *ap2_gpio_attributes[] = { + &dev_attr_ap2_reset.attr, + + &dev_attr_ap2_gpio_oe.attr, // gpio1 + &dev_attr_ap2_gpio_led1.attr, // gpio3 + &dev_attr_ap2_gpio_led2.attr, // gpio4 + + &dev_attr_ap2_gpio_din0.attr, + &dev_attr_ap2_gpio_din1.attr, + &dev_attr_ap2_gpio_din2.attr, + &dev_attr_ap2_gpio_din3.attr, + + &dev_attr_ap2_gpio_dout0.attr, + &dev_attr_ap2_gpio_dout1.attr, + &dev_attr_ap2_gpio_dout2.attr, + &dev_attr_ap2_gpio_dout3.attr, + + &dev_attr_ap2_gpio_adc0.attr, + &dev_attr_ap2_gpio_adc1.attr, + &dev_attr_ap2_gpio_adc2.attr, + + NULL, +}; -- cgit v1.2.3 From a21c24fa2486e4d4a3b25d0dcbf873ae62fdbcec Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Tue, 23 Sep 2014 10:35:11 -0500 Subject: mts-io: clean up accessory card support use custom kernel config option MTS_NUM_ACCESSORY_PORTS to find out how many slots exist (mostly) dynamically handle any number of accessory cards streamline code to make it easier to add accessory cards in the future --- io-module/mtac_gpiob.c | 552 +++++++++++++++++++++++++++++-------------------- 1 file changed, 333 insertions(+), 219 deletions(-) (limited to 'io-module/mtac_gpiob.c') diff --git a/io-module/mtac_gpiob.c b/io-module/mtac_gpiob.c index 5a592b7..728634d 100644 --- a/io-module/mtac_gpiob.c +++ b/io-module/mtac_gpiob.c @@ -1,22 +1,130 @@ +struct spi_device *gpiob_spi[NUM_AP][3]; +struct spi_driver gpiob_spi_drivers[NUM_AP][3]; + +static u8 spi_ap_dout_value; +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; +} + +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 = 0x00; + spi_writen(gpiob_spi[port_index][dev], &spi_ap_dout_value, 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; +} + +// Is there a way to make this dynamic as well? struct gpio_pin *ap_gpio_pin_by_attr_name(const char *name) { struct gpio_pin *pin; char *pin_attr_name; - if (!strcmp(name, "ap1-led1")) { + if (!strcmp(name, "ap-led1:1")) { pin_attr_name = "ap1-gpio3"; - } else if (!strcmp(name, "ap1-led2")) { + } else if (!strcmp(name, "ap-led2:1")) { pin_attr_name = "ap1-gpio4"; - } else if (!strcmp(name, "ap1-dout-enable")) { + } else if (!strcmp(name, "ap-dout-enable:1")) { pin_attr_name = "ap1-gpio1"; - } else if (!strcmp(name, "ap1-reset")) { + } else if (!strcmp(name, "ap-reset:1")) { pin_attr_name = "ap1-reset"; - } else if (!strcmp(name, "ap2-led1")) { + } else if (!strcmp(name, "ap-led1:2")) { pin_attr_name = "ap2-gpio3"; - } else if (!strcmp(name, "ap2-led2")) { + } else if (!strcmp(name, "ap-led2:2")) { pin_attr_name = "ap2-gpio4"; - } else if (!strcmp(name, "ap2-dout-enable")) { + } else if (!strcmp(name, "ap-dout-enable:2")) { pin_attr_name = "ap2-gpio1"; - } else if (!strcmp(name, "ap2-reset")) { + } else if (!strcmp(name, "ap-reset:2")) { pin_attr_name = "ap2-reset"; } else { log_error("accessory card attribute %s not available", name); @@ -35,8 +143,8 @@ struct gpio_pin *ap_gpio_pin_by_attr_name(const char *name) { } -static ssize_t mts_attr_show_ap_gpio_pin(struct device *dev, - struct device_attribute *attr, +static ssize_t mts_attr_show_ap_gpio_pin(struct kobject *kobj, + struct kobj_attribute *attr, char *buf) { int value; @@ -63,8 +171,8 @@ static ssize_t mts_attr_show_ap_gpio_pin(struct device *dev, return sprintf(buf, "%d\n", value); } -static ssize_t mts_attr_store_ap_gpio_pin(struct device *dev, - struct device_attribute *attr, const char *buf, size_t count) +static ssize_t mts_attr_store_ap_gpio_pin(struct kobject *kobj, + struct kobj_attribute *attr, const char *buf, size_t count) { int value; struct gpio_pin *pin = ap_gpio_pin_by_attr_name(attr->attr.name); @@ -90,46 +198,29 @@ static ssize_t mts_attr_store_ap_gpio_pin(struct device *dev, return count; } -static ssize_t mts_attr_show_ap_din(struct device *dev, struct device_attribute *attr, char *buf) +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; - struct spi_device* spi_dev; - if (strstr(attr->attr.name, ":0")) { - if (!spi_ap1_din_dev) { - log_error("accessory card 1 din device not present"); - return -ENODEV; - } - - spi_dev = spi_ap1_din_dev; - } else if (strstr(attr->attr.name, ":1")) { - if (!spi_ap2_din_dev) { - log_error("accessory card 2 din device not present"); - return -ENODEV; - } - - spi_dev = spi_ap2_din_dev; - } else { - log_error("unknown din device %s", attr->attr.name); - return -ENODEV; + sscanf(attr->attr.name, "din%d:%d", &channel, &port); + port_index = port - 1; + if (channel < 0 || channel > 3) { + log_error("channel [%d] is invalid", channel); + return -ENOENT; } - - if (strstr(attr->attr.name, "din0")) { - bit = BIT(0); - } else if (strstr(attr->attr.name, "din1")) { - bit = BIT(1); - } else if (strstr(attr->attr.name, "din2")) { - bit = BIT(2); - } else if (strstr(attr->attr.name, "din3")) { - bit = BIT(3); - } else { - log_error("accessory card din attr does not exist"); + if (port < 1 || port > NUM_AP) { + log_error("port [%d] is invalid", port); return -ENOENT; } - tmp = spi_readn(spi_dev, &byte, 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; @@ -140,46 +231,29 @@ static ssize_t mts_attr_show_ap_din(struct device *dev, struct device_attribute return sprintf(buf, "%d\n", tmp); } -static ssize_t mts_attr_store_ap_dout(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) +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; - struct spi_device* spi_dev; - - if (strstr(attr->attr.name, ":0")) { - if (!spi_ap1_dout_dev) { - log_error("accessory card 1 dout device not present"); - return -ENODEV; - } - spi_dev = spi_ap1_dout_dev; - } else if (strstr(attr->attr.name, ":1")) { - if (!spi_ap2_dout_dev) { - log_error("accessory card 2 dout device not present"); - return -ENODEV; - } - - spi_dev = spi_ap2_dout_dev; - } else { - log_error("unknown dout device %s", attr->attr.name); - return -ENODEV; + sscanf(attr->attr.name, "dout%d:%d", &channel, &port); + port_index = port - 1; + if (channel < 0 || channel > 3) { + log_error("channel [%d] is invalid", channel); + return -ENOENT; } - - if (strstr(attr->attr.name, "dout0")) { - bit = BIT(0); - } else if (strstr(attr->attr.name, "dout1")) { - bit = BIT(1); - } else if (strstr(attr->attr.name, "dout2")) { - bit = BIT(2); - } else if (strstr(attr->attr.name, "dout3")) { - bit = BIT(3); - } else { - log_error("accessory card dout attr does not exist"); + if (port < 1 || port > NUM_AP) { + log_error("port [%d] is invalid", port); return -ENOENT; } + bit = BIT(channel); + if (sscanf(buf, "%i", &value) != 1) { - log_error("accessory card dout attr invalid argument"); + log_error("accessory card dout attr invalid argument [%d]", value); return -EINVAL; } @@ -191,51 +265,32 @@ static ssize_t mts_attr_store_ap_dout(struct device *dev, struct device_attribut spi_ap_dout_value |= bit; } - spi_writen(spi_dev, &spi_ap_dout_value, 1); + spi_writen(gpiob_spi[port_index][dout], &spi_ap_dout_value, 1); mutex_unlock(&spi_ap_dout_mutex); return count; } -static ssize_t mts_attr_show_ap_dout(struct device *dev, struct device_attribute *attr, char *buf) +static ssize_t mts_attr_show_ap_dout(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { int value; + int channel; + int port; u8 bit; - struct spi_device* spi_dev; - if (strstr(attr->attr.name, ":0")) { - if (!spi_ap1_dout_dev) { - log_error("accessory card 1 dout device not present"); - return -ENODEV; - } - - spi_dev = spi_ap1_dout_dev; - } else if (strstr(attr->attr.name, ":1")) { - if (!spi_ap2_dout_dev) { - log_error("accessory card 2 dout device not present"); - return -ENODEV; - } - - spi_dev = spi_ap2_dout_dev; - } else { - log_error("unknown dout device %s", attr->attr.name); - return -ENODEV; + sscanf(attr->attr.name, "dout%d:%d", &channel, &port); + if (channel < 0 || channel > 3) { + log_error("channel [%d] is invalid", channel); + return -ENOENT; } - - if (strstr(attr->attr.name, "dout0")) { - bit = BIT(0); - } else if (strstr(attr->attr.name, "dout1")) { - bit = BIT(1); - } else if (strstr(attr->attr.name, "dout2")) { - bit = BIT(2); - } else if (strstr(attr->attr.name, "dout3")) { - bit = BIT(3); - } else { - log_error("accessory card dout attr does not exist"); + if (port < 1 || port > NUM_AP) { + log_error("port [%d] is invalid", port); return -ENOENT; } + bit = BIT(channel); + mutex_lock(&spi_ap_dout_mutex); value = spi_ap_dout_value & bit ? 0 : 1; @@ -245,48 +300,30 @@ static ssize_t mts_attr_show_ap_dout(struct device *dev, struct device_attribute return sprintf(buf, "%d\n", value); } -static ssize_t mts_attr_show_ap_adc(struct device *dev, struct device_attribute *attr, char *buf) +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]; - struct spi_device* spi_dev; memset(tx, 0, sizeof(tx)); memset(rx, 0, sizeof(rx)); - if (strstr(attr->attr.name, ":0")) { - if (!spi_ap1_adc_dev) { - log_error("accessory card 1 adc device not present"); - return -ENODEV; - } - - spi_dev = spi_ap1_adc_dev; - } else if (strstr(attr->attr.name, ":1")) { - if (!spi_ap2_adc_dev) { - log_error("accessory card 2 adc device not present"); - return -ENODEV; - } - - spi_dev = spi_ap2_adc_dev; - } else { - log_error("unknown adc device %s", attr->attr.name); - return -ENODEV; + sscanf(attr->attr.name, "adc%d:%d", &channel, &port); + port_index = port - 1; + if (channel < 0 || channel > 2) { + log_error("channel [%d] is invalid", channel); + return -ENOENT; } - - if (strstr(attr->attr.name, "adc0")) { - channel = 0; - } else if (strstr(attr->attr.name, "adc1")) { - channel = 1; - } else if (strstr(attr->attr.name, "adc2")) { - channel = 2; - } else { - log_error("accessory card adc attr does not exist"); + if (port < 1 || port > NUM_AP) { + log_error("port [%d] is invalid", port); return -ENOENT; } @@ -294,7 +331,7 @@ static ssize_t mts_attr_show_ap_adc(struct device *dev, struct device_attribute tx_data = manual_mode | ((channel << 7) & channel_mask); tx[0] = tx_data >> 8; tx[1] = tx_data & 0xFF; - tmp = spi_writen(spi_dev, tx, 2); + tmp = spi_writen(gpiob_spi[port_index][adc], tx, 2); if (tmp) { log_error("spi_write failed %d", tmp); return tmp; @@ -305,14 +342,14 @@ static ssize_t mts_attr_show_ap_adc(struct device *dev, struct device_attribute * the ADC just needs the clock running so it can convert */ tx[0] = 0; tx[1] = 0; - tmp = spi_writen(spi_dev, tx, 2); + 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(spi_dev, rx, 2); + tmp = spi_readn(gpiob_spi[port_index][adc], rx, 2); if (tmp) { log_error("spi_read failed %d", tmp); return tmp; @@ -322,88 +359,165 @@ static ssize_t mts_attr_show_ap_adc(struct device *dev, struct device_attribute return sprintf(buf, "%lu\n", (unsigned long) rx_data); } -/* accessory port 1 gpiob attributes */ -static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_din0, "din0:0", mts_attr_show_ap_din); -static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_din1, "din1:0", mts_attr_show_ap_din); -static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_din2, "din2:0", mts_attr_show_ap_din); -static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_din3, "din3:0", mts_attr_show_ap_din); -static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_dout0, "dout0:0", mts_attr_show_ap_dout, mts_attr_store_ap_dout); -static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_dout1, "dout1:0", mts_attr_show_ap_dout, mts_attr_store_ap_dout); -static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_dout2, "dout2:0", mts_attr_show_ap_dout, mts_attr_store_ap_dout); -static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_dout3, "dout3:0", mts_attr_show_ap_dout, mts_attr_store_ap_dout); -static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_adc0, "adc0:0", mts_attr_show_ap_adc); -static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_adc1, "adc1:0", mts_attr_show_ap_adc); -static DEVICE_ATTR_RO_MTS(dev_attr_ap1_gpio_adc2, "adc2:0", mts_attr_show_ap_adc); -static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_led1, "ap1-led1", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); -static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_led2, "ap1-led2", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); -static DEVICE_ATTR_MTS(dev_attr_ap1_gpio_oe, "ap1-dout-enable", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); -static DEVICE_ATTR_MTS(dev_attr_ap1_reset, "ap1-reset", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); - -static int ap1_gpio_attributes_size = 15; // not including NULL at end - -static struct attribute *ap1_gpio_attributes[] = { - &dev_attr_ap1_reset.attr, - - &dev_attr_ap1_gpio_oe.attr, // gpio1 - &dev_attr_ap1_gpio_led1.attr, // gpio3 - &dev_attr_ap1_gpio_led2.attr, // gpio4 - - &dev_attr_ap1_gpio_din0.attr, - &dev_attr_ap1_gpio_din1.attr, - &dev_attr_ap1_gpio_din2.attr, - &dev_attr_ap1_gpio_din3.attr, - - &dev_attr_ap1_gpio_dout0.attr, - &dev_attr_ap1_gpio_dout1.attr, - &dev_attr_ap1_gpio_dout2.attr, - &dev_attr_ap1_gpio_dout3.attr, - - &dev_attr_ap1_gpio_adc0.attr, - &dev_attr_ap1_gpio_adc1.attr, - &dev_attr_ap1_gpio_adc2.attr, - - NULL, -}; +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 +static int ap_gpiob_attrs_size = 15; + +static bool gpiob_setup(enum ap port) { + int i; + int port_index = port - 1; + struct kobj_attribute *attr; + char buf[32]; + + log_info("loading GPIOB accessory card in port %d", port); + + if (device_attrs_size + ap_gpiob_attrs_size >= device_attrs_max_size) { + log_error("can't load GPIOB accessory card in port %d - not enough room for attributes", port); + return false; + } + + // add digital inputs + for (i = 0; i < 4; i++) { + sprintf(buf, "din%d:%d", i, port); + 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; + device_attrs[device_attrs_size++] = &attr->attr; + } + + // add digital outputs + for (i = 0; i < 4; i++) { + sprintf(buf, "dout%d:%d", i, port); + attr = create_attribute(buf, MTS_ATTR_MODE_RW); + if (! attr) { + log_error("failed to create attribute[%s]", buf); + return false; + } + attr->show = mts_attr_show_ap_dout; + attr->store = mts_attr_store_ap_dout; + device_attrs[device_attrs_size++] = &attr->attr; + } + + // add analog to digital + for (i = 0; i < 3; i++) { + sprintf(buf, "adc%d:%d", i, port); + 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_adc; + device_attrs[device_attrs_size++] = &attr->attr; + } + + // add LEDs + for (i = 1; i <= 2; i++) { + sprintf(buf, "ap-led%d:%d", i, port); + attr = create_attribute(buf, MTS_ATTR_MODE_RW); + if (! attr) { + log_error("failed to create attribute[%s]", buf); + return false; + } + attr->show = mts_attr_show_ap_gpio_pin; + attr->store = mts_attr_store_ap_gpio_pin; + device_attrs[device_attrs_size++] = &attr->attr; + } + + // misc attributes + sprintf(buf, "ap-dout-enable:%d", port); + attr = create_attribute(buf, MTS_ATTR_MODE_RW); + if (! attr) { + log_error("failed to create attribute[%s]", buf); + return false; + } + attr->show = mts_attr_show_ap_gpio_pin; + attr->store = mts_attr_store_ap_gpio_pin; + device_attrs[device_attrs_size++] = &attr->attr; + + sprintf(buf, "ap-reset:%d", port); + attr = create_attribute(buf, MTS_ATTR_MODE_RW); + if (! attr) { + log_error("failed to create attribute[%s]", buf); + return false; + } + attr->show = mts_attr_show_ap_gpio_pin; + attr->store = mts_attr_store_ap_gpio_pin; + device_attrs[device_attrs_size++] = &attr->attr; + + // 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]", buf); + 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]", buf); + 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]", buf); + 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; + } + return true; +} + +static bool gpiob_teardown(enum ap port) { + int port_index = port - 1; + + // do we need to clean up allocated memory here as well? + log_info("unloading GPIOB accessory card in port %d", port); + spi_unregister_driver(&gpiob_spi_drivers[port_index][dout]); + spi_unregister_driver(&gpiob_spi_drivers[port_index][din]); + spi_unregister_driver(&gpiob_spi_drivers[port_index][adc]); + return true; +} -/* accessory port 2 gpiob attributes */ -static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_din0, "din0:1", mts_attr_show_ap_din); -static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_din1, "din1:1", mts_attr_show_ap_din); -static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_din2, "din2:1", mts_attr_show_ap_din); -static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_din3, "din3:1", mts_attr_show_ap_din); -static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_dout0, "dout0:1", mts_attr_show_ap_dout, mts_attr_store_ap_dout); -static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_dout1, "dout1:1", mts_attr_show_ap_dout, mts_attr_store_ap_dout); -static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_dout2, "dout2:1", mts_attr_show_ap_dout, mts_attr_store_ap_dout); -static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_dout3, "dout3:1", mts_attr_show_ap_dout, mts_attr_store_ap_dout); -static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_adc0, "adc0:1", mts_attr_show_ap_adc); -static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_adc1, "adc1:1", mts_attr_show_ap_adc); -static DEVICE_ATTR_RO_MTS(dev_attr_ap2_gpio_adc2, "adc2:1", mts_attr_show_ap_adc); -static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_led1, "ap2-led1", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); -static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_led2, "ap2-led2", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); -static DEVICE_ATTR_MTS(dev_attr_ap2_gpio_oe, "ap2-dout-enable", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); -static DEVICE_ATTR_MTS(dev_attr_ap2_reset, "ap2-reset", mts_attr_show_ap_gpio_pin, mts_attr_store_ap_gpio_pin); - -static int ap2_gpio_attributes_size = 15; // not including NULL at end - -static struct attribute *ap2_gpio_attributes[] = { - &dev_attr_ap2_reset.attr, - - &dev_attr_ap2_gpio_oe.attr, // gpio1 - &dev_attr_ap2_gpio_led1.attr, // gpio3 - &dev_attr_ap2_gpio_led2.attr, // gpio4 - - &dev_attr_ap2_gpio_din0.attr, - &dev_attr_ap2_gpio_din1.attr, - &dev_attr_ap2_gpio_din2.attr, - &dev_attr_ap2_gpio_din3.attr, - - &dev_attr_ap2_gpio_dout0.attr, - &dev_attr_ap2_gpio_dout1.attr, - &dev_attr_ap2_gpio_dout2.attr, - &dev_attr_ap2_gpio_dout3.attr, - - &dev_attr_ap2_gpio_adc0.attr, - &dev_attr_ap2_gpio_adc1.attr, - &dev_attr_ap2_gpio_adc2.attr, - - NULL, +static struct ap_info gpiob_info = { + .product_id = MTAC_GPIOB_0_0, + .setup = &gpiob_setup, + .teardown = &gpiob_teardown }; -- cgit v1.2.3 From c83b0cf41999478d31c86fb50740d1fdf0fbb003 Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Thu, 25 Sep 2014 14:03:36 -0500 Subject: mts-io: clean up memory allocated for accessory cards on module unload or setup failure --- io-module/mtac_gpiob.c | 45 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 39 insertions(+), 6 deletions(-) (limited to 'io-module/mtac_gpiob.c') diff --git a/io-module/mtac_gpiob.c b/io-module/mtac_gpiob.c index 728634d..f2cd9b2 100644 --- a/io-module/mtac_gpiob.c +++ b/io-module/mtac_gpiob.c @@ -395,6 +395,10 @@ static bool gpiob_setup(enum ap port) { return false; } + // mark the attribute indices we're using so we know what to clean up + port_info[port_index]->attrs_start = device_attrs_size; + port_info[port_index]->attrs_end = device_attrs_size + ap_gpiob_attrs_size; + // add digital inputs for (i = 0; i < 4; i++) { sprintf(buf, "din%d:%d", i, port); @@ -506,18 +510,47 @@ static bool gpiob_setup(enum ap port) { } static bool gpiob_teardown(enum ap port) { + int i; int port_index = port - 1; - // do we need to clean up allocated memory here as well? log_info("unloading GPIOB accessory card in port %d", port); + + // clean up allocated memory for attributes + for (i = port_info[port_index]->attrs_start; i < port_info[port_index]->attrs_end; i++) { + if (device_attrs[i]) { + if (device_attrs[i]->name) + kfree(device_attrs[i]->name); + + kfree(device_attrs[i]); + } + } + + // 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(&gpiob_spi_drivers[port_index][dout]); spi_unregister_driver(&gpiob_spi_drivers[port_index][din]); spi_unregister_driver(&gpiob_spi_drivers[port_index][adc]); + + // reset attribute index markers + port_info[port_index]->attrs_start = 0; + port_info[port_index]->attrs_end = 0; + return true; } -static struct ap_info gpiob_info = { - .product_id = MTAC_GPIOB_0_0, - .setup = &gpiob_setup, - .teardown = &gpiob_teardown -}; +bool set_gpiob_info(struct ap_info* info) { + info->product_id = MTAC_GPIOB_0_0; + info->setup = &gpiob_setup; + info->teardown = &gpiob_teardown; + info->attrs_start = 0; + info->attrs_end = 0; + + return true; +} -- cgit v1.2.3 From 8f1a0efb9e68a955544bce4bbc9dec6e4cb57f61 Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Thu, 25 Sep 2014 15:52:29 -0500 Subject: mts-io: add accessory card eeprom contents as read-only sysfs attribtues --- io-module/mtac_gpiob.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'io-module/mtac_gpiob.c') diff --git a/io-module/mtac_gpiob.c b/io-module/mtac_gpiob.c index f2cd9b2..ebbe0c6 100644 --- a/io-module/mtac_gpiob.c +++ b/io-module/mtac_gpiob.c @@ -380,7 +380,11 @@ static bool gpiob_spi_driver_setup(struct spi_driver *driver, const char *driver // 2 LEDs // 1 digital out enable // 1 reset -static int ap_gpiob_attrs_size = 15; +// 1 vendor-id +// 1 product-id +// 1 device-id +// 1 hw-version +static int ap_gpiob_attrs_size = 19; static bool gpiob_setup(enum ap port) { int i; @@ -449,7 +453,13 @@ static bool gpiob_setup(enum ap port) { device_attrs[device_attrs_size++] = &attr->attr; } - // misc attributes + // add attributes for eeprom contents + if (! ap_add_product_info_attributes(port, MTAC_GPIOB_0_0)) { + log_error("failed to add product info attributes"); + return false; + } + + // add misc attributes sprintf(buf, "ap-dout-enable:%d", port); attr = create_attribute(buf, MTS_ATTR_MODE_RW); if (! attr) { -- cgit v1.2.3 From 0f27f5666932274a30ca018c7dacfd7a9e5fc8bb Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Wed, 1 Oct 2014 08:41:26 -0500 Subject: mts-io: standardize lookup of pin name by attribute name 1 set of functions for ap gpio pin store and show each type of card defines a callback that specifies the mapping of attribute names to pin names --- io-module/mtac_gpiob.c | 109 +++++++++---------------------------------------- 1 file changed, 20 insertions(+), 89 deletions(-) (limited to 'io-module/mtac_gpiob.c') diff --git a/io-module/mtac_gpiob.c b/io-module/mtac_gpiob.c index ebbe0c6..ce1d7de 100644 --- a/io-module/mtac_gpiob.c +++ b/io-module/mtac_gpiob.c @@ -105,97 +105,27 @@ static int mts_spi_ap_remove(struct spi_device *spi) return 0; } -// Is there a way to make this dynamic as well? -struct gpio_pin *ap_gpio_pin_by_attr_name(const char *name) { - struct gpio_pin *pin; - char *pin_attr_name; - - if (!strcmp(name, "ap-led1:1")) { - pin_attr_name = "ap1-gpio3"; - } else if (!strcmp(name, "ap-led2:1")) { - pin_attr_name = "ap1-gpio4"; - } else if (!strcmp(name, "ap-dout-enable:1")) { - pin_attr_name = "ap1-gpio1"; - } else if (!strcmp(name, "ap-reset:1")) { - pin_attr_name = "ap1-reset"; - } else if (!strcmp(name, "ap-led1:2")) { - pin_attr_name = "ap2-gpio3"; - } else if (!strcmp(name, "ap-led2:2")) { - pin_attr_name = "ap2-gpio4"; - } else if (!strcmp(name, "ap-dout-enable:2")) { - pin_attr_name = "ap2-gpio1"; - } else if (!strcmp(name, "ap-reset:2")) { - pin_attr_name = "ap2-reset"; +static char* gpiob_gpio_pin_name_by_attr_name(const char* name) { + if (! strcmp(name, "ap-led1:1")) { + return "ap1-gpio3"; + } else if (! strcmp(name, "ap-led2:1")) { + return "ap1-gpio4"; + } else if (! strcmp(name, "ap-dout-enable:1")) { + return "ap1-gpio1"; + } else if (! strcmp(name, "ap-reset:1")) { + return "ap1-reset"; + } else if (! strcmp(name, "ap-led1:2")) { + return "ap2-gpio3"; + } else if (! strcmp(name, "ap-led2:2")) { + return "ap2-gpio4"; + } else if (! strcmp(name, "ap-dout-enable:2")) { + return "ap2-gpio1"; + } else if (! strcmp(name, "ap-reset:2")) { + return "ap2-reset"; } else { - log_error("accessory card attribute %s not available", name); - return NULL; + log_error("attirbute name [%s] is invalid for GPIOB", name); + return ""; } - - 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; - struct gpio_pin *pin = ap_gpio_pin_by_attr_name(attr->attr.name); - - 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; - struct gpio_pin *pin = ap_gpio_pin_by_attr_name(attr->attr.name); - - 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; } static ssize_t mts_attr_show_ap_din(struct kobject *kobj, struct kobj_attribute *attr, char *buf) @@ -561,6 +491,7 @@ bool set_gpiob_info(struct ap_info* info) { info->teardown = &gpiob_teardown; info->attrs_start = 0; info->attrs_end = 0; + info->gpio_pin_name_by_attr_name = &gpiob_gpio_pin_name_by_attr_name; return true; } -- cgit v1.2.3 From 0f0c9bb72a3be330512e60677c4e3693347bf66b Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Wed, 1 Oct 2014 11:11:12 -0500 Subject: mts-io: remove "ap-" from gpiob gpio pin attributes --- io-module/mtac_gpiob.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'io-module/mtac_gpiob.c') diff --git a/io-module/mtac_gpiob.c b/io-module/mtac_gpiob.c index ce1d7de..f8652c6 100644 --- a/io-module/mtac_gpiob.c +++ b/io-module/mtac_gpiob.c @@ -106,21 +106,21 @@ static int mts_spi_ap_remove(struct spi_device *spi) } static char* gpiob_gpio_pin_name_by_attr_name(const char* name) { - if (! strcmp(name, "ap-led1:1")) { + if (! strcmp(name, "led1:1")) { return "ap1-gpio3"; - } else if (! strcmp(name, "ap-led2:1")) { + } else if (! strcmp(name, "led2:1")) { return "ap1-gpio4"; - } else if (! strcmp(name, "ap-dout-enable:1")) { + } else if (! strcmp(name, "dout-enable:1")) { return "ap1-gpio1"; - } else if (! strcmp(name, "ap-reset:1")) { + } else if (! strcmp(name, "reset:1")) { return "ap1-reset"; - } else if (! strcmp(name, "ap-led1:2")) { + } else if (! strcmp(name, "led1:2")) { return "ap2-gpio3"; - } else if (! strcmp(name, "ap-led2:2")) { + } else if (! strcmp(name, "led2:2")) { return "ap2-gpio4"; - } else if (! strcmp(name, "ap-dout-enable:2")) { + } else if (! strcmp(name, "dout-enable:2")) { return "ap2-gpio1"; - } else if (! strcmp(name, "ap-reset:2")) { + } else if (! strcmp(name, "reset:2")) { return "ap2-reset"; } else { log_error("attirbute name [%s] is invalid for GPIOB", name); @@ -372,7 +372,7 @@ static bool gpiob_setup(enum ap port) { // add LEDs for (i = 1; i <= 2; i++) { - sprintf(buf, "ap-led%d:%d", i, port); + sprintf(buf, "led%d:%d", i, port); attr = create_attribute(buf, MTS_ATTR_MODE_RW); if (! attr) { log_error("failed to create attribute[%s]", buf); @@ -390,7 +390,7 @@ static bool gpiob_setup(enum ap port) { } // add misc attributes - sprintf(buf, "ap-dout-enable:%d", port); + sprintf(buf, "dout-enable:%d", port); attr = create_attribute(buf, MTS_ATTR_MODE_RW); if (! attr) { log_error("failed to create attribute[%s]", buf); @@ -400,7 +400,7 @@ static bool gpiob_setup(enum ap port) { attr->store = mts_attr_store_ap_gpio_pin; device_attrs[device_attrs_size++] = &attr->attr; - sprintf(buf, "ap-reset:%d", port); + sprintf(buf, "reset:%d", port); attr = create_attribute(buf, MTS_ATTR_MODE_RW); if (! attr) { log_error("failed to create attribute[%s]", buf); -- cgit v1.2.3 From f9010f0863063e6836394469edf43e86c98d49fe Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Fri, 3 Oct 2014 15:09:42 -0500 Subject: mts-io: reorganize accessory card attributes, move them into subdirs under mts-io subdirs named ap1, ap2, etc create links to subdirs with name of card in port, e.g. gpiob, mfser, eth, etc if 2 of same type of card, still make links but use gpiob-2, mfser-2, etc --- io-module/mtac_gpiob.c | 262 ++++++++++++++++++++++++++++++------------------- 1 file changed, 162 insertions(+), 100 deletions(-) (limited to 'io-module/mtac_gpiob.c') diff --git a/io-module/mtac_gpiob.c b/io-module/mtac_gpiob.c index f8652c6..3f9631d 100644 --- a/io-module/mtac_gpiob.c +++ b/io-module/mtac_gpiob.c @@ -1,7 +1,7 @@ struct spi_device *gpiob_spi[NUM_AP][3]; struct spi_driver gpiob_spi_drivers[NUM_AP][3]; -static u8 spi_ap_dout_value; +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); @@ -41,7 +41,7 @@ static int mts_spi_ap_probe(struct spi_device *spi) 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); + log_error("port %d is invalid", port); return -ENODEV; } @@ -66,13 +66,13 @@ static int mts_spi_ap_probe(struct spi_device *spi) tmp = spi_setup(gpiob_spi[port_index][dev]); if (tmp < 0) { - log_error("spi_setup ap %d %s failed", port, buf); + log_error("spi_setup ap %d [%s] failed", port, buf); return tmp; } if (dev == dout) { - spi_ap_dout_value = 0x00; - spi_writen(gpiob_spi[port_index][dev], &spi_ap_dout_value, 1); + spi_ap_dout_value[port_index] = 0x00; + spi_writen(gpiob_spi[port_index][dev], &spi_ap_dout_value[port_index], 1); } return 0; @@ -87,7 +87,7 @@ static int mts_spi_ap_remove(struct spi_device *spi) 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); + log_error("port %d is invalid", port); return -ENODEV; } @@ -105,26 +105,35 @@ static int mts_spi_ap_remove(struct spi_device *spi) return 0; } -static char* gpiob_gpio_pin_name_by_attr_name(const char* name) { - if (! strcmp(name, "led1:1")) { - return "ap1-gpio3"; - } else if (! strcmp(name, "led2:1")) { - return "ap1-gpio4"; - } else if (! strcmp(name, "dout-enable:1")) { - return "ap1-gpio1"; - } else if (! strcmp(name, "reset:1")) { - return "ap1-reset"; - } else if (! strcmp(name, "led1:2")) { - return "ap2-gpio3"; - } else if (! strcmp(name, "led2:2")) { - return "ap2-gpio4"; - } else if (! strcmp(name, "dout-enable:2")) { - return "ap2-gpio1"; - } else if (! strcmp(name, "reset:2")) { - return "ap2-reset"; - } else { - log_error("attirbute name [%s] is invalid for GPIOB", name); - return ""; +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 ""; + } } } @@ -137,16 +146,18 @@ static ssize_t mts_attr_show_ap_din(struct kobject *kobj, struct kobj_attribute u8 bit; u8 byte; - sscanf(attr->attr.name, "din%d:%d", &channel, &port); - port_index = port - 1; + sscanf(attr->attr.name, "din%d", &channel); if (channel < 0 || channel > 3) { - log_error("channel [%d] is invalid", channel); + log_error("channel %d is invalid", channel); return -ENOENT; } - if (port < 1 || port > NUM_AP) { - log_error("port [%d] is invalid", port); - 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); @@ -169,33 +180,35 @@ static ssize_t mts_attr_store_ap_dout(struct kobject *kobj, struct kobj_attribut int port_index; u8 bit; - sscanf(attr->attr.name, "dout%d:%d", &channel, &port); - port_index = port - 1; + sscanf(attr->attr.name, "dout%d", &channel); if (channel < 0 || channel > 3) { - log_error("channel [%d] is invalid", channel); + log_error("channel %d is invalid", channel); return -ENOENT; } - if (port < 1 || port > NUM_AP) { - log_error("port [%d] is invalid", port); - 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); + log_error("accessory card dout attr invalid argument %d", value); return -EINVAL; } mutex_lock(&spi_ap_dout_mutex); if (value) { - spi_ap_dout_value &= ~bit; + spi_ap_dout_value[port_index] &= ~bit; } else { - spi_ap_dout_value |= bit; + spi_ap_dout_value[port_index] |= bit; } - spi_writen(gpiob_spi[port_index][dout], &spi_ap_dout_value, 1); + spi_writen(gpiob_spi[port_index][dout], &spi_ap_dout_value[port_index], 1); mutex_unlock(&spi_ap_dout_mutex); @@ -207,23 +220,27 @@ static ssize_t mts_attr_show_ap_dout(struct kobject *kobj, struct kobj_attribute int value; int channel; int port; + int port_index; u8 bit; - sscanf(attr->attr.name, "dout%d:%d", &channel, &port); + sscanf(attr->attr.name, "dout%d", &channel); if (channel < 0 || channel > 3) { - log_error("channel [%d] is invalid", channel); + log_error("channel %d is invalid", channel); return -ENOENT; } - if (port < 1 || port > NUM_AP) { - log_error("port [%d] is invalid", port); - 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 & bit ? 0 : 1; + value = spi_ap_dout_value[port_index] & bit ? 0 : 1; mutex_unlock(&spi_ap_dout_mutex); @@ -246,16 +263,18 @@ static ssize_t mts_attr_show_ap_adc(struct kobject *kobj, struct kobj_attribute memset(tx, 0, sizeof(tx)); memset(rx, 0, sizeof(rx)); - sscanf(attr->attr.name, "adc%d:%d", &channel, &port); - port_index = port - 1; + sscanf(attr->attr.name, "adc%d", &channel); if (channel < 0 || channel > 2) { - log_error("channel [%d] is invalid", channel); + log_error("channel %d is invalid", channel); return -ENOENT; } - if (port < 1 || port > NUM_AP) { - log_error("port [%d] is invalid", port); - 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); @@ -314,107 +333,142 @@ static bool gpiob_spi_driver_setup(struct spi_driver *driver, const char *driver // 1 product-id // 1 device-id // 1 hw-version -static int ap_gpiob_attrs_size = 19; +// NULL +static int ap_gpiob_attrs_size = 20; static bool gpiob_setup(enum ap port) { int i; int port_index = port - 1; - struct kobj_attribute *attr; + 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); - if (device_attrs_size + ap_gpiob_attrs_size >= device_attrs_max_size) { - log_error("can't load GPIOB accessory card in port %d - not enough room for attributes", 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; } - // mark the attribute indices we're using so we know what to clean up - port_info[port_index]->attrs_start = device_attrs_size; - port_info[port_index]->attrs_end = device_attrs_size + ap_gpiob_attrs_size; + // 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:%d", i, port); + sprintf(buf, "din%d", i); attr = create_attribute(buf, MTS_ATTR_MODE_RO); if (! attr) { - log_error("failed to create attribute[%s]", buf); + log_error("failed to create attribute [%s]", buf); return false; } attr->show = mts_attr_show_ap_din; - device_attrs[device_attrs_size++] = &attr->attr; + attrs[index++] = &attr->attr; } // add digital outputs for (i = 0; i < 4; i++) { - sprintf(buf, "dout%d:%d", i, port); + sprintf(buf, "dout%d", i); attr = create_attribute(buf, MTS_ATTR_MODE_RW); if (! attr) { - log_error("failed to create attribute[%s]", buf); + 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; - device_attrs[device_attrs_size++] = &attr->attr; + attrs[index++] = &attr->attr; } // add analog to digital for (i = 0; i < 3; i++) { - sprintf(buf, "adc%d:%d", i, port); + sprintf(buf, "adc%d", i); attr = create_attribute(buf, MTS_ATTR_MODE_RO); if (! attr) { - log_error("failed to create attribute[%s]", buf); + log_error("failed to create attribute [%s] for GPIOB in port %d", buf, port); return false; } attr->show = mts_attr_show_ap_adc; - device_attrs[device_attrs_size++] = &attr->attr; + attrs[index++] = &attr->attr; } // add LEDs for (i = 1; i <= 2; i++) { - sprintf(buf, "led%d:%d", i, port); + sprintf(buf, "led%d", i); attr = create_attribute(buf, MTS_ATTR_MODE_RW); if (! attr) { - log_error("failed to create attribute[%s]", buf); + 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; - device_attrs[device_attrs_size++] = &attr->attr; - } - - // add attributes for eeprom contents - if (! ap_add_product_info_attributes(port, MTAC_GPIOB_0_0)) { - log_error("failed to add product info attributes"); - return false; + attrs[index++] = &attr->attr; } // add misc attributes - sprintf(buf, "dout-enable:%d", port); + sprintf(buf, "dout-enable"); attr = create_attribute(buf, MTS_ATTR_MODE_RW); if (! attr) { - log_error("failed to create attribute[%s]", buf); + 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; - device_attrs[device_attrs_size++] = &attr->attr; + attrs[index++] = &attr->attr; - sprintf(buf, "reset:%d", port); + sprintf(buf, "reset"); attr = create_attribute(buf, MTS_ATTR_MODE_RW); if (! attr) { - log_error("failed to create attribute[%s]", buf); + 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; - device_attrs[device_attrs_size++] = &attr->attr; + 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]", 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])) { @@ -426,7 +480,7 @@ static bool gpiob_setup(enum ap port) { 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]", 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])) { @@ -438,7 +492,7 @@ static bool gpiob_setup(enum ap port) { 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]", 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])) { @@ -446,25 +500,39 @@ static bool gpiob_setup(enum ap 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 = port_info[port_index]->attrs_start; i < port_info[port_index]->attrs_end; i++) { - if (device_attrs[i]) { - if (device_attrs[i]->name) - kfree(device_attrs[i]->name); + for (i = 0; i < ap_gpiob_attrs_size; i++) { + if (attrs[i]) { + if (attrs[i]->name) + kfree(attrs[i]->name); - kfree(device_attrs[i]); + 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); @@ -478,19 +546,13 @@ static bool gpiob_teardown(enum ap port) { spi_unregister_driver(&gpiob_spi_drivers[port_index][din]); spi_unregister_driver(&gpiob_spi_drivers[port_index][adc]); - // reset attribute index markers - port_info[port_index]->attrs_start = 0; - port_info[port_index]->attrs_end = 0; - return true; } bool set_gpiob_info(struct ap_info* info) { - info->product_id = MTAC_GPIOB_0_0; + snprintf(info->product_id, 32, "%s", PRODUCT_ID_MTAC_GPIOB); info->setup = &gpiob_setup; info->teardown = &gpiob_teardown; - info->attrs_start = 0; - info->attrs_end = 0; info->gpio_pin_name_by_attr_name = &gpiob_gpio_pin_name_by_attr_name; return true; -- cgit v1.2.3 From 72412963e66f4a2448fd87f455b33f3a5115f4bd Mon Sep 17 00:00:00 2001 From: Mike Fiore Date: Wed, 8 Oct 2014 10:38:26 -0500 Subject: mts-io: remove all unused spi and adc code from mtcdp remote board-temperature attribute --- io-module/mtac_gpiob.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'io-module/mtac_gpiob.c') diff --git a/io-module/mtac_gpiob.c b/io-module/mtac_gpiob.c index 3f9631d..0485494 100644 --- a/io-module/mtac_gpiob.c +++ b/io-module/mtac_gpiob.c @@ -30,6 +30,43 @@ static bool gpiob_get_dev_info_from_modalias(const char* modalias, int* port, ch 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; -- cgit v1.2.3