Merge tag 'spi-fix-v4.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
[cascardo/linux.git] / drivers / staging / greybus / uart.c
index 60617cb..2633d2b 100644 (file)
 #include <linux/idr.h>
 #include <linux/fs.h>
 #include <linux/kdev_t.h>
+#include <linux/kfifo.h>
+#include <linux/workqueue.h>
+#include <linux/completion.h>
 
 #include "greybus.h"
+#include "gbphy.h"
 
 #define GB_NUM_MINORS  16      /* 16 is is more than enough */
 #define GB_NAME                "ttyGB"
 
+#define GB_UART_WRITE_FIFO_SIZE                PAGE_SIZE
+#define GB_UART_WRITE_ROOM_MARGIN      1       /* leave some space in fifo */
+#define GB_UART_FIRMWARE_CREDITS       4096
+#define GB_UART_CREDIT_WAIT_TIMEOUT_MSEC       10000
+
 struct gb_tty_line_coding {
        __le32  rate;
        __u8    format;
        __u8    parity;
        __u8    data_bits;
+       __u8    flow_control;
 };
 
 struct gb_tty {
+       struct gbphy_device *gbphy_dev;
        struct tty_port port;
        void *buffer;
        size_t buffer_payload_max;
@@ -58,25 +69,47 @@ struct gb_tty {
        u8 ctrlin;      /* input control lines */
        u8 ctrlout;     /* output control lines */
        struct gb_tty_line_coding line_coding;
+       struct work_struct tx_work;
+       struct kfifo write_fifo;
+       bool close_pending;
+       unsigned int credits;
+       struct completion credits_complete;
 };
 
 static struct tty_driver *gb_tty_driver;
 static DEFINE_IDR(tty_minors);
 static DEFINE_MUTEX(table_lock);
-static atomic_t reference_count = ATOMIC_INIT(0);
 
-static int gb_uart_receive_data(struct gb_tty *gb_tty,
-                               struct gb_connection *connection,
-                               struct gb_uart_recv_data_request *receive_data)
+static int gb_uart_receive_data_handler(struct gb_operation *op)
 {
+       struct gb_connection *connection = op->connection;
+       struct gb_tty *gb_tty = gb_connection_get_data(connection);
        struct tty_port *port = &gb_tty->port;
+       struct gb_message *request = op->request;
+       struct gb_uart_recv_data_request *receive_data;
        u16 recv_data_size;
        int count;
        unsigned long tty_flags = TTY_NORMAL;
 
-       count = gb_tty->buffer_payload_max - sizeof(*receive_data);
+       if (request->payload_size < sizeof(*receive_data)) {
+               dev_err(&gb_tty->gbphy_dev->dev,
+                       "short receive-data request received (%zu < %zu)\n",
+                       request->payload_size, sizeof(*receive_data));
+               return -EINVAL;
+       }
+
+       receive_data = op->request->payload;
        recv_data_size = le16_to_cpu(receive_data->size);
-       if (!recv_data_size || recv_data_size > count)
+
+       if (recv_data_size != request->payload_size - sizeof(*receive_data)) {
+               dev_err(&gb_tty->gbphy_dev->dev,
+                       "malformed receive-data request received (%u != %zu)\n",
+                       recv_data_size,
+                       request->payload_size - sizeof(*receive_data));
+               return -EINVAL;
+       }
+
+       if (!recv_data_size)
                return -EINVAL;
 
        if (receive_data->flags) {
@@ -94,7 +127,7 @@ static int gb_uart_receive_data(struct gb_tty *gb_tty,
        count = tty_insert_flip_string_fixed_flag(port, receive_data->data,
                                                  tty_flags, recv_data_size);
        if (count != recv_data_size) {
-               dev_err(&connection->bundle->dev,
+               dev_err(&gb_tty->gbphy_dev->dev,
                        "UART: RX 0x%08x bytes only wrote 0x%08x\n",
                        recv_data_size, count);
        }
@@ -103,25 +136,95 @@ static int gb_uart_receive_data(struct gb_tty *gb_tty,
        return 0;
 }
 
-static int gb_uart_request_recv(u8 type, struct gb_operation *op)
+static int gb_uart_serial_state_handler(struct gb_operation *op)
 {
        struct gb_connection *connection = op->connection;
-       struct gb_tty *gb_tty = connection->private;
+       struct gb_tty *gb_tty = gb_connection_get_data(connection);
        struct gb_message *request = op->request;
        struct gb_uart_serial_state_request *serial_state;
+
+       if (request->payload_size < sizeof(*serial_state)) {
+               dev_err(&gb_tty->gbphy_dev->dev,
+                       "short serial-state event received (%zu < %zu)\n",
+                       request->payload_size, sizeof(*serial_state));
+               return -EINVAL;
+       }
+
+       serial_state = request->payload;
+       gb_tty->ctrlin = serial_state->control;
+
+       return 0;
+}
+
+static int gb_uart_receive_credits_handler(struct gb_operation *op)
+{
+       struct gb_connection *connection = op->connection;
+       struct gb_tty *gb_tty = gb_connection_get_data(connection);
+       struct gb_message *request = op->request;
+       struct gb_uart_receive_credits_request *credit_request;
+       unsigned long flags;
+       unsigned int incoming_credits;
        int ret = 0;
 
+       if (request->payload_size < sizeof(*credit_request)) {
+               dev_err(&gb_tty->gbphy_dev->dev,
+                       "short receive_credits event received (%zu < %zu)\n",
+                       request->payload_size,
+                       sizeof(*credit_request));
+               return -EINVAL;
+       }
+
+       credit_request = request->payload;
+       incoming_credits = le16_to_cpu(credit_request->count);
+
+       spin_lock_irqsave(&gb_tty->write_lock, flags);
+       gb_tty->credits += incoming_credits;
+       if (gb_tty->credits > GB_UART_FIRMWARE_CREDITS) {
+               gb_tty->credits -= incoming_credits;
+               ret = -EINVAL;
+       }
+       spin_unlock_irqrestore(&gb_tty->write_lock, flags);
+
+       if (ret) {
+               dev_err(&gb_tty->gbphy_dev->dev,
+                       "invalid number of incoming credits: %d\n",
+                       incoming_credits);
+               return ret;
+       }
+
+       if (!gb_tty->close_pending)
+               schedule_work(&gb_tty->tx_work);
+
+       /*
+        * the port the tty layer may be waiting for credits
+        */
+       tty_port_tty_wakeup(&gb_tty->port);
+
+       if (gb_tty->credits == GB_UART_FIRMWARE_CREDITS)
+               complete(&gb_tty->credits_complete);
+
+       return ret;
+}
+
+static int gb_uart_request_handler(struct gb_operation *op)
+{
+       struct gb_connection *connection = op->connection;
+       struct gb_tty *gb_tty = gb_connection_get_data(connection);
+       int type = op->type;
+       int ret;
+
        switch (type) {
        case GB_UART_TYPE_RECEIVE_DATA:
-               ret = gb_uart_receive_data(gb_tty, connection,
-                                          request->payload);
+               ret = gb_uart_receive_data_handler(op);
                break;
        case GB_UART_TYPE_SERIAL_STATE:
-               serial_state = request->payload;
-               gb_tty->ctrlin = serial_state->control;
+               ret = gb_uart_serial_state_handler(op);
+               break;
+       case GB_UART_TYPE_RECEIVE_CREDITS:
+               ret = gb_uart_receive_credits_handler(op);
                break;
        default:
-               dev_err(&connection->bundle->dev,
+               dev_err(&gb_tty->gbphy_dev->dev,
                        "unsupported unsolicited request: 0x%02x\n", type);
                ret = -EINVAL;
        }
@@ -129,25 +232,60 @@ static int gb_uart_request_recv(u8 type, struct gb_operation *op)
        return ret;
 }
 
-static int send_data(struct gb_tty *tty, u16 size, const u8 *data)
+static void  gb_uart_tx_write_work(struct work_struct *work)
 {
        struct gb_uart_send_data_request *request;
+       struct gb_tty *gb_tty;
+       unsigned long flags;
+       unsigned int send_size;
        int ret;
 
-       if (!data || !size)
-               return 0;
+       gb_tty = container_of(work, struct gb_tty, tx_work);
+       request = gb_tty->buffer;
 
-       if (size > tty->buffer_payload_max)
-               size = tty->buffer_payload_max;
-       request = tty->buffer;
-       request->size = cpu_to_le16(size);
-       memcpy(&request->data[0], data, size);
-       ret = gb_operation_sync(tty->connection, GB_UART_TYPE_SEND_DATA,
-                               request, sizeof(*request) + size, NULL, 0);
-       if (ret)
-               return ret;
-       else
-               return size;
+       while (1) {
+               if (gb_tty->close_pending)
+                       break;
+
+               spin_lock_irqsave(&gb_tty->write_lock, flags);
+               send_size = gb_tty->buffer_payload_max;
+               if (send_size > gb_tty->credits)
+                       send_size = gb_tty->credits;
+
+               send_size = kfifo_out_peek(&gb_tty->write_fifo,
+                                          &request->data[0],
+                                          send_size);
+               if (!send_size) {
+                       spin_unlock_irqrestore(&gb_tty->write_lock, flags);
+                       break;
+               }
+
+               gb_tty->credits -= send_size;
+               spin_unlock_irqrestore(&gb_tty->write_lock, flags);
+
+               request->size = cpu_to_le16(send_size);
+               ret = gb_operation_sync(gb_tty->connection,
+                                       GB_UART_TYPE_SEND_DATA,
+                                       request, sizeof(*request) + send_size,
+                                       NULL, 0);
+               if (ret) {
+                       dev_err(&gb_tty->gbphy_dev->dev,
+                               "send data error: %d\n", ret);
+                       spin_lock_irqsave(&gb_tty->write_lock, flags);
+                       gb_tty->credits += send_size;
+                       spin_unlock_irqrestore(&gb_tty->write_lock, flags);
+                       if (!gb_tty->close_pending)
+                               schedule_work(work);
+                       return;
+               }
+
+               spin_lock_irqsave(&gb_tty->write_lock, flags);
+               ret = kfifo_out(&gb_tty->write_fifo, &request->data[0],
+                               send_size);
+               spin_unlock_irqrestore(&gb_tty->write_lock, flags);
+
+               tty_port_tty_wakeup(&gb_tty->port);
+       }
 }
 
 static int send_line_coding(struct gb_tty *tty)
@@ -175,7 +313,7 @@ static int send_break(struct gb_tty *gb_tty, u8 state)
        struct gb_uart_set_break_request request;
 
        if ((state != 0) && (state != 1)) {
-               dev_err(&gb_tty->connection->bundle->dev,
+               dev_err(&gb_tty->gbphy_dev->dev,
                        "invalid break state of %d\n", state);
                return -EINVAL;
        }
@@ -185,8 +323,34 @@ static int send_break(struct gb_tty *gb_tty, u8 state)
                                 &request, sizeof(request), NULL, 0);
 }
 
+static int gb_uart_wait_for_all_credits(struct gb_tty *gb_tty)
+{
+       int ret;
+
+       if (gb_tty->credits == GB_UART_FIRMWARE_CREDITS)
+               return 0;
+
+       ret = wait_for_completion_timeout(&gb_tty->credits_complete,
+                       msecs_to_jiffies(GB_UART_CREDIT_WAIT_TIMEOUT_MSEC));
+       if (!ret) {
+               dev_err(&gb_tty->gbphy_dev->dev,
+                       "time out waiting for credits\n");
+               return -ETIMEDOUT;
+       }
+
+       return 0;
+}
+
+static int gb_uart_flush(struct gb_tty *gb_tty, u8 flags)
+{
+       struct gb_uart_serial_flush_request request;
+
+       request.flags = flags;
+       return gb_operation_sync(gb_tty->connection, GB_UART_TYPE_FLUSH_FIFOS,
+                                &request, sizeof(request), NULL, 0);
+}
 
-static struct gb_tty *get_gb_by_minor(unsigned minor)
+static struct gb_tty *get_gb_by_minor(unsigned int minor)
 {
        struct gb_tty *gb_tty;
 
@@ -281,19 +445,44 @@ static int gb_tty_write(struct tty_struct *tty, const unsigned char *buf,
 {
        struct gb_tty *gb_tty = tty->driver_data;
 
-       return send_data(gb_tty, count, buf);
+       count =  kfifo_in_spinlocked(&gb_tty->write_fifo, buf, count,
+                                    &gb_tty->write_lock);
+       if (count && !gb_tty->close_pending)
+               schedule_work(&gb_tty->tx_work);
+
+       return count;
 }
 
 static int gb_tty_write_room(struct tty_struct *tty)
 {
        struct gb_tty *gb_tty = tty->driver_data;
+       unsigned long flags;
+       int room;
+
+       spin_lock_irqsave(&gb_tty->write_lock, flags);
+       room = kfifo_avail(&gb_tty->write_fifo);
+       spin_unlock_irqrestore(&gb_tty->write_lock, flags);
+
+       room -= GB_UART_WRITE_ROOM_MARGIN;
+       if (room < 0)
+               return 0;
 
-       return gb_tty->buffer_payload_max;
+       return room;
 }
 
 static int gb_tty_chars_in_buffer(struct tty_struct *tty)
 {
-       return 0;
+       struct gb_tty *gb_tty = tty->driver_data;
+       unsigned long flags;
+       int chars;
+
+       spin_lock_irqsave(&gb_tty->write_lock, flags);
+       chars = kfifo_len(&gb_tty->write_fifo);
+       if (gb_tty->credits < GB_UART_FIRMWARE_CREDITS)
+               chars += GB_UART_FIRMWARE_CREDITS - gb_tty->credits;
+       spin_unlock_irqrestore(&gb_tty->write_lock, flags);
+
+       return chars;
 }
 
 static int gb_tty_break_ctl(struct tty_struct *tty, int state)
@@ -339,9 +528,9 @@ static void gb_tty_set_termios(struct tty_struct *tty,
 
        if (C_BAUD(tty) == B0) {
                newline.rate = gb_tty->line_coding.rate;
-               newctrl &= GB_UART_CTRL_DTR;
+               newctrl &= ~(GB_UART_CTRL_DTR | GB_UART_CTRL_RTS);
        } else if (termios_old && (termios_old->c_cflag & CBAUD) == B0) {
-               newctrl |= GB_UART_CTRL_DTR;
+               newctrl |= (GB_UART_CTRL_DTR | GB_UART_CTRL_RTS);
        }
 
        if (newctrl != gb_tty->ctrlout) {
@@ -349,7 +538,12 @@ static void gb_tty_set_termios(struct tty_struct *tty,
                send_control(gb_tty, newctrl);
        }
 
-       if (memcpy(&gb_tty->line_coding, &newline, sizeof(newline))) {
+       if (C_CRTSCTS(tty) && C_BAUD(tty) != B0)
+               newline.flow_control |= GB_SERIAL_AUTO_RTSCTS_EN;
+       else
+               newline.flow_control &= ~GB_SERIAL_AUTO_RTSCTS_EN;
+
+       if (memcmp(&gb_tty->line_coding, &newline, sizeof(newline))) {
                memcpy(&gb_tty->line_coding, &newline, sizeof(newline));
                send_line_coding(gb_tty);
        }
@@ -403,7 +597,6 @@ static void gb_tty_throttle(struct tty_struct *tty)
                gb_tty->ctrlout &= ~GB_UART_CTRL_RTS;
                retval = send_control(gb_tty, gb_tty->ctrlout);
        }
-
 }
 
 static void gb_tty_unthrottle(struct tty_struct *tty)
@@ -561,6 +754,65 @@ static int gb_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
        return -ENOIOCTLCMD;
 }
 
+static void gb_tty_dtr_rts(struct tty_port *port, int on)
+{
+       struct gb_tty *gb_tty;
+       u8 newctrl;
+
+       gb_tty = container_of(port, struct gb_tty, port);
+       newctrl = gb_tty->ctrlout;
+
+       if (on)
+               newctrl |= (GB_UART_CTRL_DTR | GB_UART_CTRL_RTS);
+       else
+               newctrl &= ~(GB_UART_CTRL_DTR | GB_UART_CTRL_RTS);
+
+       gb_tty->ctrlout = newctrl;
+       send_control(gb_tty, newctrl);
+}
+
+static int gb_tty_port_activate(struct tty_port *port,
+                               struct tty_struct *tty)
+{
+       struct gb_tty *gb_tty;
+
+       gb_tty = container_of(port, struct gb_tty, port);
+
+       return gbphy_runtime_get_sync(gb_tty->gbphy_dev);
+}
+
+static void gb_tty_port_shutdown(struct tty_port *port)
+{
+       struct gb_tty *gb_tty;
+       unsigned long flags;
+       int ret;
+
+       gb_tty = container_of(port, struct gb_tty, port);
+
+       gb_tty->close_pending = true;
+
+       cancel_work_sync(&gb_tty->tx_work);
+
+       spin_lock_irqsave(&gb_tty->write_lock, flags);
+       kfifo_reset_out(&gb_tty->write_fifo);
+       spin_unlock_irqrestore(&gb_tty->write_lock, flags);
+
+       if (gb_tty->credits == GB_UART_FIRMWARE_CREDITS)
+               goto out;
+
+       ret = gb_uart_flush(gb_tty, GB_SERIAL_FLAG_FLUSH_TRANSMITTER);
+       if (ret) {
+               dev_err(&gb_tty->gbphy_dev->dev,
+                       "error flushing transmitter: %d\n", ret);
+       }
+
+       gb_uart_wait_for_all_credits(gb_tty);
+
+out:
+       gb_tty->close_pending = false;
+
+       gbphy_runtime_put_autosuspend(gb_tty->gbphy_dev);
+}
 
 static const struct tty_operations gb_ops = {
        .install =              gb_tty_install,
@@ -580,38 +832,38 @@ static const struct tty_operations gb_ops = {
        .tiocmset =             gb_tty_tiocmset,
 };
 
-static struct tty_port_operations null_ops = { };
-
-static int gb_tty_init(void);
-static void gb_tty_exit(void);
+static struct tty_port_operations gb_port_ops = {
+       .dtr_rts =              gb_tty_dtr_rts,
+       .activate =             gb_tty_port_activate,
+       .shutdown =             gb_tty_port_shutdown,
+};
 
-static int gb_uart_connection_init(struct gb_connection *connection)
+static int gb_uart_probe(struct gbphy_device *gbphy_dev,
+                        const struct gbphy_device_id *id)
 {
+       struct gb_connection *connection;
        size_t max_payload;
        struct gb_tty *gb_tty;
        struct device *tty_dev;
        int retval;
        int minor;
 
-       /* First time here, initialize the tty structures */
-       if (atomic_inc_return(&reference_count) == 1) {
-               retval = gb_tty_init();
-               if (retval) {
-                       atomic_dec(&reference_count);
-                       return retval;
-               }
-       }
-
        gb_tty = kzalloc(sizeof(*gb_tty), GFP_KERNEL);
-       if (!gb_tty) {
-               retval = -ENOMEM;
-               goto error_alloc;
+       if (!gb_tty)
+               return -ENOMEM;
+
+       connection = gb_connection_create(gbphy_dev->bundle,
+                                         le16_to_cpu(gbphy_dev->cport_desc->id),
+                                         gb_uart_request_handler);
+       if (IS_ERR(connection)) {
+               retval = PTR_ERR(connection);
+               goto exit_tty_free;
        }
 
        max_payload = gb_operation_get_payload_size_max(connection);
        if (max_payload < sizeof(struct gb_uart_send_data_request)) {
                retval = -EINVAL;
-               goto error_payload;
+               goto exit_connection_destroy;
        }
 
        gb_tty->buffer_payload_max = max_payload -
@@ -620,22 +872,29 @@ static int gb_uart_connection_init(struct gb_connection *connection)
        gb_tty->buffer = kzalloc(gb_tty->buffer_payload_max, GFP_KERNEL);
        if (!gb_tty->buffer) {
                retval = -ENOMEM;
-               goto error_payload;
+               goto exit_connection_destroy;
        }
 
-       gb_tty->connection = connection;
-       connection->private = gb_tty;
+       INIT_WORK(&gb_tty->tx_work, gb_uart_tx_write_work);
+
+       retval = kfifo_alloc(&gb_tty->write_fifo, GB_UART_WRITE_FIFO_SIZE,
+                            GFP_KERNEL);
+       if (retval)
+               goto exit_buf_free;
+
+       gb_tty->credits = GB_UART_FIRMWARE_CREDITS;
+       init_completion(&gb_tty->credits_complete);
 
        minor = alloc_minor(gb_tty);
        if (minor < 0) {
                if (minor == -ENOSPC) {
-                       dev_err(&connection->bundle->dev,
+                       dev_err(&gbphy_dev->dev,
                                "no more free minor numbers\n");
                        retval = -ENODEV;
-                       goto error_minor;
+               } else {
+                       retval = minor;
                }
-               retval = minor;
-               goto error_minor;
+               goto exit_kfifo_free;
        }
 
        gb_tty->minor = minor;
@@ -645,7 +904,16 @@ static int gb_uart_connection_init(struct gb_connection *connection)
        mutex_init(&gb_tty->mutex);
 
        tty_port_init(&gb_tty->port);
-       gb_tty->port.ops = &null_ops;
+       gb_tty->port.ops = &gb_port_ops;
+
+       gb_tty->connection = connection;
+       gb_tty->gbphy_dev = gbphy_dev;
+       gb_connection_set_data(connection, gb_tty);
+       gb_gbphy_set_data(gbphy_dev, gb_tty);
+
+       retval = gb_connection_enable_tx(connection);
+       if (retval)
+               goto exit_release_minor;
 
        send_control(gb_tty, gb_tty->ctrlout);
 
@@ -656,41 +924,51 @@ static int gb_uart_connection_init(struct gb_connection *connection)
        gb_tty->line_coding.data_bits = 8;
        send_line_coding(gb_tty);
 
+       retval = gb_connection_enable(connection);
+       if (retval)
+               goto exit_connection_disable;
+
        tty_dev = tty_port_register_device(&gb_tty->port, gb_tty_driver, minor,
-                                          &connection->bundle->dev);
+                                          &gbphy_dev->dev);
        if (IS_ERR(tty_dev)) {
                retval = PTR_ERR(tty_dev);
-               goto error;
+               goto exit_connection_disable;
        }
 
+       gbphy_runtime_put_autosuspend(gbphy_dev);
        return 0;
-error:
-       tty_port_destroy(&gb_tty->port);
+
+exit_connection_disable:
+       gb_connection_disable(connection);
+exit_release_minor:
        release_minor(gb_tty);
-error_minor:
-       connection->private = NULL;
+exit_kfifo_free:
+       kfifo_free(&gb_tty->write_fifo);
+exit_buf_free:
        kfree(gb_tty->buffer);
-error_payload:
+exit_connection_destroy:
+       gb_connection_destroy(connection);
+exit_tty_free:
        kfree(gb_tty);
-error_alloc:
-       if (atomic_dec_return(&reference_count) == 0)
-               gb_tty_exit();
+
        return retval;
 }
 
-static void gb_uart_connection_exit(struct gb_connection *connection)
+static void gb_uart_remove(struct gbphy_device *gbphy_dev)
 {
-       struct gb_tty *gb_tty = connection->private;
+       struct gb_tty *gb_tty = gb_gbphy_get_data(gbphy_dev);
+       struct gb_connection *connection = gb_tty->connection;
        struct tty_struct *tty;
+       int ret;
 
-       if (!gb_tty)
-               return;
+       ret = gbphy_runtime_get_sync(gbphy_dev);
+       if (ret)
+               gbphy_runtime_get_noresume(gbphy_dev);
 
        mutex_lock(&gb_tty->mutex);
        gb_tty->disconnected = true;
 
        wake_up_all(&gb_tty->wioctl);
-       connection->private = NULL;
        mutex_unlock(&gb_tty->mutex);
 
        tty = tty_port_tty_get(&gb_tty->port);
@@ -698,19 +976,19 @@ static void gb_uart_connection_exit(struct gb_connection *connection)
                tty_vhangup(tty);
                tty_kref_put(tty);
        }
-       /* FIXME - stop all traffic */
 
+       gb_connection_disable_rx(connection);
        tty_unregister_device(gb_tty_driver, gb_tty->minor);
 
        /* FIXME - free transmit / receive buffers */
 
+       gb_connection_disable(connection);
        tty_port_destroy(&gb_tty->port);
+       gb_connection_destroy(connection);
+       release_minor(gb_tty);
+       kfifo_free(&gb_tty->write_fifo);
        kfree(gb_tty->buffer);
        kfree(gb_tty);
-
-       /* If last device is gone, tear down the tty structures */
-       if (atomic_dec_return(&reference_count) == 0)
-               gb_tty_exit();
 }
 
 static int gb_tty_init(void)
@@ -756,14 +1034,42 @@ static void gb_tty_exit(void)
        idr_destroy(&tty_minors);
 }
 
-static struct gb_protocol uart_protocol = {
-       .name                   = "uart",
-       .id                     = GREYBUS_PROTOCOL_UART,
-       .major                  = GB_UART_VERSION_MAJOR,
-       .minor                  = GB_UART_VERSION_MINOR,
-       .connection_init        = gb_uart_connection_init,
-       .connection_exit        = gb_uart_connection_exit,
-       .request_recv           = gb_uart_request_recv,
+static const struct gbphy_device_id gb_uart_id_table[] = {
+       { GBPHY_PROTOCOL(GREYBUS_PROTOCOL_UART) },
+       { },
 };
+MODULE_DEVICE_TABLE(gbphy, gb_uart_id_table);
+
+static struct gbphy_driver uart_driver = {
+       .name           = "uart",
+       .probe          = gb_uart_probe,
+       .remove         = gb_uart_remove,
+       .id_table       = gb_uart_id_table,
+};
+
+static int gb_uart_driver_init(void)
+{
+       int ret;
+
+       ret = gb_tty_init();
+       if (ret)
+               return ret;
+
+       ret = gb_gbphy_register(&uart_driver);
+       if (ret) {
+               gb_tty_exit();
+               return ret;
+       }
+
+       return 0;
+}
+module_init(gb_uart_driver_init);
+
+static void gb_uart_driver_exit(void)
+{
+       gb_gbphy_deregister(&uart_driver);
+       gb_tty_exit();
+}
 
-gb_builtin_protocol_driver(uart_protocol);
+module_exit(gb_uart_driver_exit);
+MODULE_LICENSE("GPL v2");