5 files changed, 294 insertions, 4 deletions

diff --git a/drivers/gpu/host1x/Makefile b/drivers/gpu/host1x/Makefile
index afa1e9e4e512..de305c2d510e 100644
--- a/drivers/gpu/host1x/Makefile
+++ b/drivers/gpu/host1x/Makefile
@@ -7,6 +7,7 @@ host1x-y = \
         channel.o \
         job.o \
         debug.o \
+        mipi.o \
         hw/host1x01.o \
         hw/host1x02.o
 
diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index 80da003d63de..646a333b069a 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -210,17 +210,26 @@ static int __init tegra_host1x_init(void)
                 return err;
 
         err = platform_driver_register(&tegra_host1x_driver);
-        if (err < 0) {
-                host1x_bus_exit();
-                return err;
-        }
+        if (err < 0)
+                goto unregister_bus;
+
+        err = platform_driver_register(&tegra_mipi_driver);
+        if (err < 0)
+                goto unregister_host1x;
 
         return 0;
+
+unregister_host1x:
+        platform_driver_unregister(&tegra_host1x_driver);
+unregister_bus:
+        host1x_bus_exit();
+        return err;
 }
 module_init(tegra_host1x_init);
 
 static void __exit tegra_host1x_exit(void)
 {
+        platform_driver_unregister(&tegra_mipi_driver);
         platform_driver_unregister(&tegra_host1x_driver);
         host1x_bus_exit();
 }
diff --git a/drivers/gpu/host1x/dev.h b/drivers/gpu/host1x/dev.h
index a61a976e7a42..0b6e8e9629c5 100644
--- a/drivers/gpu/host1x/dev.h
+++ b/drivers/gpu/host1x/dev.h
@@ -306,4 +306,6 @@ static inline void host1x_hw_show_mlocks(struct host1x *host, struct output *o)
         host->debug_op->show_mlocks(host, o);
 }
 
+extern struct platform_driver tegra_mipi_driver;
+
 #endif
diff --git a/drivers/gpu/host1x/mipi.c b/drivers/gpu/host1x/mipi.c
new file mode 100644
index 000000000000..518b98dd3087
--- /dev/null
+++ b/drivers/gpu/host1x/mipi.c
@@ -0,0 +1,272 @@
+/*
+ * Copyright (C) 2013 NVIDIA Corporation
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include <linux/clk.h>
+#include <linux/delay.h>
+#include <linux/io.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+
+#define MIPI_CAL_CTRL                   0x00
+#define MIPI_CAL_CTRL_START             (1 << 0)
+
+#define MIPI_CAL_AUTOCAL_CTRL           0x01
+
+#define MIPI_CAL_STATUS                 0x02
+#define MIPI_CAL_STATUS_DONE            (1 << 16)
+#define MIPI_CAL_STATUS_ACTIVE          (1 <<  0)
+
+#define MIPI_CAL_CONFIG_CSIA            0x05
+#define MIPI_CAL_CONFIG_CSIB            0x06
+#define MIPI_CAL_CONFIG_CSIC            0x07
+#define MIPI_CAL_CONFIG_CSID            0x08
+#define MIPI_CAL_CONFIG_CSIE            0x09
+#define MIPI_CAL_CONFIG_DSIA            0x0e
+#define MIPI_CAL_CONFIG_DSIB            0x0f
+#define MIPI_CAL_CONFIG_DSIC            0x10
+#define MIPI_CAL_CONFIG_DSID            0x11
+
+#define MIPI_CAL_CONFIG_SELECT          (1 << 21)
+#define MIPI_CAL_CONFIG_HSPDOS(x)       (((x) & 0x1f) << 16)
+#define MIPI_CAL_CONFIG_HSPUOS(x)       (((x) & 0x1f) <<  8)
+#define MIPI_CAL_CONFIG_TERMOS(x)       (((x) & 0x1f) <<  0)
+
+#define MIPI_CAL_BIAS_PAD_CFG0          0x16
+#define MIPI_CAL_BIAS_PAD_PDVCLAMP      (1 << 1)
+#define MIPI_CAL_BIAS_PAD_E_VCLAMP_REF  (1 << 0)
+
+#define MIPI_CAL_BIAS_PAD_CFG1          0x17
+
+#define MIPI_CAL_BIAS_PAD_CFG2          0x18
+#define MIPI_CAL_BIAS_PAD_PDVREG        (1 << 1)
+
+static const struct module {
+        unsigned long reg;
+} modules[] = {
+        { .reg = MIPI_CAL_CONFIG_CSIA },
+        { .reg = MIPI_CAL_CONFIG_CSIB },
+        { .reg = MIPI_CAL_CONFIG_CSIC },
+        { .reg = MIPI_CAL_CONFIG_CSID },
+        { .reg = MIPI_CAL_CONFIG_CSIE },
+        { .reg = MIPI_CAL_CONFIG_DSIA },
+        { .reg = MIPI_CAL_CONFIG_DSIB },
+        { .reg = MIPI_CAL_CONFIG_DSIC },
+        { .reg = MIPI_CAL_CONFIG_DSID },
+};
+
+struct tegra_mipi {
+        void __iomem *regs;
+        struct mutex lock;
+        struct clk *clk;
+};
+
+struct tegra_mipi_device {
+        struct platform_device *pdev;
+        struct tegra_mipi *mipi;
+        struct device *device;
+        unsigned long pads;
+};
+
+static inline unsigned long tegra_mipi_readl(struct tegra_mipi *mipi,
+                                             unsigned long reg)
+{
+        return readl(mipi->regs + (reg << 2));
+}
+
+static inline void tegra_mipi_writel(struct tegra_mipi *mipi,
+                                     unsigned long value, unsigned long reg)
+{
+        writel(value, mipi->regs + (reg << 2));
+}
+
+struct tegra_mipi_device *tegra_mipi_request(struct device *device)
+{
+        struct device_node *np = device->of_node;
+        struct tegra_mipi_device *dev;
+        struct of_phandle_args args;
+        int err;
+
+        err = of_parse_phandle_with_args(np, "nvidia,mipi-calibrate",
+                                         "#nvidia,mipi-calibrate-cells", 0,
+                                         &args);
+        if (err < 0)
+                return ERR_PTR(err);
+
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev) {
+                of_node_put(args.np);
+                err = -ENOMEM;
+                goto out;
+        }
+
+        dev->pdev = of_find_device_by_node(args.np);
+        if (!dev->pdev) {
+                of_node_put(args.np);
+                err = -ENODEV;
+                goto free;
+        }
+
+        of_node_put(args.np);
+
+        dev->mipi = platform_get_drvdata(dev->pdev);
+        if (!dev->mipi) {
+                err = -EPROBE_DEFER;
+                goto pdev_put;
+        }
+
+        dev->pads = args.args[0];
+        dev->device = device;