8 files changed, 1026 insertions, 0 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index b5e6f243f749..52895081db0b 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -52,6 +52,8 @@ source "drivers/i2c/Kconfig"
 
 source "drivers/spi/Kconfig"
 
+source "drivers/hsi/Kconfig"
+
 source "drivers/pps/Kconfig"
 
 source "drivers/ptp/Kconfig"
diff --git a/drivers/Makefile b/drivers/Makefile
index 1b3142127bf5..91077ac6b156 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -53,6 +53,7 @@ obj-$(CONFIG_ATA)		+= ata/
 obj-$(CONFIG_TARGET_CORE)       += target/
 obj-$(CONFIG_MTD)               += mtd/
 obj-$(CONFIG_SPI)               += spi/
+obj-y                           += hsi/
 obj-y                           += net/
 obj-$(CONFIG_ATM)               += atm/
 obj-$(CONFIG_FUSION)            += message/
diff --git a/drivers/hsi/Kconfig b/drivers/hsi/Kconfig
new file mode 100644
index 000000000000..937062e8bcd0
--- /dev/null
+++ b/drivers/hsi/Kconfig
@@ -0,0 +1,17 @@
+#
+# HSI driver configuration
+#
+menuconfig HSI
+        tristate "HSI support"
+        ---help---
+          The "High speed synchronous Serial Interface" is
+          synchronous serial interface used mainly to connect
+          application engines and cellular modems.
+
+if HSI
+
+config HSI_BOARDINFO
+        bool
+        default y
+
+endif # HSI
diff --git a/drivers/hsi/Makefile b/drivers/hsi/Makefile
new file mode 100644
index 000000000000..ed94a3a334a4
--- /dev/null
+++ b/drivers/hsi/Makefile
@@ -0,0 +1,5 @@
+#
+# Makefile for HSI
+#
+obj-$(CONFIG_HSI_BOARDINFO)     += hsi_boardinfo.o
+obj-$(CONFIG_HSI)               += hsi.o
diff --git a/drivers/hsi/hsi.c b/drivers/hsi/hsi.c
new file mode 100644
index 000000000000..4e2d79b79334
--- /dev/null
+++ b/drivers/hsi/hsi.c
@@ -0,0 +1,494 @@
+/*
+ * HSI core.
+ *
+ * Copyright (C) 2010 Nokia Corporation. All rights reserved.
+ *
+ * Contact: Carlos Chinea <carlos.chinea@nokia.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+#include <linux/hsi/hsi.h>
+#include <linux/compiler.h>
+#include <linux/rwsem.h>
+#include <linux/list.h>
+#include <linux/spinlock.h>
+#include <linux/kobject.h>
+#include <linux/slab.h>
+#include <linux/string.h>
+#include "hsi_core.h"
+
+static struct device_type hsi_ctrl = {
+        .name   = "hsi_controller",
+};
+
+static struct device_type hsi_cl = {
+        .name   = "hsi_client",
+};
+
+static struct device_type hsi_port = {
+        .name   = "hsi_port",
+};
+
+static ssize_t modalias_show(struct device *dev,
+                        struct device_attribute *a __maybe_unused, char *buf)
+{
+        return sprintf(buf, "hsi:%s\n", dev_name(dev));
+}
+
+static struct device_attribute hsi_bus_dev_attrs[] = {
+        __ATTR_RO(modalias),
+        __ATTR_NULL,
+};
+
+static int hsi_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
+{
+        if (dev->type == &hsi_cl)
+                add_uevent_var(env, "MODALIAS=hsi:%s", dev_name(dev));
+
+        return 0;
+}
+
+static int hsi_bus_match(struct device *dev, struct device_driver *driver)
+{
+        return strcmp(dev_name(dev), driver->name) == 0;
+}
+
+static struct bus_type hsi_bus_type = {
+        .name           = "hsi",
+        .dev_attrs      = hsi_bus_dev_attrs,
+        .match          = hsi_bus_match,
+        .uevent         = hsi_bus_uevent,
+};
+
+static void hsi_client_release(struct device *dev)
+{
+        kfree(to_hsi_client(dev));
+}
+
+static void hsi_new_client(struct hsi_port *port, struct hsi_board_info *info)
+{
+        struct hsi_client *cl;
+        unsigned long flags;
+
+        cl = kzalloc(sizeof(*cl), GFP_KERNEL);
+        if (!cl)
+                return;
+        cl->device.type = &hsi_cl;
+        cl->tx_cfg = info->tx_cfg;
+        cl->rx_cfg = info->rx_cfg;
+        cl->device.bus = &hsi_bus_type;
+        cl->device.parent = &port->device;
+        cl->device.release = hsi_client_release;
+        dev_set_name(&cl->device, info->name);
+        cl->device.platform_data = info->platform_data;
+        spin_lock_irqsave(&port->clock, flags);
+        list_add_tail(&cl->link, &port->clients);
+        spin_unlock_irqrestore(&port->clock, flags);
+        if (info->archdata)
+                cl->device.archdata = *info->archdata;
+        if (device_register(&cl->device) < 0) {
+                pr_err("hsi: failed to register client: %s\n", info->name);
+                kfree(cl);
+        }
+}
+
+static void hsi_scan_board_info(struct hsi_controller *hsi)
+{
+        struct hsi_cl_info *cl_info;
+        struct hsi_port *p;
+
+        list_for_each_entry(cl_info, &hsi_board_list, list)
+                if (cl_info->info.hsi_id == hsi->id) {
+                        p = hsi_find_port_num(hsi, cl_info->info.port);
+                        if (!p)
+                                continue;
+                        hsi_new_client(p, &cl_info->info);
+                }
+}
+
+static int hsi_remove_client(struct device *dev, void *data __maybe_unused)
+{
+        struct hsi_client *cl = to_hsi_client(dev);
+        struct hsi_port *port = to_hsi_port(dev->parent);
+        unsigned long flags;
+
+        spin_lock_irqsave(&port->clock, flags);
+        list_del(&cl->link);
+        spin_unlock_irqrestore(&port->clock, flags);
+        device_unregister(dev);
+
+        return 0;
+}
+
+static int hsi_remove_port(struct device *dev, void *data __maybe_unused)
+{
+        device_for_each_child(dev, NULL, hsi_remove_client);
+        device_unregister(dev);
+
+        return 0;
+}
+
+static void hsi_controller_release(struct device *dev __maybe_unused)
+{
+}
+
+static void hsi_port_release(struct device *dev __maybe_unused)
+{
+}
+
+/**
+ * hsi_unregister_controller - Unregister an HSI controller