greybus: initial operations-based GPIO driver
First cut.
Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index fc692f0..a51b478 100644
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -206,6 +206,7 @@
case GREYBUS_PROTOCOL_CONTROL:
case GREYBUS_PROTOCOL_AP:
case GREYBUS_PROTOCOL_GPIO:
+ return gb_gpio_controller_init(connection);
case GREYBUS_PROTOCOL_UART:
case GREYBUS_PROTOCOL_HID:
case GREYBUS_PROTOCOL_VENDOR:
diff --git a/drivers/staging/greybus/gpio-gb.c b/drivers/staging/greybus/gpio-gb.c
index da20028..7f03676 100644
--- a/drivers/staging/greybus/gpio-gb.c
+++ b/drivers/staging/greybus/gpio-gb.c
@@ -12,101 +12,804 @@
#include <linux/gpio.h>
#include "greybus.h"
-struct gb_gpio_device {
- struct gpio_chip chip;
- struct gb_module *gmod;
- struct gpio_chip *gpio;
- // FIXME - some lock?
+struct gb_gpio_line {
+ /* The following has to be an array of line_max entries */
+ /* --> make them just a flags field */
+ u8 active: 1,
+ direction: 1, /* 0 = output, 1 = input */
+ value: 1; /* 0 = low, 1 = high */
+ u16 debounce_usec;
};
-static const struct greybus_module_id id_table[] = {
- { GREYBUS_DEVICE(0x44, 0x44) }, /* make shit up */
- { }, /* terminating NULL entry */
+struct gb_gpio_controller {
+ struct gb_connection *connection;
+ u8 version_major;
+ u8 version_minor;
+ u8 line_max; /* max line number */
+ struct gb_gpio_line *lines;
+
+ struct gpio_chip chip;
+ struct gpio_chip *gpio;
+};
+#define gpio_chip_to_gb_gpio_controller(chip) \
+ container_of(chip, struct gb_gpio_controller, chip)
+
+/* Version of the Greybus GPIO protocol we support */
+#define GB_GPIO_VERSION_MAJOR 0x00
+#define GB_GPIO_VERSION_MINOR 0x01
+
+/* Greybus GPIO request types */
+#define GB_GPIO_TYPE_INVALID 0x00
+#define GB_GPIO_TYPE_PROTOCOL_VERSION 0x01
+#define GB_GPIO_TYPE_LINE_COUNT 0x02
+#define GB_GPIO_TYPE_ACTIVATE 0x03
+#define GB_GPIO_TYPE_DEACTIVATE 0x04
+#define GB_GPIO_TYPE_GET_DIRECTION 0x05
+#define GB_GPIO_TYPE_DIRECTION_IN 0x06
+#define GB_GPIO_TYPE_DIRECTION_OUT 0x07
+#define GB_GPIO_TYPE_GET_VALUE 0x08
+#define GB_GPIO_TYPE_SET_VALUE 0x09
+#define GB_GPIO_TYPE_SET_DEBOUNCE 0x0a
+#define GB_GPIO_TYPE_RESPONSE 0x80 /* OR'd with rest */
+
+#define GB_GPIO_DEBOUNCE_USEC_DEFAULT 0 /* microseconds */
+
+/* version request has no payload */
+struct gb_gpio_proto_version_response {
+ __u8 status;
+ __u8 major;
+ __u8 minor;
};
-static int direction_input(struct gpio_chip *gpio, unsigned nr)
+/* line count request has no payload */
+struct gb_gpio_line_count_response {
+ __u8 status;
+ __u8 count;
+};
+
+struct gb_gpio_activate_request {
+ __u8 which;
+};
+struct gb_gpio_activate_response {
+ __u8 status;
+};
+
+struct gb_gpio_deactivate_request {
+ __u8 which;
+};
+struct gb_gpio_deactivate_response {
+ __u8 status;
+};
+
+struct gb_gpio_get_direction_request {
+ __u8 which;
+};
+struct gb_gpio_get_direction_response {
+ __u8 status;
+ __u8 direction;
+};
+
+struct gb_gpio_direction_in_request {
+ __u8 which;
+};
+struct gb_gpio_direction_in_response {
+ __u8 status;
+};
+
+struct gb_gpio_direction_out_request {
+ __u8 which;
+ __u8 value;
+};
+struct gb_gpio_direction_out_response {
+ __u8 status;
+};
+
+struct gb_gpio_get_value_request {
+ __u8 status;
+ __u8 which;
+};
+struct gb_gpio_get_value_response {
+ __u8 status;
+ __u8 value;
+};
+
+struct gb_gpio_set_value_request {
+ __u8 which;
+ __u8 value;
+};
+struct gb_gpio_set_value_response {
+ __u8 status;
+};
+
+struct gb_gpio_set_debounce_request {
+ __u8 which;
+ __le16 usec;
+};
+struct gb_gpio_set_debounce_response {
+ __u8 status;
+};
+
+
+/*
+ * This request only uses the connection field, and if successful,
+ * fills in the major and minor protocol version of the target.
+ */
+static int gb_gpio_proto_version_operation(struct gb_gpio_controller *gb_gpio_controller)
{
- //struct gb_gpio_device *gb_gpio_dev = container_of(gpio, struct gb_gpio_device, chip);
+ struct gb_connection *connection = gb_gpio_controller->connection;
+ struct gb_operation *operation;
+ struct gb_gpio_proto_version_response *response;
+ int ret;
- // FIXME - do something there
- return 0;
-}
-
-static int direction_output(struct gpio_chip *gpio, unsigned nr, int val)
-{
- // FIXME - do something there
- return 0;
-}
-
-static int gpio_get(struct gpio_chip *gpio, unsigned nr)
-{
- // FIXME - do something there
- return 0;
-}
-
-static void gpio_set(struct gpio_chip *gpio, unsigned nr, int val)
-{
- // FIXME - do something there
-}
-
-int gb_gpio_probe(struct gb_module *gmod,
- const struct greybus_module_id *id)
-{
- struct gb_gpio_device *gb_gpio;
- struct gpio_chip *gpio;
- struct device *dev = &gmod->dev;
- int retval;
-
- gb_gpio = kzalloc(sizeof(*gb_gpio), GFP_KERNEL);
- if (!gb_gpio)
+ /* protocol version request has no payload */
+ operation = gb_operation_create(connection,
+ GB_GPIO_TYPE_PROTOCOL_VERSION,
+ 0, sizeof(*response));
+ if (!operation)
return -ENOMEM;
- gb_gpio->gmod = gmod;
- gpio = &gb_gpio->chip;
-
- gpio->label = "greybus_gpio";
- gpio->owner = THIS_MODULE;
- gpio->direction_input = direction_input;
- gpio->direction_output = direction_output;
- gpio->get = gpio_get;
- gpio->set = gpio_set;
- gpio->dbg_show = NULL;
- gpio->base = 0; // FIXME!!!
- gpio->ngpio = 42; // FIXME!!!
- gpio->can_sleep = false; // FIXME!!!
-
- gmod->gb_gpio_dev = gb_gpio;
-
- retval = gpiochip_add(gpio);
- if (retval) {
- dev_err(dev, "Failed to register GPIO\n");
- return retval;
+ /* Synchronous operation--no callback */
+ ret = gb_operation_request_send(operation, NULL);
+ if (ret) {
+ pr_err("version operation failed (%d)\n", ret);
+ goto out;
}
+ response = operation->response_payload;
+ if (response->status) {
+ gb_connection_err(connection, "version response %hhu",
+ response->status);
+ ret = -EIO;
+ } else {
+ if (response->major > GB_GPIO_VERSION_MAJOR) {
+ pr_err("unsupported major version (%hhu > %hhu)\n",
+ response->major, GB_GPIO_VERSION_MAJOR);
+ ret = -ENOTSUPP;
+ goto out;
+ }
+ gb_gpio_controller->version_major = response->major;
+ gb_gpio_controller->version_minor = response->minor;
+printk("%s: version_major = %u version_minor = %u\n", __func__,
+ gb_gpio_controller->version_major, gb_gpio_controller->version_minor);
+ }
+out:
+ gb_operation_destroy(operation);
+
+ return ret;
+}
+
+static int gb_gpio_line_count_operation(struct gb_gpio_controller *gb_gpio_controller)
+{
+ struct gb_connection *connection = gb_gpio_controller->connection;
+ struct gb_operation *operation;
+ struct gb_gpio_line_count_response *response;
+ int ret;
+
+ /* line count request has no payload */
+ operation = gb_operation_create(connection,
+ GB_GPIO_TYPE_LINE_COUNT,
+ 0, sizeof(*response));
+ if (!operation)
+ return -ENOMEM;
+
+ /* Synchronous operation--no callback */
+ ret = gb_operation_request_send(operation, NULL);
+ if (ret) {
+ pr_err("line count operation failed (%d)\n", ret);
+ goto out;
+ }
+
+ response = operation->response_payload;
+ if (response->status) {
+ gb_connection_err(connection, "line count response %hhu",
+ response->status);
+ ret = -EIO;
+ } else {
+ gb_gpio_controller->line_max = response->count;
+printk("%s: count = %u\n", __func__,
+ gb_gpio_controller->line_max + 1);
+ }
+out:
+ gb_operation_destroy(operation);
+
+ return ret;
+}
+
+static int gb_gpio_activate_operation(struct gb_gpio_controller *gb_gpio_controller,
+ u8 which)
+{
+ struct gb_connection *connection = gb_gpio_controller->connection;
+ struct gb_operation *operation;
+ struct gb_gpio_activate_request *request;
+ struct gb_gpio_activate_response *response;
+ int ret;
+
+ if (which > gb_gpio_controller->line_max)
+ return -EINVAL;
+
+ /* activate response has no payload */
+ operation = gb_operation_create(connection,
+ GB_GPIO_TYPE_ACTIVATE,
+ sizeof(*request), sizeof(*response));
+ if (!operation)
+ return -ENOMEM;
+ request = operation->request_payload;
+ request->which = which;
+
+ /* Synchronous operation--no callback */
+ ret = gb_operation_request_send(operation, NULL);
+ if (ret) {
+ pr_err("activate operation failed (%d)\n", ret);
+ goto out;
+ }
+
+ response = operation->response_payload;
+ if (response->status) {
+ gb_connection_err(connection, "activate response %hhu",
+ response->status);
+ ret = -EIO;
+ } else {
+ gb_gpio_controller->lines[which].active = true;
+printk("%s: %u is now active\n", __func__, which);
+ }
+out:
+ gb_operation_destroy(operation);
+
+ return ret;
+}
+
+static int gb_gpio_deactivate_operation(struct gb_gpio_controller *gb_gpio_controller,
+ u8 which)
+{
+ struct gb_connection *connection = gb_gpio_controller->connection;
+ struct gb_operation *operation;
+ struct gb_gpio_deactivate_request *request;
+ struct gb_gpio_deactivate_response *response;
+ int ret;
+
+ if (which > gb_gpio_controller->line_max)
+ return -EINVAL;
+
+ /* deactivate response has no payload */
+ operation = gb_operation_create(connection,
+ GB_GPIO_TYPE_DEACTIVATE,
+ sizeof(*request), sizeof(*response));
+ if (!operation)
+ return -ENOMEM;
+ request = operation->request_payload;
+ request->which = which;
+
+ /* Synchronous operation--no callback */
+ ret = gb_operation_request_send(operation, NULL);
+ if (ret) {
+ pr_err("deactivate operation failed (%d)\n", ret);
+ goto out;
+ }
+
+ response = operation->response_payload;
+ if (response->status) {
+ gb_connection_err(connection, "deactivate response %hhu",
+ response->status);
+ ret = -EIO;
+ } else {
+ gb_gpio_controller->lines[which].active = false;
+printk("%s: %u is now inactive\n", __func__, which);
+ }
+out:
+ gb_operation_destroy(operation);
+
+ return ret;
+}
+
+static int gb_gpio_get_direction_operation(struct gb_gpio_controller *gb_gpio_controller,
+ u8 which)
+{
+ struct gb_connection *connection = gb_gpio_controller->connection;
+ struct gb_operation *operation;
+ struct gb_gpio_get_direction_request *request;
+ struct gb_gpio_get_direction_response *response;
+ int ret;
+
+ if (which > gb_gpio_controller->line_max)
+ return -EINVAL;
+
+ operation = gb_operation_create(connection,
+ GB_GPIO_TYPE_GET_DIRECTION,
+ sizeof(*request), sizeof(*response));
+ if (!operation)
+ return -ENOMEM;
+ request = operation->request_payload;
+ request->which = which;
+
+ /* Synchronous operation--no callback */
+ ret = gb_operation_request_send(operation, NULL);
+ if (ret) {
+ pr_err("get direction operation failed (%d)\n", ret);
+ goto out;
+ }
+
+ response = operation->response_payload;
+ if (response->status) {
+ gb_connection_err(connection, "get direction response %hhu",
+ response->status);
+ ret = -EIO;
+ } else {
+ u8 direction = response->direction;
+
+ if (direction && direction != 1)
+ pr_warn("gpio %u direction was %u (should be 0 or 1)\n",
+ which, direction);
+ gb_gpio_controller->lines[which].direction = direction ? 1 : 0;
+printk("%s: direction of %u is %s\n", __func__, which,
+ direction ? "in" : "out");
+ }
+out:
+ gb_operation_destroy(operation);
+
+ return ret;
+}
+
+static int gb_gpio_direction_in_operation(struct gb_gpio_controller *gb_gpio_controller,
+ u8 which)
+{
+ struct gb_connection *connection = gb_gpio_controller->connection;
+ struct gb_operation *operation;
+ struct gb_gpio_direction_in_request *request;
+ struct gb_gpio_direction_in_response *response;
+ int ret;
+
+ if (which > gb_gpio_controller->line_max)
+ return -EINVAL;
+
+ /* direction_in response has no payload */
+ operation = gb_operation_create(connection,
+ GB_GPIO_TYPE_DIRECTION_IN,
+ sizeof(*request), sizeof(*response));
+ if (!operation)
+ return -ENOMEM;
+ request = operation->request_payload;
+ request->which = which;
+
+ /* Synchronous operation--no callback */
+ ret = gb_operation_request_send(operation, NULL);
+ if (ret) {
+ pr_err("direction in operation failed (%d)\n", ret);
+ goto out;
+ }
+
+ response = operation->response_payload;
+ if (response->status) {
+ gb_connection_err(connection, "direction in response %hhu",
+ response->status);
+ ret = -EIO;
+ } else {
+ gb_gpio_controller->lines[which].direction = 1;
+printk("%s: direction of %u is now in\n", __func__, which);
+ }
+out:
+ gb_operation_destroy(operation);
+
+ return ret;
+}
+
+static int gb_gpio_direction_out_operation(struct gb_gpio_controller *gb_gpio_controller,
+ u8 which, bool value_high)
+{
+ struct gb_connection *connection = gb_gpio_controller->connection;
+ struct gb_operation *operation;
+ struct gb_gpio_direction_out_request *request;
+ struct gb_gpio_direction_out_response *response;
+ int ret;
+
+ if (which > gb_gpio_controller->line_max)
+ return -EINVAL;
+
+ /* direction_out response has no payload */
+ operation = gb_operation_create(connection,
+ GB_GPIO_TYPE_DIRECTION_OUT,
+ sizeof(*request), sizeof(*response));
+ if (!operation)
+ return -ENOMEM;
+ request = operation->request_payload;
+ request->which = which;
+ request->value = value_high ? 1 : 0;
+
+ /* Synchronous operation--no callback */
+ ret = gb_operation_request_send(operation, NULL);
+ if (ret) {
+ pr_err("direction out operation failed (%d)\n", ret);
+ goto out;
+ }
+
+ response = operation->response_payload;
+ if (response->status) {
+ gb_connection_err(connection, "direction out response %hhu",
+ response->status);
+ ret = -EIO;
+ } else {
+ gb_gpio_controller->lines[which].direction = 0;
+printk("%s: direction of %u is now out, value %s\n", __func__,
+ which, value_high ? "high" : "low");
+ }
+out:
+ gb_operation_destroy(operation);
+
+ return ret;
+}
+
+static int gb_gpio_get_value_operation(struct gb_gpio_controller *gb_gpio_controller,
+ u8 which)
+{
+ struct gb_connection *connection = gb_gpio_controller->connection;
+ struct gb_operation *operation;
+ struct gb_gpio_get_value_request *request;
+ struct gb_gpio_get_value_response *response;
+ int ret;
+
+ if (which > gb_gpio_controller->line_max)
+ return -EINVAL;
+
+ operation = gb_operation_create(connection,
+ GB_GPIO_TYPE_GET_VALUE,
+ sizeof(*request), sizeof(*response));
+ if (!operation)
+ return -ENOMEM;
+ request = operation->request_payload;
+ request->which = which;
+
+ /* Synchronous operation--no callback */
+ ret = gb_operation_request_send(operation, NULL);
+ if (ret) {
+ pr_err("get value operation failed (%d)\n", ret);
+ goto out;
+ }
+
+ response = operation->response_payload;
+ if (response->status) {
+ gb_connection_err(connection, "get value response %hhu",
+ response->status);
+ ret = -EIO;
+ } else {
+ u8 value = response->value;
+
+ if (value && value != 1)
+ pr_warn("gpio %u value was %u (should be 0 or 1)\n",
+ which, value);
+ gb_gpio_controller->lines[which].value = value ? 1 : 0;
+ /* XXX should this set direction to out? */
+printk("%s: value of %u is %s\n", __func__,
+ which, gb_gpio_controller->lines[which].value ? "high" : "low");
+ }
+out:
+ gb_operation_destroy(operation);
+
+ return ret;
+}
+
+static int gb_gpio_set_value_operation(struct gb_gpio_controller *gb_gpio_controller,
+ u8 which, bool value_high)
+{
+ struct gb_connection *connection = gb_gpio_controller->connection;
+ struct gb_operation *operation;
+ struct gb_gpio_set_value_request *request;
+ struct gb_gpio_set_value_response *response;
+ int ret;
+
+ if (which > gb_gpio_controller->line_max)
+ return -EINVAL;
+
+ /* set_value response has no payload */
+ operation = gb_operation_create(connection,
+ GB_GPIO_TYPE_SET_VALUE,
+ sizeof(*request), sizeof(*response));
+ if (!operation)
+ return -ENOMEM;
+ request = operation->request_payload;
+ request->which = which;
+ request->value = value_high ? 1 : 0;
+
+ /* Synchronous operation--no callback */
+ ret = gb_operation_request_send(operation, NULL);
+ if (ret) {
+ pr_err("set value operation failed (%d)\n", ret);
+ goto out;
+ }
+
+ response = operation->response_payload;
+ if (response->status) {
+ gb_connection_err(connection, "set value response %hhu",
+ response->status);
+ ret = -EIO;
+ } else {
+ /* XXX should this set direction to out? */
+ gb_gpio_controller->lines[which].value = request->value;
+printk("%s: out value of %u is now %s\n", __func__,
+ which, gb_gpio_controller->lines[which].value ? "high" : "low");
+ }
+out:
+ gb_operation_destroy(operation);
+
+ return ret;
+}
+
+static int gb_gpio_set_debounce_operation(struct gb_gpio_controller *gb_gpio_controller,
+ u8 which, u16 debounce_usec)
+{
+ struct gb_connection *connection = gb_gpio_controller->connection;
+ struct gb_operation *operation;
+ struct gb_gpio_set_debounce_request *request;
+ struct gb_gpio_set_debounce_response *response;
+ int ret;
+
+ if (which > gb_gpio_controller->line_max)
+ return -EINVAL;
+
+ /* set_debounce response has no payload */
+ operation = gb_operation_create(connection,
+ GB_GPIO_TYPE_SET_DEBOUNCE,
+ sizeof(*request), sizeof(*response));
+ if (!operation)
+ return -ENOMEM;
+ request = operation->request_payload;
+ request->which = which;
+ request->usec = le16_to_cpu(debounce_usec);
+
+ /* Synchronous operation--no callback */
+ ret = gb_operation_request_send(operation, NULL);
+ if (ret) {
+ pr_err("set debounce operation failed (%d)\n", ret);
+ goto out;
+ }
+
+ response = operation->response_payload;
+ if (response->status) {
+ gb_connection_err(connection, "set debounce response %hhu",
+ response->status);
+ ret = -EIO;
+ } else {
+ gb_gpio_controller->lines[which].debounce_usec = request->usec;
+printk("%s: debounce of %u is now %hu usec\n", __func__,
+ which, gb_gpio_controller->lines[which].debounce_usec);
+ }
+out:
+ gb_operation_destroy(operation);
+
+ return ret;
+}
+
+static int gb_gpio_request(struct gpio_chip *chip, unsigned offset)
+{
+ struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip);
+ u8 which;
+ int ret;
+
+ if (offset < chip->base || offset >= chip->base + chip->ngpio)
+ return -EINVAL;
+ which = (u8)(offset - chip->base);
+ ret = gb_gpio_activate_operation(gb_gpio_controller, which);
+ if (ret)
+ ; /* return ret; */
return 0;
}
-void gb_gpio_disconnect(struct gb_module *gmod)
+static void gb_gpio_free(struct gpio_chip *chip, unsigned offset)
{
- struct gb_gpio_device *gb_gpio_dev;
- int retval;
+ struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip);
+ u8 which;
+ int ret;
- gb_gpio_dev = gmod->gb_gpio_dev;
- if (!gb_gpio_dev)
+ if (offset < chip->base || offset >= chip->base + chip->ngpio) {
+ pr_err("bad offset %u supplied (must be %u..%u)\n",
+ offset, chip->base, chip->base + chip->ngpio - 1);
+ return;
+ }
+ which = (u8)(offset - chip->base);
+ ret = gb_gpio_deactivate_operation(gb_gpio_controller, which);
+ if (ret)
+ ; /* return ret; */
+}
+
+static int gb_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
+{
+ struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip);
+ u8 which;
+ int ret;
+
+ if (offset < chip->base || offset >= chip->base + chip->ngpio)
+ return -EINVAL;
+ which = (u8)(offset - chip->base);
+ ret = gb_gpio_get_direction_operation(gb_gpio_controller, which);
+ if (ret)
+ ; /* return ret; */
+ return gb_gpio_controller->lines[which].direction ? 1 : 0;
+}
+
+static int gb_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
+{
+ struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip);
+ u8 which;
+ int ret;
+
+ if (offset < chip->base || offset >= chip->base + chip->ngpio)
+ return -EINVAL;
+ which = (u8)(offset - chip->base);
+ ret = gb_gpio_direction_in_operation(gb_gpio_controller, which);
+ if (ret)
+ ; /* return ret; */
+ return 0;
+}
+
+static int gb_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
+ int value)
+{
+ struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip);
+ u8 which;
+ int ret;
+
+ if (offset < chip->base || offset >= chip->base + chip->ngpio)
+ return -EINVAL;
+ which = (u8)(offset - chip->base);
+ ret = gb_gpio_direction_out_operation(gb_gpio_controller, which, !!value);
+ if (ret)
+ ; /* return ret; */
+ return 0;
+}
+
+static int gb_gpio_get(struct gpio_chip *chip, unsigned offset)
+{
+ struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip);
+ u8 which;
+ int ret;
+
+ if (offset < chip->base || offset >= chip->base + chip->ngpio)
+ return -EINVAL;
+ which = (u8)(offset - chip->base);
+ ret = gb_gpio_get_value_operation(gb_gpio_controller, which);
+ if (ret)
+ return ret;
+ return (int)gb_gpio_controller->lines[which].value;
+}
+
+static void gb_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
+{
+ struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip);
+ u8 which;
+ int ret;
+
+ if (offset < chip->base || offset >= chip->base + chip->ngpio) {
+ pr_err("bad offset %u supplied (must be %u..%u)\n",
+ offset, chip->base, chip->base + chip->ngpio - 1);
+ return;
+ }
+ which = (u8)(offset - chip->base);
+ ret = gb_gpio_set_value_operation(gb_gpio_controller, which, !!value);
+ if (ret)
+ ; /* return ret; */
+}
+
+static int gb_gpio_set_debounce(struct gpio_chip *chip, unsigned offset,
+ unsigned debounce)
+{
+ struct gb_gpio_controller *gb_gpio_controller = gpio_chip_to_gb_gpio_controller(chip);
+ u16 usec;
+ u8 which;
+ int ret;
+
+ if (offset < chip->base || offset >= chip->base + chip->ngpio)
+ return -EINVAL;
+ which = (u8)(offset - chip->base);
+ if (debounce > (unsigned int)U16_MAX)
+ return -EINVAL;
+ usec = (u8)debounce;
+ ret = gb_gpio_set_debounce_operation(gb_gpio_controller, which, usec);
+ if (ret)
+ ; /* return ret; */
+
+ return 0; /* XXX */
+}
+
+static int gb_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
+{
+ u8 which;
+
+ if (offset < chip->base || offset >= chip->base + chip->ngpio)
+ return -EINVAL;
+ which = (u8)(offset - chip->base);
+
+ return 0; /* XXX */
+}
+
+static void gb_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
+{
+ return; /* XXX */
+}
+
+int gb_gpio_controller_setup(struct gb_gpio_controller *gb_gpio_controller)
+{
+ u32 line_count;
+ size_t size;
+ int ret;
+
+ /* First thing we need to do is check the version */
+ ret = gb_gpio_proto_version_operation(gb_gpio_controller);
+ if (ret)
+ ; /* return ret; */
+
+ /* Now find out how many lines there are */
+ ret = gb_gpio_line_count_operation(gb_gpio_controller);
+ if (ret)
+ ; /* return ret; */
+ line_count = (u32)gb_gpio_controller->line_max + 1;
+ size = line_count * sizeof(*gb_gpio_controller->lines);
+ gb_gpio_controller->lines = kzalloc(size, GFP_KERNEL);
+ if (!gb_gpio_controller->lines)
+ return -ENOMEM;
+
+ return ret;
+}
+
+int gb_gpio_controller_init(struct gb_connection *connection)
+{
+ struct gb_gpio_controller *gb_gpio_controller;
+ struct gpio_chip *gpio;
+ int ret;
+
+ gb_gpio_controller = kzalloc(sizeof(*gb_gpio_controller), GFP_KERNEL);
+ if (!gb_gpio_controller)
+ return -ENOMEM;
+ gb_gpio_controller->connection = connection;
+
+ ret = gb_gpio_controller_setup(gb_gpio_controller);
+ if (ret)
+ goto out_err;
+
+ gpio = &gb_gpio_controller->chip;
+
+ gpio->label = "greybus_gpio";
+ gpio->owner = THIS_MODULE; /* XXX Module get? */
+
+ gpio->request = gb_gpio_request;
+ gpio->free = gb_gpio_free;
+ gpio->get_direction = gb_gpio_get_direction;
+ gpio->direction_input = gb_gpio_direction_input;
+ gpio->direction_output = gb_gpio_direction_output;
+ gpio->get = gb_gpio_get;
+ gpio->set = gb_gpio_set;
+ gpio->set_debounce = gb_gpio_set_debounce;
+ gpio->to_irq = gb_gpio_to_irq;
+ gpio->dbg_show = gb_gpio_dbg_show;
+
+ gpio->base = -1; /* Allocate base dynamically */
+ gpio->ngpio = gb_gpio_controller->line_max + 1;
+ gpio->can_sleep = true; /* XXX */
+
+ ret = gpiochip_add(gpio);
+ if (ret) {
+ pr_err("Failed to register GPIO\n");
+ return ret;
+ }
+ connection->private = gb_gpio_controller;
+
+ return 0;
+out_err:
+ kfree(gb_gpio_controller);
+ return ret;
+}
+
+void gb_gpio_controller_exit(struct gb_connection *connection)
+{
+ struct gb_gpio_controller *gb_gpio_controller = connection->private;
+ int ret;
+
+ if (!gb_gpio_controller)
return;
- retval = gpiochip_remove(&gb_gpio_dev->chip);
- kfree(gb_gpio_dev);
+ ret = gpiochip_remove(&gb_gpio_controller->chip);
+ /* kref_put(gb_gpio_controller->connection) */
+ kfree(gb_gpio_controller);
}
#if 0
-static struct greybus_driver gpio_gb_driver = {
- .probe = gb_gpio_probe,
- .disconnect = gb_gpio_disconnect,
- .id_table = id_table,
-};
-
-module_greybus_driver(gpio_gb_driver);
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Greybus GPIO driver");
MODULE_AUTHOR("Greg Kroah-Hartman <gregkh@linuxfoundation.org>");
diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h
index 854122b..d4f5d94 100644
--- a/drivers/staging/greybus/greybus.h
+++ b/drivers/staging/greybus/greybus.h
@@ -265,6 +265,7 @@
extern const struct attribute_group *greybus_module_groups[];
int gb_i2c_device_init(struct gb_connection *connection);
+int gb_gpio_controller_init(struct gb_connection *connection);
int gb_tty_init(void);
void gb_tty_exit(void);