From nobody Thu Apr  2 18:47:40 2026
Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com
 [209.85.208.170])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5603638C2C4
	for <linux-kernel@vger.kernel.org>; Tue,  3 Mar 2026 08:42:59 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 arc=none smtp.client-ip=209.85.208.170
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1772527384; cv=none;
 b=mrLPF4uaYzaSTOp3rEuUHOVZIX1lwg8Gt7RiD/MZvIUytFtnZi/jSAD/yiL0+7RGtjnhWdso0ZrlT5tbSZIp8Wd5a8NgwT/mDFUroDMmP2Gxmka68OuacKbKFL5isXCIpVeY9qV+vWflgAZMbKHUn+XTbzPQo+2x9Grqfk/5bFc=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1772527384; c=relaxed/simple;
	bh=bwwvWXJ41lySPW4U+2fiYxqsXRKDlDWopfEyohTTtfg=;
	h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:
	 MIME-Version;
 b=lIOJSW9x49M/oezs3DKsNSG3jR2Qj/sygQKcH9ED7l+ont+tgplBDx2DN12TyUPRJjNnee/I2WQqTEc6m8/uuBpttxI3W9/+SXdxjUuAq4pLKd3HqtBFk65Yme+L1hA0khvuJZ7RLJPJo9U1zGFp3aij9JRf9NvhUcC76FThZ+U=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
 dmarc=pass (p=none dis=none) header.from=gmail.com;
 spf=pass smtp.mailfrom=gmail.com;
 dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com
 header.b=P4dEd0h0; arc=none smtp.client-ip=209.85.208.170
Authentication-Results: smtp.subspace.kernel.org;
 dmarc=pass (p=none dis=none) header.from=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
 spf=pass smtp.mailfrom=gmail.com
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com
 header.b="P4dEd0h0"
Received: by mail-lj1-f170.google.com with SMTP id
 38308e7fff4ca-389ebb0e885so102561851fa.1
        for <linux-kernel@vger.kernel.org>;
 Tue, 03 Mar 2026 00:42:59 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20230601; t=1772527377; x=1773132177;
 darn=vger.kernel.org;
        h=content-transfer-encoding:mime-version:references:in-reply-to
         :message-id:date:subject:cc:to:from:from:to:cc:subject:date
         :message-id:reply-to;
        bh=dHYmVbbfQfaP2yj99KiW+/UkO3tcLecvvnP/w5d/X6U=;
        b=P4dEd0h0oSaTnk/BSYyDQNQjGzJpUww0XDD/jIJrHwdcamxsz1/i+Pwit7QcmllHzQ
         PlQyLE1Riik+MENxkEvTdNyy6bXa2XMmV2eyvnob7nMXraHFiZys//++m2ZOo+QeGW8V
         +e9396e1VOWeb8gT0kbOECmXJ/68HJTW9u/VNHixnl100jPuUN0PBQnPXWwFkbvtig0a
         Djxm2kzFlfNwGeGnpbHb+RBeIIqfh9KxOwQQHbrNcuQXYQoAJDHmMth3kx3kDLx5nrRs
         o4dwqpwgBhRcEkXnaE5H1ril5BfXLiAXfkxBBK6FhU0cZfR34jhPGRmvQgZBJvGbRBBG
         7Fsw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1772527377; x=1773132177;
        h=content-transfer-encoding:mime-version:references:in-reply-to
         :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from
         :to:cc:subject:date:message-id:reply-to;
        bh=dHYmVbbfQfaP2yj99KiW+/UkO3tcLecvvnP/w5d/X6U=;
        b=BT3tE+u9QXpaxBNxODEUjftwqjB6287X9xx19SwuRIKgZOGLMW+EfkGUStqpL6f31b
         hkGSJRRiEJnxrSmkalpss9l6aXY8xlDJLa5fuP+l+LREjL/YwbXInJ1VeLwrPQZSn6ya
         SOEb8Mjby2XW1iLOcnP1vb8Ka0AIqFTjBPBh9J34g/pAnKLGEUcUx7BOO3Oh869/PA2/
         VzXdM1wTyECvHjp0BfWHOXw7ShUoGrWozxnC4d2/lrGWxfRMYVeVfhgmCAu7HG3Mg1p4
         7qAoZq4Df9exIw+G/ueixpErL1Mo8pAIySVltA0XIFjPcM2BbTmF1fq/adfO4d3zv1Gj
         RIsA==
X-Gm-Message-State: AOJu0YzPFEIK0lKMpJ+Cgm73K1TVIpH1F6gv3Q/nHKFgSYp3p65bmcaf
	+fmfDIQ0fwE/6zW2VXsjA6QWrFrrtuaNkCQnGCXbBwDWDzPBOajw+LId
X-Gm-Gg: ATEYQzxeYiqeQzN0gMqdjFU3/b9AlGtbbVhs4VKKpA4sxdbt8pH95Jrvb4Z5F9FYz1g
	WhscAKNh/fEo6kMC3oUjNEroGcJP8p0kebplkMpphydCfTo4YvFtZ3P6+cSGd+BDPvq8wl8meha
	U9/apszQncJBUSMuIBkEDvgE1if2ItZnqsRT2tke3jJ0xKvVQJR1X0e8ars/LXTRItXY/3l5FCo
	qo94WT9prKwMM+HGmjow9Dwh1CWxmqatiVNwYAz7DSyQfmIk2NlsHBj4V0f5q5BHekE5Anx4uNb
	p7B1JzrzjEBvqimgro3sn5KWUMwEL101MbtzCaRkYXdnnz1wgIqX6Fp6oN9M/r4LzLVRyxwuQIQ
	SG1+/jW35GQea/CgqgS9CN2r2W6hLsH3Dr3K0zvhSTK1JcE6juLx2UqZFQjaJNshTc5izkujbum
	SwlpJVQ0pchtBj
X-Received: by 2002:a2e:a106:0:b0:389:fb7f:3e0c with SMTP id
 38308e7fff4ca-389ff15f371mr102458851fa.21.1772527377130;
        Tue, 03 Mar 2026 00:42:57 -0800 (PST)
Received: from xeon ([188.163.112.72])
        by smtp.gmail.com with ESMTPSA id
 38308e7fff4ca-389f30227a9sm32599471fa.42.2026.03.03.00.42.55
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Tue, 03 Mar 2026 00:42:56 -0800 (PST)
From: Svyatoslav Ryhel <clamor95@gmail.com>
To: Thierry Reding <thierry.reding@gmail.com>,
	Thierry Reding <treding@nvidia.com>,
	Mikko Perttunen <mperttunen@nvidia.com>,
	David Airlie <airlied@gmail.com>,
	Simona Vetter <simona@ffwll.ch>,
	Jonathan Hunter <jonathanh@nvidia.com>,
	Sowjanya Komatineni <skomatineni@nvidia.com>,
	Luca Ceresoli <luca.ceresoli@bootlin.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Hans Verkuil <hverkuil+cisco@kernel.org>,
	Svyatoslav Ryhel <clamor95@gmail.com>
Cc: linux-kernel@vger.kernel.org,
	dri-devel@lists.freedesktop.org,
	linux-tegra@vger.kernel.org,
	linux-media@vger.kernel.org,
	linux-staging@lists.linux.dev
Subject: [PATCH v7 05/15] gpu: host1x: convert MIPI to use operation function
 pointers
Date: Tue,  3 Mar 2026 10:42:28 +0200
Message-ID: <20260303084239.15007-6-clamor95@gmail.com>
X-Mailer: git-send-email 2.51.0
In-Reply-To: <20260303084239.15007-1-clamor95@gmail.com>
References: <20260303084239.15007-1-clamor95@gmail.com>
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"

Convert existing MIPI code to use operation function pointers, a necessary
step for supporting Tegra20/Tegra30 SoCs. All common MIPI configuration
that is SoC-independent remains in mipi.c, while all SoC-specific code is
moved to tegra114-mipi.c (The naming matches the first SoC generation with
a dedicated calibration block). Shared structures and function calls are
placed into tegra-mipi-cal.h.

Tested-by: Luca Ceresoli <luca.ceresoli@bootlin.com> # tegra20, parallel ca=
mera
Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
Acked-by: Mikko Perttunen <mperttunen@nvidia.com>
---
 drivers/gpu/drm/tegra/dsi.c             |   1 +
 drivers/gpu/host1x/Makefile             |   1 +
 drivers/gpu/host1x/mipi.c               | 592 +++++-------------------
 drivers/gpu/host1x/tegra114-mipi.c      | 483 +++++++++++++++++++
 drivers/staging/media/tegra-video/csi.c |   1 +
 include/linux/host1x.h                  |  10 -
 include/linux/tegra-mipi-cal.h          |  57 +++
 7 files changed, 666 insertions(+), 479 deletions(-)
 create mode 100644 drivers/gpu/host1x/tegra114-mipi.c
 create mode 100644 include/linux/tegra-mipi-cal.h

diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
index 2c5aefe9621a..7f25c50621c9 100644
--- a/drivers/gpu/drm/tegra/dsi.c
+++ b/drivers/gpu/drm/tegra/dsi.c
@@ -14,6 +14,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
 #include <linux/reset.h>
+#include <linux/tegra-mipi-cal.h>
=20
 #include <video/mipi_display.h>
=20
diff --git a/drivers/gpu/host1x/Makefile b/drivers/gpu/host1x/Makefile
index ee5286ffe08d..fead483af0b4 100644
--- a/drivers/gpu/host1x/Makefile
+++ b/drivers/gpu/host1x/Makefile
@@ -9,6 +9,7 @@ host1x-y =3D \
 	job.o \
 	debug.o \
 	mipi.o \
+	tegra114-mipi.o \
 	fence.o \
 	hw/host1x01.o \
 	hw/host1x02.o \
diff --git a/drivers/gpu/host1x/mipi.c b/drivers/gpu/host1x/mipi.c
index fea9f491df66..01513b775d89 100644
--- a/drivers/gpu/host1x/mipi.c
+++ b/drivers/gpu/host1x/mipi.c
@@ -1,215 +1,110 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * 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 t=
hat
- * the above copyright notice appear in all copies and that both that copy=
right
- * notice and this permission notice appear in supporting documentation, a=
nd
- * 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 SOFTW=
ARE,
- * 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 PERFOR=
MANCE
- * OF THIS SOFTWARE.
+ * Copyright (C) 2025 Svyatoslav Ryhel <clamor95@gmail.com>
  */
=20
 #include <linux/clk.h>
-#include <linux/host1x.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/module.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/tegra-mipi-cal.h>
=20
-#include "dev.h"
-
-#define MIPI_CAL_CTRL			0x00
-#define MIPI_CAL_CTRL_NOISE_FILTER(x)	(((x) & 0xf) << 26)
-#define MIPI_CAL_CTRL_PRESCALE(x)	(((x) & 0x3) << 24)
-#define MIPI_CAL_CTRL_CLKEN_OVR		(1 << 4)
-#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_CSIF		0x0a
-#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_DSIA_CLK	0x19
-#define MIPI_CAL_CONFIG_DSIB_CLK	0x1a
-#define MIPI_CAL_CONFIG_CSIAB_CLK	0x1b
-#define MIPI_CAL_CONFIG_DSIC_CLK	0x1c
-#define MIPI_CAL_CONFIG_CSICD_CLK	0x1c
-#define MIPI_CAL_CONFIG_DSID_CLK	0x1d
-#define MIPI_CAL_CONFIG_CSIE_CLK	0x1d
-
-/* for data and clock lanes */
-#define MIPI_CAL_CONFIG_SELECT		(1 << 21)
-
-/* for data lanes */
-#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)
-
-/* for clock lanes */
-#define MIPI_CAL_CONFIG_HSCLKPDOSD(x)	(((x) & 0x1f) <<  8)
-#define MIPI_CAL_CONFIG_HSCLKPUOSD(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_DRV_DN_REF(x) (((x) & 0x7) << 16)
-#define MIPI_CAL_BIAS_PAD_DRV_UP_REF(x) (((x) & 0x7) << 8)
-
-#define MIPI_CAL_BIAS_PAD_CFG2		0x18
-#define MIPI_CAL_BIAS_PAD_VCLAMP(x)	(((x) & 0x7) << 16)
-#define MIPI_CAL_BIAS_PAD_VAUXP(x)	(((x) & 0x7) << 4)
-#define MIPI_CAL_BIAS_PAD_PDVREG	(1 << 1)
-
-struct tegra_mipi_pad {
-	unsigned long data;
-	unsigned long clk;
-};
-
-struct tegra_mipi_soc {
-	bool has_clk_lane;
-	const struct tegra_mipi_pad *pads;
-	unsigned int num_pads;
-
-	bool clock_enable_override;
-	bool needs_vclamp_ref;
-
-	/* bias pad configuration settings */
-	u8 pad_drive_down_ref;
-	u8 pad_drive_up_ref;
+/* only need to support one provider */
+static struct {
+	struct device_node *np;
+	const struct tegra_mipi_ops *ops;
+} provider;
=20
-	u8 pad_vclamp_level;
-	u8 pad_vauxp_level;
-
-	/* calibration settings for data lanes */
-	u8 hspdos;
-	u8 hspuos;
-	u8 termos;
-
-	/* calibration settings for clock lanes */
-	u8 hsclkpdos;
-	u8 hsclkpuos;
-};
-
-struct tegra_mipi {
-	const struct tegra_mipi_soc *soc;
-	struct device *dev;
-	void __iomem *regs;
-	struct mutex lock;
-	struct clk *clk;
-
-	unsigned long usage_count;
-};
-
-struct tegra_mipi_device {
-	struct platform_device *pdev;
-	struct tegra_mipi *mipi;
-	struct device *device;
-	unsigned long pads;
-};
-
-static inline u32 tegra_mipi_readl(struct tegra_mipi *mipi,
-				   unsigned long offset)
+/**
+ * tegra_mipi_enable - Enable the Tegra MIPI calibration device.
+ * @device: Handle to the Tegra MIPI calibration device.
+ *
+ * This calls the enable sequence for the Tegra MIPI calibration device.
+ *
+ * Returns 0 on success or a negative error code on failure.
+ */
+int tegra_mipi_enable(struct tegra_mipi_device *device)
 {
-	return readl(mipi->regs + (offset << 2));
-}
+	if (device->ops->enable)
+		return device->ops->enable(device);
=20
-static inline void tegra_mipi_writel(struct tegra_mipi *mipi, u32 value,
-				     unsigned long offset)
-{
-	writel(value, mipi->regs + (offset << 2));
+	return 0;
 }
+EXPORT_SYMBOL(tegra_mipi_enable);
=20
-static int tegra_mipi_power_up(struct tegra_mipi *mipi)
+/**
+ * tegra_mipi_disable - Disable the Tegra MIPI calibration device.
+ * @device: Handle to the Tegra MIPI calibration device.
+ *
+ * This calls the disable sequence for the Tegra MIPI calibration device.
+ *
+ * Returns 0 on success or a negative error code on failure.
+ */
+int tegra_mipi_disable(struct tegra_mipi_device *device)
 {
-	u32 value;
-	int err;
-
-	err =3D clk_enable(mipi->clk);
-	if (err < 0)
-		return err;
-
-	value =3D tegra_mipi_readl(mipi, MIPI_CAL_BIAS_PAD_CFG0);
-	value &=3D ~MIPI_CAL_BIAS_PAD_PDVCLAMP;
-
-	if (mipi->soc->needs_vclamp_ref)
-		value |=3D MIPI_CAL_BIAS_PAD_E_VCLAMP_REF;
-
-	tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG0);
-
-	value =3D tegra_mipi_readl(mipi, MIPI_CAL_BIAS_PAD_CFG2);
-	value &=3D ~MIPI_CAL_BIAS_PAD_PDVREG;
-	tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG2);
-
-	clk_disable(mipi->clk);
+	if (device->ops->disable)
+		return device->ops->disable(device);
=20
 	return 0;
 }
+EXPORT_SYMBOL(tegra_mipi_disable);
=20
-static int tegra_mipi_power_down(struct tegra_mipi *mipi)
+/**
+ * tegra_mipi_start_calibration - Start the Tegra MIPI calibration sequenc=
e.
+ * @device: Handle to the Tegra MIPI calibration device.
+ *
+ * This initiates the calibration of CSI/DSI interfaces via the Tegra MIPI
+ * calibration device.
+ *
+ * Returns 0 on success or a negative error code on failure.
+ */
+int tegra_mipi_start_calibration(struct tegra_mipi_device *device)
 {
-	u32 value;
-	int err;
-
-	err =3D clk_enable(mipi->clk);
-	if (err < 0)
-		return err;
-
-	/*
-	 * The MIPI_CAL_BIAS_PAD_PDVREG controls a voltage regulator that
-	 * supplies the DSI pads. This must be kept enabled until none of the
-	 * DSI lanes are used anymore.
-	 */
-	value =3D tegra_mipi_readl(mipi, MIPI_CAL_BIAS_PAD_CFG2);
-	value |=3D MIPI_CAL_BIAS_PAD_PDVREG;
-	tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG2);
-
-	/*
-	 * MIPI_CAL_BIAS_PAD_PDVCLAMP and MIPI_CAL_BIAS_PAD_E_VCLAMP_REF
-	 * control a regulator that supplies current to the pre-driver logic.
-	 * Powering down this regulator causes DSI to fail, so it must remain
-	 * powered on until none of the DSI lanes are used anymore.
-	 */
-	value =3D tegra_mipi_readl(mipi, MIPI_CAL_BIAS_PAD_CFG0);
+	if (device->ops->start_calibration)
+		return device->ops->start_calibration(device);
=20
-	if (mipi->soc->needs_vclamp_ref)
-		value &=3D ~MIPI_CAL_BIAS_PAD_E_VCLAMP_REF;
+	return 0;
+}
+EXPORT_SYMBOL(tegra_mipi_start_calibration);
=20
-	value |=3D MIPI_CAL_BIAS_PAD_PDVCLAMP;
-	tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG0);
+/**
+ * tegra_mipi_finish_calibration - Finish the Tegra MIPI calibration seque=
nce.
+ * @device: Handle to the Tegra MIPI calibration device.
+ *
+ * This completes the calibration of CSI/DSI interfaces via the Tegra MIPI
+ * calibration device.
+ *
+ * Returns 0 on success or a negative error code on failure.
+ */
+int tegra_mipi_finish_calibration(struct tegra_mipi_device *device)
+{
+	if (device->ops->finish_calibration)
+		return device->ops->finish_calibration(device);
=20
 	return 0;
 }
+EXPORT_SYMBOL(tegra_mipi_finish_calibration);
=20
+/**
+ * tegra_mipi_request - Request a Tegra MIPI calibration device.
+ * @device: Handle of the device requesting the MIPI calibration function.
+ * @np: Device node pointer of the device requesting the MIPI calibration
+ *	function.
+ *
+ * This function requests a reference to a Tegra MIPI calibration device.
+ *
+ * Returns a pointer to the Tegra MIPI calibration device on success,
+ * or an ERR_PTR-encoded error code on failure.
+ */
 struct tegra_mipi_device *tegra_mipi_request(struct device *device,
 					     struct device_node *np)
 {
-	struct tegra_mipi_device *dev;
+	struct tegra_mipi_device *mipidev;
 	struct of_phandle_args args;
 	int err;
=20
@@ -219,321 +114,80 @@ struct tegra_mipi_device *tegra_mipi_request(struct =
device *device,
 	if (err < 0)
 		return ERR_PTR(err);
=20
-	dev =3D kzalloc_obj(*dev);
-	if (!dev) {
+	if (provider.np !=3D args.np)
+		return ERR_PTR(-ENODEV);
+
+	mipidev =3D kzalloc_obj(*mipidev);
+	if (!mipidev) {
 		err =3D -ENOMEM;
 		goto out;
 	}
=20
-	dev->pdev =3D of_find_device_by_node(args.np);
-	if (!dev->pdev) {
+	mipidev->pdev =3D of_find_device_by_node(args.np);
+	if (!mipidev->pdev) {
 		err =3D -ENODEV;
 		goto free;
 	}
=20
-	dev->mipi =3D platform_get_drvdata(dev->pdev);
-	if (!dev->mipi) {
-		err =3D -EPROBE_DEFER;
-		goto put;
-	}
-
 	of_node_put(args.np);
=20
-	dev->pads =3D args.args[0];
-	dev->device =3D device;
+	mipidev->ops =3D provider.ops;
+	mipidev->pads =3D args.args[0];
=20
-	return dev;
+	return mipidev;
=20
-put:
-	platform_device_put(dev->pdev);
 free:
-	kfree(dev);
+	kfree(mipidev);
 out:
 	of_node_put(args.np);
 	return ERR_PTR(err);
 }
 EXPORT_SYMBOL(tegra_mipi_request);
=20
-void tegra_mipi_free(struct tegra_mipi_device *device)
+/**
+ * tegra_mipi_free - Free a Tegra MIPI calibration device.
+ * @mipidev: Handle to the Tegra MIPI calibration device.
+ *
+ * This function releases a reference to a Tegra MIPI calibration device
+ * previously requested by tegra_mipi_request().
+ */
+void tegra_mipi_free(struct tegra_mipi_device *mipidev)
 {
-	platform_device_put(device->pdev);
-	kfree(device);
+	platform_device_put(mipidev->pdev);
+	kfree(mipidev);
 }
 EXPORT_SYMBOL(tegra_mipi_free);
=20
-int tegra_mipi_enable(struct tegra_mipi_device *dev)
+static void tegra_mipi_remove_provider(void *data)
 {
-	int err =3D 0;
-
-	mutex_lock(&dev->mipi->lock);
-
-	if (dev->mipi->usage_count++ =3D=3D 0)
-		err =3D tegra_mipi_power_up(dev->mipi);
-
-	mutex_unlock(&dev->mipi->lock);
-
-	return err;
-
-}
-EXPORT_SYMBOL(tegra_mipi_enable);
-
-int tegra_mipi_disable(struct tegra_mipi_device *dev)
-{
-	int err =3D 0;
-
-	mutex_lock(&dev->mipi->lock);
-
-	if (--dev->mipi->usage_count =3D=3D 0)
-		err =3D tegra_mipi_power_down(dev->mipi);
-
-	mutex_unlock(&dev->mipi->lock);
-
-	return err;
-
-}
-EXPORT_SYMBOL(tegra_mipi_disable);
-
-int tegra_mipi_finish_calibration(struct tegra_mipi_device *device)
-{
-	struct tegra_mipi *mipi =3D device->mipi;
-	void __iomem *status_reg =3D mipi->regs + (MIPI_CAL_STATUS << 2);
-	u32 value;
-	int err;
-
-	err =3D readl_relaxed_poll_timeout(status_reg, value,
-					 !(value & MIPI_CAL_STATUS_ACTIVE) &&
-					 (value & MIPI_CAL_STATUS_DONE), 50,
-					 250000);
-	mutex_unlock(&device->mipi->lock);
-	clk_disable(device->mipi->clk);
-
-	return err;
+	provider.np =3D NULL;
+	provider.ops =3D NULL;
 }
-EXPORT_SYMBOL(tegra_mipi_finish_calibration);
-
-int tegra_mipi_start_calibration(struct tegra_mipi_device *device)
-{
-	const struct tegra_mipi_soc *soc =3D device->mipi->soc;
-	unsigned int i;
-	u32 value;
-	int err;
-
-	err =3D clk_enable(device->mipi->clk);
-	if (err < 0)
-		return err;
-
-	mutex_lock(&device->mipi->lock);
-
-	value =3D MIPI_CAL_BIAS_PAD_DRV_DN_REF(soc->pad_drive_down_ref) |
-		MIPI_CAL_BIAS_PAD_DRV_UP_REF(soc->pad_drive_up_ref);
-	tegra_mipi_writel(device->mipi, value, MIPI_CAL_BIAS_PAD_CFG1);
-
-	value =3D tegra_mipi_readl(device->mipi, MIPI_CAL_BIAS_PAD_CFG2);
-	value &=3D ~MIPI_CAL_BIAS_PAD_VCLAMP(0x7);
-	value &=3D ~MIPI_CAL_BIAS_PAD_VAUXP(0x7);
-	value |=3D MIPI_CAL_BIAS_PAD_VCLAMP(soc->pad_vclamp_level);
-	value |=3D MIPI_CAL_BIAS_PAD_VAUXP(soc->pad_vauxp_level);
-	tegra_mipi_writel(device->mipi, value, MIPI_CAL_BIAS_PAD_CFG2);
-
-	for (i =3D 0; i < soc->num_pads; i++) {
-		u32 clk =3D 0, data =3D 0;
-
-		if (device->pads & BIT(i)) {
-			data =3D MIPI_CAL_CONFIG_SELECT |
-			       MIPI_CAL_CONFIG_HSPDOS(soc->hspdos) |
-			       MIPI_CAL_CONFIG_HSPUOS(soc->hspuos) |
-			       MIPI_CAL_CONFIG_TERMOS(soc->termos);
-			clk =3D MIPI_CAL_CONFIG_SELECT |
-			      MIPI_CAL_CONFIG_HSCLKPDOSD(soc->hsclkpdos) |
-			      MIPI_CAL_CONFIG_HSCLKPUOSD(soc->hsclkpuos);
-		}
=20
-		tegra_mipi_writel(device->mipi, data, soc->pads[i].data);
-
-		if (soc->has_clk_lane && soc->pads[i].clk !=3D 0)
-			tegra_mipi_writel(device->mipi, clk, soc->pads[i].clk);
-	}
-
-	value =3D tegra_mipi_readl(device->mipi, MIPI_CAL_CTRL);
-	value &=3D ~MIPI_CAL_CTRL_NOISE_FILTER(0xf);
-	value &=3D ~MIPI_CAL_CTRL_PRESCALE(0x3);
-	value |=3D MIPI_CAL_CTRL_NOISE_FILTER(0xa);
-	value |=3D MIPI_CAL_CTRL_PRESCALE(0x2);
-
-	if (!soc->clock_enable_override)
-		value &=3D ~MIPI_CAL_CTRL_CLKEN_OVR;
-	else
-		value |=3D MIPI_CAL_CTRL_CLKEN_OVR;
-
-	tegra_mipi_writel(device->mipi, value, MIPI_CAL_CTRL);
-
-	/* clear any pending status bits */
-	value =3D tegra_mipi_readl(device->mipi, MIPI_CAL_STATUS);
-	tegra_mipi_writel(device->mipi, value, MIPI_CAL_STATUS);
-
-	value =3D tegra_mipi_readl(device->mipi, MIPI_CAL_CTRL);
-	value |=3D MIPI_CAL_CTRL_START;
-	tegra_mipi_writel(device->mipi, value, MIPI_CAL_CTRL);
-
-	/*
-	 * Wait for min 72uS to let calibration logic finish calibration
-	 * sequence codes before waiting for pads idle state to apply the
-	 * results.
-	 */
-	usleep_range(75, 80);
-
-	return 0;
-}
-EXPORT_SYMBOL(tegra_mipi_start_calibration);
-
-static const struct tegra_mipi_pad tegra114_mipi_pads[] =3D {
-	{ .data =3D MIPI_CAL_CONFIG_CSIA },
-	{ .data =3D MIPI_CAL_CONFIG_CSIB },
-	{ .data =3D MIPI_CAL_CONFIG_CSIC },
-	{ .data =3D MIPI_CAL_CONFIG_CSID },
-	{ .data =3D MIPI_CAL_CONFIG_CSIE },
-	{ .data =3D MIPI_CAL_CONFIG_DSIA },
-	{ .data =3D MIPI_CAL_CONFIG_DSIB },
-	{ .data =3D MIPI_CAL_CONFIG_DSIC },
-	{ .data =3D MIPI_CAL_CONFIG_DSID },
-};
-
-static const struct tegra_mipi_soc tegra114_mipi_soc =3D {
-	.has_clk_lane =3D false,
-	.pads =3D tegra114_mipi_pads,
-	.num_pads =3D ARRAY_SIZE(tegra114_mipi_pads),
-	.clock_enable_override =3D true,
-	.needs_vclamp_ref =3D true,
-	.pad_drive_down_ref =3D 0x2,
-	.pad_drive_up_ref =3D 0x0,
-	.pad_vclamp_level =3D 0x0,
-	.pad_vauxp_level =3D 0x0,
-	.hspdos =3D 0x0,
-	.hspuos =3D 0x4,
-	.termos =3D 0x5,
-	.hsclkpdos =3D 0x0,
-	.hsclkpuos =3D 0x4,
-};
-
-static const struct tegra_mipi_pad tegra124_mipi_pads[] =3D {
-	{ .data =3D MIPI_CAL_CONFIG_CSIA, .clk =3D MIPI_CAL_CONFIG_CSIAB_CLK },
-	{ .data =3D MIPI_CAL_CONFIG_CSIB, .clk =3D MIPI_CAL_CONFIG_CSIAB_CLK },
-	{ .data =3D MIPI_CAL_CONFIG_CSIC, .clk =3D MIPI_CAL_CONFIG_CSICD_CLK },
-	{ .data =3D MIPI_CAL_CONFIG_CSID, .clk =3D MIPI_CAL_CONFIG_CSICD_CLK },
-	{ .data =3D MIPI_CAL_CONFIG_CSIE, .clk =3D MIPI_CAL_CONFIG_CSIE_CLK  },
-	{ .data =3D MIPI_CAL_CONFIG_DSIA, .clk =3D MIPI_CAL_CONFIG_DSIA_CLK  },
-	{ .data =3D MIPI_CAL_CONFIG_DSIB, .clk =3D MIPI_CAL_CONFIG_DSIB_CLK  },
-};
-
-static const struct tegra_mipi_soc tegra124_mipi_soc =3D {
-	.has_clk_lane =3D true,
-	.pads =3D tegra124_mipi_pads,
-	.num_pads =3D ARRAY_SIZE(tegra124_mipi_pads),
-	.clock_enable_override =3D true,
-	.needs_vclamp_ref =3D true,
-	.pad_drive_down_ref =3D 0x2,
-	.pad_drive_up_ref =3D 0x0,
-	.pad_vclamp_level =3D 0x0,
-	.pad_vauxp_level =3D 0x0,
-	.hspdos =3D 0x0,
-	.hspuos =3D 0x0,
-	.termos =3D 0x0,
-	.hsclkpdos =3D 0x1,
-	.hsclkpuos =3D 0x2,
-};
-
-static const struct tegra_mipi_soc tegra132_mipi_soc =3D {
-	.has_clk_lane =3D true,
-	.pads =3D tegra124_mipi_pads,
-	.num_pads =3D ARRAY_SIZE(tegra124_mipi_pads),
-	.clock_enable_override =3D false,
-	.needs_vclamp_ref =3D false,
-	.pad_drive_down_ref =3D 0x0,
-	.pad_drive_up_ref =3D 0x3,
-	.pad_vclamp_level =3D 0x0,
-	.pad_vauxp_level =3D 0x0,
-	.hspdos =3D 0x0,
-	.hspuos =3D 0x0,
-	.termos =3D 0x0,
-	.hsclkpdos =3D 0x3,
-	.hsclkpuos =3D 0x2,
-};
-
-static const struct tegra_mipi_pad tegra210_mipi_pads[] =3D {
-	{ .data =3D MIPI_CAL_CONFIG_CSIA, .clk =3D 0 },
-	{ .data =3D MIPI_CAL_CONFIG_CSIB, .clk =3D 0 },
-	{ .data =3D MIPI_CAL_CONFIG_CSIC, .clk =3D 0 },
-	{ .data =3D MIPI_CAL_CONFIG_CSID, .clk =3D 0 },
-	{ .data =3D MIPI_CAL_CONFIG_CSIE, .clk =3D 0 },
-	{ .data =3D MIPI_CAL_CONFIG_CSIF, .clk =3D 0 },
-	{ .data =3D MIPI_CAL_CONFIG_DSIA, .clk =3D MIPI_CAL_CONFIG_DSIA_CLK },
-	{ .data =3D MIPI_CAL_CONFIG_DSIB, .clk =3D MIPI_CAL_CONFIG_DSIB_CLK },
-	{ .data =3D MIPI_CAL_CONFIG_DSIC, .clk =3D MIPI_CAL_CONFIG_DSIC_CLK },
-	{ .data =3D MIPI_CAL_CONFIG_DSID, .clk =3D MIPI_CAL_CONFIG_DSID_CLK },
-};
-
-static const struct tegra_mipi_soc tegra210_mipi_soc =3D {
-	.has_clk_lane =3D true,
-	.pads =3D tegra210_mipi_pads,
-	.num_pads =3D ARRAY_SIZE(tegra210_mipi_pads),
-	.clock_enable_override =3D true,
-	.needs_vclamp_ref =3D false,
-	.pad_drive_down_ref =3D 0x0,
-	.pad_drive_up_ref =3D 0x3,
-	.pad_vclamp_level =3D 0x1,
-	.pad_vauxp_level =3D 0x1,
-	.hspdos =3D 0x0,
-	.hspuos =3D 0x2,
-	.termos =3D 0x0,
-	.hsclkpdos =3D 0x0,
-	.hsclkpuos =3D 0x2,
-};
-
-static const struct of_device_id tegra_mipi_of_match[] =3D {
-	{ .compatible =3D "nvidia,tegra114-mipi", .data =3D &tegra114_mipi_soc },
-	{ .compatible =3D "nvidia,tegra124-mipi", .data =3D &tegra124_mipi_soc },
-	{ .compatible =3D "nvidia,tegra132-mipi", .data =3D &tegra132_mipi_soc },
-	{ .compatible =3D "nvidia,tegra210-mipi", .data =3D &tegra210_mipi_soc },
-	{ },
-};
-
-static int tegra_mipi_probe(struct platform_device *pdev)
+/**
+ * devm_tegra_mipi_add_provider - Managed registration of a Tegra MIPI
+ *				  calibration function provider.
+ * @device: Handle to the device providing the MIPI calibration function.
+ * @np: Device node pointer of the device providing the MIPI calibration
+ *	function.
+ * @ops: Operations supported by the MIPI calibration device.
+ *
+ * This registers a device that provides MIPI calibration functions.
+ * For Tegra20 and Tegra30, this is the CSI block, while Tegra114 and
+ * newer SoC generations have a dedicated hardware block for these
+ * functions.
+ *
+ * Returns 0 on success or a negative error code on failure.
+ */
+int devm_tegra_mipi_add_provider(struct device *device, struct device_node=
 *np,
+				 const struct tegra_mipi_ops *ops)
 {
-	const struct of_device_id *match;
-	struct tegra_mipi *mipi;
-
-	match =3D of_match_node(tegra_mipi_of_match, pdev->dev.of_node);
-	if (!match)
-		return -ENODEV;
+	if (provider.np)
+		return -EBUSY;
=20
-	mipi =3D devm_kzalloc(&pdev->dev, sizeof(*mipi), GFP_KERNEL);
-	if (!mipi)
-		return -ENOMEM;
+	provider.np =3D np;
+	provider.ops =3D ops;
=20
-	mipi->soc =3D match->data;
-	mipi->dev =3D &pdev->dev;
-
-	mipi->regs =3D devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
-	if (IS_ERR(mipi->regs))
-		return PTR_ERR(mipi->regs);
-
-	mutex_init(&mipi->lock);
-
-	mipi->clk =3D devm_clk_get_prepared(&pdev->dev, NULL);
-	if (IS_ERR(mipi->clk)) {
-		dev_err(&pdev->dev, "failed to get clock\n");
-		return PTR_ERR(mipi->clk);
-	}
-
-	platform_set_drvdata(pdev, mipi);
-
-	return 0;
+	return devm_add_action_or_reset(device, tegra_mipi_remove_provider, NULL);
 }
-
-struct platform_driver tegra_mipi_driver =3D {
-	.driver =3D {
-		.name =3D "tegra-mipi",
-		.of_match_table =3D tegra_mipi_of_match,
-	},
-	.probe =3D tegra_mipi_probe,
-};
+EXPORT_SYMBOL(devm_tegra_mipi_add_provider);
diff --git a/drivers/gpu/host1x/tegra114-mipi.c b/drivers/gpu/host1x/tegra1=
14-mipi.c
new file mode 100644
index 000000000000..c084a09784d1
--- /dev/null
+++ b/drivers/gpu/host1x/tegra114-mipi.c
@@ -0,0 +1,483 @@
+/*
+ * 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 t=
hat
+ * the above copyright notice appear in all copies and that both that copy=
right
+ * notice and this permission notice appear in supporting documentation, a=
nd
+ * 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 SOFTW=
ARE,
+ * 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 PERFOR=
MANCE
+ * OF THIS SOFTWARE.
+ */
+
+#include <linux/clk.h>
+#include <linux/host1x.h>
+#include <linux/io.h>
+#include <linux/iopoll.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/tegra-mipi-cal.h>
+
+#include "dev.h"
+
+#define MIPI_CAL_CTRL			0x00
+#define MIPI_CAL_CTRL_NOISE_FILTER(x)	(((x) & 0xf) << 26)
+#define MIPI_CAL_CTRL_PRESCALE(x)	(((x) & 0x3) << 24)
+#define MIPI_CAL_CTRL_CLKEN_OVR		BIT(4)
+#define MIPI_CAL_CTRL_START		BIT(0)
+
+#define MIPI_CAL_AUTOCAL_CTRL		0x01
+
+#define MIPI_CAL_STATUS			0x02
+#define MIPI_CAL_STATUS_DONE		BIT(16)
+#define MIPI_CAL_STATUS_ACTIVE		BIT(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_CSIF		0x0a
+#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_DSIA_CLK	0x19
+#define MIPI_CAL_CONFIG_DSIB_CLK	0x1a
+#define MIPI_CAL_CONFIG_CSIAB_CLK	0x1b
+#define MIPI_CAL_CONFIG_DSIC_CLK	0x1c
+#define MIPI_CAL_CONFIG_CSICD_CLK	0x1c
+#define MIPI_CAL_CONFIG_DSID_CLK	0x1d
+#define MIPI_CAL_CONFIG_CSIE_CLK	0x1d
+
+/* for data and clock lanes */
+#define MIPI_CAL_CONFIG_SELECT		BIT(21)
+
+/* for data lanes */
+#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)
+
+/* for clock lanes */
+#define MIPI_CAL_CONFIG_HSCLKPDOSD(x)	(((x) & 0x1f) <<  8)
+#define MIPI_CAL_CONFIG_HSCLKPUOSD(x)	(((x) & 0x1f) <<  0)
+
+#define MIPI_CAL_BIAS_PAD_CFG0		0x16
+#define MIPI_CAL_BIAS_PAD_PDVCLAMP	BIT(1)
+#define MIPI_CAL_BIAS_PAD_E_VCLAMP_REF	BIT(0)
+
+#define MIPI_CAL_BIAS_PAD_CFG1		0x17
+#define MIPI_CAL_BIAS_PAD_DRV_DN_REF(x) (((x) & 0x7) << 16)
+#define MIPI_CAL_BIAS_PAD_DRV_UP_REF(x) (((x) & 0x7) << 8)
+
+#define MIPI_CAL_BIAS_PAD_CFG2		0x18
+#define MIPI_CAL_BIAS_PAD_VCLAMP(x)	(((x) & 0x7) << 16)
+#define MIPI_CAL_BIAS_PAD_VAUXP(x)	(((x) & 0x7) << 4)
+#define MIPI_CAL_BIAS_PAD_PDVREG	BIT(1)
+
+struct tegra_mipi_pad {
+	unsigned long data;
+	unsigned long clk;
+};
+
+struct tegra_mipi_soc {
+	bool has_clk_lane;
+	const struct tegra_mipi_pad *pads;
+	unsigned int num_pads;
+
+	bool clock_enable_override;
+	bool needs_vclamp_ref;
+
+	/* bias pad configuration settings */
+	u8 pad_drive_down_ref;
+	u8 pad_drive_up_ref;
+
+	u8 pad_vclamp_level;
+	u8 pad_vauxp_level;
+
+	/* calibration settings for data lanes */
+	u8 hspdos;
+	u8 hspuos;
+	u8 termos;
+
+	/* calibration settings for clock lanes */
+	u8 hsclkpdos;
+	u8 hsclkpuos;
+};
+
+struct tegra_mipi {
+	const struct tegra_mipi_soc *soc;
+	struct device *dev;
+	void __iomem *regs;
+	struct mutex lock; /* for register access */
+	struct clk *clk;
+
+	unsigned long usage_count;
+};
+
+static inline u32 tegra_mipi_readl(struct tegra_mipi *mipi,
+				   unsigned long offset)
+{
+	return readl(mipi->regs + (offset << 2));
+}
+
+static inline void tegra_mipi_writel(struct tegra_mipi *mipi, u32 value,
+				     unsigned long offset)
+{
+	writel(value, mipi->regs + (offset << 2));
+}
+
+static int tegra114_mipi_power_up(struct tegra_mipi *mipi)
+{
+	u32 value;
+	int err;
+
+	err =3D clk_enable(mipi->clk);
+	if (err < 0)
+		return err;
+
+	value =3D tegra_mipi_readl(mipi, MIPI_CAL_BIAS_PAD_CFG0);
+	value &=3D ~MIPI_CAL_BIAS_PAD_PDVCLAMP;
+
+	if (mipi->soc->needs_vclamp_ref)
+		value |=3D MIPI_CAL_BIAS_PAD_E_VCLAMP_REF;
+
+	tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG0);
+
+	value =3D tegra_mipi_readl(mipi, MIPI_CAL_BIAS_PAD_CFG2);
+	value &=3D ~MIPI_CAL_BIAS_PAD_PDVREG;
+	tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG2);
+
+	clk_disable(mipi->clk);
+
+	return 0;
+}
+
+static int tegra114_mipi_power_down(struct tegra_mipi *mipi)
+{
+	u32 value;
+	int err;
+
+	err =3D clk_enable(mipi->clk);
+	if (err < 0)
+		return err;
+
+	/*
+	 * The MIPI_CAL_BIAS_PAD_PDVREG controls a voltage regulator that
+	 * supplies the DSI pads. This must be kept enabled until none of the
+	 * DSI lanes are used anymore.
+	 */
+	value =3D tegra_mipi_readl(mipi, MIPI_CAL_BIAS_PAD_CFG2);
+	value |=3D MIPI_CAL_BIAS_PAD_PDVREG;
+	tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG2);
+
+	/*
+	 * MIPI_CAL_BIAS_PAD_PDVCLAMP and MIPI_CAL_BIAS_PAD_E_VCLAMP_REF
+	 * control a regulator that supplies current to the pre-driver logic.
+	 * Powering down this regulator causes DSI to fail, so it must remain
+	 * powered on until none of the DSI lanes are used anymore.
+	 */
+	value =3D tegra_mipi_readl(mipi, MIPI_CAL_BIAS_PAD_CFG0);
+
+	if (mipi->soc->needs_vclamp_ref)
+		value &=3D ~MIPI_CAL_BIAS_PAD_E_VCLAMP_REF;
+
+	value |=3D MIPI_CAL_BIAS_PAD_PDVCLAMP;
+	tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG0);
+
+	return 0;
+}
+
+static int tegra114_mipi_enable(struct tegra_mipi_device *mipidev)
+{
+	struct tegra_mipi *mipi =3D platform_get_drvdata(mipidev->pdev);
+	int err =3D 0;
+
+	mutex_lock(&mipi->lock);
+
+	if (mipi->usage_count++ =3D=3D 0)
+		err =3D tegra114_mipi_power_up(mipi);
+
+	mutex_unlock(&mipi->lock);
+
+	return err;
+}
+
+static int tegra114_mipi_disable(struct tegra_mipi_device *mipidev)
+{
+	struct tegra_mipi *mipi =3D platform_get_drvdata(mipidev->pdev);
+	int err =3D 0;
+
+	mutex_lock(&mipi->lock);
+
+	if (--mipi->usage_count =3D=3D 0)
+		err =3D tegra114_mipi_power_down(mipi);
+
+	mutex_unlock(&mipi->lock);
+
+	return err;
+}
+
+static int tegra114_mipi_finish_calibration(struct tegra_mipi_device *mipi=
dev)
+{
+	struct tegra_mipi *mipi =3D platform_get_drvdata(mipidev->pdev);
+	void __iomem *status_reg =3D mipi->regs + (MIPI_CAL_STATUS << 2);
+	u32 value;
+	int err;
+
+	err =3D readl_relaxed_poll_timeout(status_reg, value,
+					 !(value & MIPI_CAL_STATUS_ACTIVE) &&
+					 (value & MIPI_CAL_STATUS_DONE), 50,
+					 250000);
+	mutex_unlock(&mipi->lock);
+	clk_disable(mipi->clk);
+
+	return err;
+}
+
+static int tegra114_mipi_start_calibration(struct tegra_mipi_device *mipid=
ev)
+{
+	struct tegra_mipi *mipi =3D platform_get_drvdata(mipidev->pdev);
+	const struct tegra_mipi_soc *soc =3D mipi->soc;
+	unsigned int i;
+	u32 value;
+	int err;
+
+	err =3D clk_enable(mipi->clk);
+	if (err < 0)
+		return err;
+
+	mutex_lock(&mipi->lock);
+
+	value =3D MIPI_CAL_BIAS_PAD_DRV_DN_REF(soc->pad_drive_down_ref) |
+		MIPI_CAL_BIAS_PAD_DRV_UP_REF(soc->pad_drive_up_ref);
+	tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG1);
+
+	value =3D tegra_mipi_readl(mipi, MIPI_CAL_BIAS_PAD_CFG2);
+	value &=3D ~MIPI_CAL_BIAS_PAD_VCLAMP(0x7);
+	value &=3D ~MIPI_CAL_BIAS_PAD_VAUXP(0x7);
+	value |=3D MIPI_CAL_BIAS_PAD_VCLAMP(soc->pad_vclamp_level);
+	value |=3D MIPI_CAL_BIAS_PAD_VAUXP(soc->pad_vauxp_level);
+	tegra_mipi_writel(mipi, value, MIPI_CAL_BIAS_PAD_CFG2);
+
+	for (i =3D 0; i < soc->num_pads; i++) {
+		u32 clk =3D 0, data =3D 0;
+
+		if (mipidev->pads & BIT(i)) {
+			data =3D MIPI_CAL_CONFIG_SELECT |
+			       MIPI_CAL_CONFIG_HSPDOS(soc->hspdos) |
+			       MIPI_CAL_CONFIG_HSPUOS(soc->hspuos) |
+			       MIPI_CAL_CONFIG_TERMOS(soc->termos);
+			clk =3D MIPI_CAL_CONFIG_SELECT |
+			      MIPI_CAL_CONFIG_HSCLKPDOSD(soc->hsclkpdos) |
+			      MIPI_CAL_CONFIG_HSCLKPUOSD(soc->hsclkpuos);
+		}
+
+		tegra_mipi_writel(mipi, data, soc->pads[i].data);
+
+		if (soc->has_clk_lane && soc->pads[i].clk !=3D 0)
+			tegra_mipi_writel(mipi, clk, soc->pads[i].clk);
+	}
+
+	value =3D tegra_mipi_readl(mipi, MIPI_CAL_CTRL);
+	value &=3D ~MIPI_CAL_CTRL_NOISE_FILTER(0xf);
+	value &=3D ~MIPI_CAL_CTRL_PRESCALE(0x3);
+	value |=3D MIPI_CAL_CTRL_NOISE_FILTER(0xa);
+	value |=3D MIPI_CAL_CTRL_PRESCALE(0x2);
+
+	if (!soc->clock_enable_override)
+		value &=3D ~MIPI_CAL_CTRL_CLKEN_OVR;
+	else
+		value |=3D MIPI_CAL_CTRL_CLKEN_OVR;
+
+	tegra_mipi_writel(mipi, value, MIPI_CAL_CTRL);
+
+	/* clear any pending status bits */
+	value =3D tegra_mipi_readl(mipi, MIPI_CAL_STATUS);
+	tegra_mipi_writel(mipi, value, MIPI_CAL_STATUS);
+
+	value =3D tegra_mipi_readl(mipi, MIPI_CAL_CTRL);
+	value |=3D MIPI_CAL_CTRL_START;
+	tegra_mipi_writel(mipi, value, MIPI_CAL_CTRL);
+
+	/*
+	 * Wait for min 72uS to let calibration logic finish calibration
+	 * sequence codes before waiting for pads idle state to apply the
+	 * results.
+	 */
+	usleep_range(75, 80);
+
+	return 0;
+}
+
+static const struct tegra_mipi_ops tegra114_mipi_ops =3D {
+	.enable =3D tegra114_mipi_enable,
+	.disable =3D tegra114_mipi_disable,
+	.start_calibration =3D tegra114_mipi_start_calibration,
+	.finish_calibration =3D tegra114_mipi_finish_calibration,
+};
+
+static const struct tegra_mipi_pad tegra114_mipi_pads[] =3D {
+	{ .data =3D MIPI_CAL_CONFIG_CSIA },
+	{ .data =3D MIPI_CAL_CONFIG_CSIB },
+	{ .data =3D MIPI_CAL_CONFIG_CSIC },
+	{ .data =3D MIPI_CAL_CONFIG_CSID },
+	{ .data =3D MIPI_CAL_CONFIG_CSIE },
+	{ .data =3D MIPI_CAL_CONFIG_DSIA },
+	{ .data =3D MIPI_CAL_CONFIG_DSIB },
+	{ .data =3D MIPI_CAL_CONFIG_DSIC },
+	{ .data =3D MIPI_CAL_CONFIG_DSID },
+};
+
+static const struct tegra_mipi_soc tegra114_mipi_soc =3D {
+	.has_clk_lane =3D false,
+	.pads =3D tegra114_mipi_pads,
+	.num_pads =3D ARRAY_SIZE(tegra114_mipi_pads),
+	.clock_enable_override =3D true,
+	.needs_vclamp_ref =3D true,
+	.pad_drive_down_ref =3D 0x2,
+	.pad_drive_up_ref =3D 0x0,
+	.pad_vclamp_level =3D 0x0,
+	.pad_vauxp_level =3D 0x0,
+	.hspdos =3D 0x0,
+	.hspuos =3D 0x4,
+	.termos =3D 0x5,
+	.hsclkpdos =3D 0x0,
+	.hsclkpuos =3D 0x4,
+};
+
+static const struct tegra_mipi_pad tegra124_mipi_pads[] =3D {
+	{ .data =3D MIPI_CAL_CONFIG_CSIA, .clk =3D MIPI_CAL_CONFIG_CSIAB_CLK },
+	{ .data =3D MIPI_CAL_CONFIG_CSIB, .clk =3D MIPI_CAL_CONFIG_CSIAB_CLK },
+	{ .data =3D MIPI_CAL_CONFIG_CSIC, .clk =3D MIPI_CAL_CONFIG_CSICD_CLK },
+	{ .data =3D MIPI_CAL_CONFIG_CSID, .clk =3D MIPI_CAL_CONFIG_CSICD_CLK },
+	{ .data =3D MIPI_CAL_CONFIG_CSIE, .clk =3D MIPI_CAL_CONFIG_CSIE_CLK  },
+	{ .data =3D MIPI_CAL_CONFIG_DSIA, .clk =3D MIPI_CAL_CONFIG_DSIA_CLK  },
+	{ .data =3D MIPI_CAL_CONFIG_DSIB, .clk =3D MIPI_CAL_CONFIG_DSIB_CLK  },
+};
+
+static const struct tegra_mipi_soc tegra124_mipi_soc =3D {
+	.has_clk_lane =3D true,
+	.pads =3D tegra124_mipi_pads,
+	.num_pads =3D ARRAY_SIZE(tegra124_mipi_pads),
+	.clock_enable_override =3D true,
+	.needs_vclamp_ref =3D true,
+	.pad_drive_down_ref =3D 0x2,
+	.pad_drive_up_ref =3D 0x0,
+	.pad_vclamp_level =3D 0x0,
+	.pad_vauxp_level =3D 0x0,
+	.hspdos =3D 0x0,
+	.hspuos =3D 0x0,
+	.termos =3D 0x0,
+	.hsclkpdos =3D 0x1,
+	.hsclkpuos =3D 0x2,
+};
+
+static const struct tegra_mipi_soc tegra132_mipi_soc =3D {
+	.has_clk_lane =3D true,
+	.pads =3D tegra124_mipi_pads,
+	.num_pads =3D ARRAY_SIZE(tegra124_mipi_pads),
+	.clock_enable_override =3D false,
+	.needs_vclamp_ref =3D false,
+	.pad_drive_down_ref =3D 0x0,
+	.pad_drive_up_ref =3D 0x3,
+	.pad_vclamp_level =3D 0x0,
+	.pad_vauxp_level =3D 0x0,
+	.hspdos =3D 0x0,
+	.hspuos =3D 0x0,
+	.termos =3D 0x0,
+	.hsclkpdos =3D 0x3,
+	.hsclkpuos =3D 0x2,
+};
+
+static const struct tegra_mipi_pad tegra210_mipi_pads[] =3D {
+	{ .data =3D MIPI_CAL_CONFIG_CSIA, .clk =3D 0 },
+	{ .data =3D MIPI_CAL_CONFIG_CSIB, .clk =3D 0 },
+	{ .data =3D MIPI_CAL_CONFIG_CSIC, .clk =3D 0 },
+	{ .data =3D MIPI_CAL_CONFIG_CSID, .clk =3D 0 },
+	{ .data =3D MIPI_CAL_CONFIG_CSIE, .clk =3D 0 },
+	{ .data =3D MIPI_CAL_CONFIG_CSIF, .clk =3D 0 },
+	{ .data =3D MIPI_CAL_CONFIG_DSIA, .clk =3D MIPI_CAL_CONFIG_DSIA_CLK },
+	{ .data =3D MIPI_CAL_CONFIG_DSIB, .clk =3D MIPI_CAL_CONFIG_DSIB_CLK },
+	{ .data =3D MIPI_CAL_CONFIG_DSIC, .clk =3D MIPI_CAL_CONFIG_DSIC_CLK },
+	{ .data =3D MIPI_CAL_CONFIG_DSID, .clk =3D MIPI_CAL_CONFIG_DSID_CLK },
+};
+
+static const struct tegra_mipi_soc tegra210_mipi_soc =3D {
+	.has_clk_lane =3D true,
+	.pads =3D tegra210_mipi_pads,
+	.num_pads =3D ARRAY_SIZE(tegra210_mipi_pads),
+	.clock_enable_override =3D true,
+	.needs_vclamp_ref =3D false,
+	.pad_drive_down_ref =3D 0x0,
+	.pad_drive_up_ref =3D 0x3,
+	.pad_vclamp_level =3D 0x1,
+	.pad_vauxp_level =3D 0x1,
+	.hspdos =3D 0x0,
+	.hspuos =3D 0x2,
+	.termos =3D 0x0,
+	.hsclkpdos =3D 0x0,
+	.hsclkpuos =3D 0x2,
+};
+
+static const struct of_device_id tegra_mipi_of_match[] =3D {
+	{ .compatible =3D "nvidia,tegra114-mipi", .data =3D &tegra114_mipi_soc },
+	{ .compatible =3D "nvidia,tegra124-mipi", .data =3D &tegra124_mipi_soc },
+	{ .compatible =3D "nvidia,tegra132-mipi", .data =3D &tegra132_mipi_soc },
+	{ .compatible =3D "nvidia,tegra210-mipi", .data =3D &tegra210_mipi_soc },
+	{ },
+};
+
+static int tegra_mipi_probe(struct platform_device *pdev)
+{
+	const struct of_device_id *match;
+	struct tegra_mipi *mipi;
+
+	match =3D of_match_node(tegra_mipi_of_match, pdev->dev.of_node);
+	if (!match)
+		return -ENODEV;
+
+	mipi =3D devm_kzalloc(&pdev->dev, sizeof(*mipi), GFP_KERNEL);
+	if (!mipi)
+		return -ENOMEM;
+
+	mipi->soc =3D match->data;
+	mipi->dev =3D &pdev->dev;
+
+	mipi->regs =3D devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
+	if (IS_ERR(mipi->regs))
+		return PTR_ERR(mipi->regs);
+
+	mutex_init(&mipi->lock);
+
+	mipi->clk =3D devm_clk_get_prepared(&pdev->dev, NULL);
+	if (IS_ERR(mipi->clk)) {
+		dev_err(&pdev->dev, "failed to get clock\n");
+		return PTR_ERR(mipi->clk);
+	}
+
+	platform_set_drvdata(pdev, mipi);
+
+	return devm_tegra_mipi_add_provider(&pdev->dev, pdev->dev.of_node,
+					    &tegra114_mipi_ops);
+}
+
+struct platform_driver tegra_mipi_driver =3D {
+	.driver =3D {
+		.name =3D "tegra-mipi",
+		.of_match_table =3D tegra_mipi_of_match,
+	},
+	.probe =3D tegra_mipi_probe,
+};
diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/medi=
a/tegra-video/csi.c
index f858c05ce6c9..bcaea20c3025 100644
--- a/drivers/staging/media/tegra-video/csi.c
+++ b/drivers/staging/media/tegra-video/csi.c
@@ -12,6 +12,7 @@
 #include <linux/of_graph.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <linux/tegra-mipi-cal.h>
=20
 #include <media/v4l2-fwnode.h>
=20
diff --git a/include/linux/host1x.h b/include/linux/host1x.h
index 5e7a63143a4a..1f5f55917d1c 100644
--- a/include/linux/host1x.h
+++ b/include/linux/host1x.h
@@ -453,16 +453,6 @@ void host1x_client_unregister(struct host1x_client *cl=
ient);
 int host1x_client_suspend(struct host1x_client *client);
 int host1x_client_resume(struct host1x_client *client);
=20
-struct tegra_mipi_device;
-
-struct tegra_mipi_device *tegra_mipi_request(struct device *device,
-					     struct device_node *np);
-void tegra_mipi_free(struct tegra_mipi_device *device);
-int tegra_mipi_enable(struct tegra_mipi_device *device);
-int tegra_mipi_disable(struct tegra_mipi_device *device);
-int tegra_mipi_start_calibration(struct tegra_mipi_device *device);
-int tegra_mipi_finish_calibration(struct tegra_mipi_device *device);
-
 /* host1x memory contexts */
=20
 struct host1x_memory_context {
diff --git a/include/linux/tegra-mipi-cal.h b/include/linux/tegra-mipi-cal.h
new file mode 100644
index 000000000000..2a540b50f65d
--- /dev/null
+++ b/include/linux/tegra-mipi-cal.h
@@ -0,0 +1,57 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef __TEGRA_MIPI_CAL_H_
+#define __TEGRA_MIPI_CAL_H_
+
+struct tegra_mipi_device {
+	const struct tegra_mipi_ops *ops;
+	struct platform_device *pdev;
+	unsigned long pads;
+};
+
+/**
+ * Operations for Tegra MIPI calibration device
+ */
+struct tegra_mipi_ops {
+	/**
+	 * @enable:
+	 *
+	 * Enable MIPI calibration device
+	 */
+	int (*enable)(struct tegra_mipi_device *device);
+
+	/**
+	 * @disable:
+	 *
+	 * Disable MIPI calibration device
+	 */
+	int (*disable)(struct tegra_mipi_device *device);
+
+	/**
+	 * @start_calibration:
+	 *
+	 * Start MIPI calibration
+	 */
+	int (*start_calibration)(struct tegra_mipi_device *device);
+
+	/**
+	 * @finish_calibration:
+	 *
+	 * Finish MIPI calibration
+	 */
+	int (*finish_calibration)(struct tegra_mipi_device *device);
+};
+
+int devm_tegra_mipi_add_provider(struct device *device, struct device_node=
 *np,
+				 const struct tegra_mipi_ops *ops);
+
+struct tegra_mipi_device *tegra_mipi_request(struct device *device,
+					     struct device_node *np);
+void tegra_mipi_free(struct tegra_mipi_device *device);
+
+int tegra_mipi_enable(struct tegra_mipi_device *device);
+int tegra_mipi_disable(struct tegra_mipi_device *device);
+int tegra_mipi_start_calibration(struct tegra_mipi_device *device);
+int tegra_mipi_finish_calibration(struct tegra_mipi_device *device);
+
+#endif /* __TEGRA_MIPI_CAL_H_ */
--=20
2.51.0