From: Archit Taneja <architt@codeaurora.org>
To: dri-devel@lists.freedesktop.org, a.hajda@samsung.com
Cc: linux-kernel@vger.kernel.org, airlied@linux.ie, daniel@ffwll.ch,
treding@nvidia.com, l.stach@pengutronix.de, robh@kernel.org,
linux-arm-msm@vger.kernel.org, jani.nikula@linux.intel.com,
Archit Taneja <architt@codeaurora.org>
Subject: [RFC v2 1/5] drm/dsi: Refactor device creation
Date: Tue, 6 Oct 2015 14:54:38 +0530 [thread overview]
Message-ID: <1444123482-25579-2-git-send-email-architt@codeaurora.org> (raw)
In-Reply-To: <1444123482-25579-1-git-send-email-architt@codeaurora.org>
Simplify the mipi dsi device creation process. device_initialize and
device_add don't need to be called separately when creating
mipi_dsi_device's. Use device_register instead to simplify things.
Create a helper function mipi_dsi_device_new which takes in struct
mipi_dsi_device_info and mipi_dsi_host. It clubs the functions
mipi_dsi_device_alloc and mipi_dsi_device_add into one.
mipi_dsi_device_info acts as a template to populate the dsi device
information. This is populated by of_mipi_dsi_device_add and passed to
mipi_dsi_device_new.
Later on, we'll provide mipi_dsi_device_new as a standalone way to create
a dsi device not available via DT.
The new device creation process tries to closely follow what's been done
in i2c_new_device in i2c-core.
Signed-off-by: Archit Taneja <architt@codeaurora.org>
---
drivers/gpu/drm/drm_mipi_dsi.c | 61 +++++++++++++++++-------------------------
include/drm/drm_mipi_dsi.h | 15 +++++++++++
2 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c
index 2d5ca8ee..245ecfe 100644
--- a/drivers/gpu/drm/drm_mipi_dsi.c
+++ b/drivers/gpu/drm/drm_mipi_dsi.c
@@ -102,9 +102,18 @@ static const struct device_type mipi_dsi_device_type = {
.release = mipi_dsi_dev_release,
};
-static struct mipi_dsi_device *mipi_dsi_device_alloc(struct mipi_dsi_host *host)
+struct mipi_dsi_device *mipi_dsi_device_new(struct mipi_dsi_host *host,
+ struct mipi_dsi_device_info *info)
{
struct mipi_dsi_device *dsi;
+ struct device *dev = host->dev;
+ int r;
+
+ if (info->reg > 3) {
+ dev_err(dev, "device node has invalid reg property: %u\n",
+ info->reg);
+ return ERR_PTR(-EINVAL);
+ }
dsi = kzalloc(sizeof(*dsi), GFP_KERNEL);
if (!dsi)
@@ -114,26 +123,27 @@ static struct mipi_dsi_device *mipi_dsi_device_alloc(struct mipi_dsi_host *host)
dsi->dev.bus = &mipi_dsi_bus_type;
dsi->dev.parent = host->dev;
dsi->dev.type = &mipi_dsi_device_type;
+ dsi->dev.of_node = info->node;
+ dsi->channel = info->reg;
- device_initialize(&dsi->dev);
-
- return dsi;
-}
-
-static int mipi_dsi_device_add(struct mipi_dsi_device *dsi)
-{
- struct mipi_dsi_host *host = dsi->host;
+ dev_set_name(&dsi->dev, "%s.%d", dev_name(host->dev), info->reg);
- dev_set_name(&dsi->dev, "%s.%d", dev_name(host->dev), dsi->channel);
+ r = device_register(&dsi->dev);
+ if (r) {
+ dev_err(dev, "failed to register device: %d\n", r);
+ kfree(dsi);
+ return ERR_PTR(r);
+ }
- return device_add(&dsi->dev);
+ return dsi;
}
+EXPORT_SYMBOL(mipi_dsi_device_new);
static struct mipi_dsi_device *
of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node)
{
- struct mipi_dsi_device *dsi;
struct device *dev = host->dev;
+ struct mipi_dsi_device_info info = { };
int ret;
u32 reg;
@@ -144,31 +154,10 @@ of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node)
return ERR_PTR(-EINVAL);
}
- if (reg > 3) {
- dev_err(dev, "device node %s has invalid reg property: %u\n",
- node->full_name, reg);
- return ERR_PTR(-EINVAL);
- }
-
- dsi = mipi_dsi_device_alloc(host);
- if (IS_ERR(dsi)) {
- dev_err(dev, "failed to allocate DSI device %s: %ld\n",
- node->full_name, PTR_ERR(dsi));
- return dsi;
- }
-
- dsi->dev.of_node = of_node_get(node);
- dsi->channel = reg;
+ info.reg = reg;
+ info.node = of_node_get(node);
- ret = mipi_dsi_device_add(dsi);
- if (ret) {
- dev_err(dev, "failed to add DSI device %s: %d\n",
- node->full_name, ret);
- kfree(dsi);
- return ERR_PTR(ret);
- }
-
- return dsi;
+ return mipi_dsi_device_new(host, &info);
}
int mipi_dsi_host_register(struct mipi_dsi_host *host)
diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h
index f1d8d0d..90f4f3c 100644
--- a/include/drm/drm_mipi_dsi.h
+++ b/include/drm/drm_mipi_dsi.h
@@ -140,6 +140,19 @@ enum mipi_dsi_pixel_format {
};
/**
+ * struct mipi_dsi_device_info - template for creating a mipi_dsi_device
+ * @reg: DSI virtual channel assigned to peripheral
+ * @node: pointer to OF device node
+ *
+ * This is populated and passed to mipi_dsi_device_new to create a new
+ * DSI device
+ */
+struct mipi_dsi_device_info {
+ u32 reg;
+ struct device_node *node;
+};
+
+/**
* struct mipi_dsi_device - DSI peripheral device
* @host: DSI host for this peripheral
* @dev: driver model device node for this peripheral
@@ -174,6 +187,8 @@ ssize_t mipi_dsi_generic_write(struct mipi_dsi_device *dsi, const void *payload,
ssize_t mipi_dsi_generic_read(struct mipi_dsi_device *dsi, const void *params,
size_t num_params, void *data, size_t size);
+struct mipi_dsi_device *mipi_dsi_device_new(struct mipi_dsi_host *host,
+ struct mipi_dsi_device_info *info);
/**
* enum mipi_dsi_dcs_tear_mode - Tearing Effect Output Line mode
* @MIPI_DSI_DCS_TEAR_MODE_VBLANK: the TE output line consists of V-Blanking
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2015-10-06 9:25 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-30 5:24 [RFC 0/2] drm/dsi: DSI for devices with different control bus Archit Taneja
2015-06-30 5:24 ` [RFC 1/2] drm/dsi: Create dummy DSI devices Archit Taneja
2015-08-19 8:10 ` Andrzej Hajda
2015-08-19 9:30 ` Archit Taneja
2015-06-30 5:24 ` [RFC 2/2] drm/dsi: Get DSI host by DT device node Archit Taneja
2015-08-19 8:46 ` Andrzej Hajda
2015-08-19 5:07 ` [RFC 0/2] drm/dsi: DSI for devices with different control bus Archit Taneja
2015-08-19 13:13 ` Thierry Reding
2015-08-19 14:17 ` Lucas Stach
2015-08-19 14:34 ` Thierry Reding
2015-08-19 14:52 ` Lucas Stach
2015-08-19 15:02 ` Thierry Reding
2015-08-19 15:39 ` Jani Nikula
2015-08-20 4:16 ` Archit Taneja
2015-08-20 11:48 ` Thierry Reding
2015-08-21 6:09 ` Archit Taneja
2015-09-07 11:46 ` Archit Taneja
2015-09-08 10:27 ` Andrzej Hajda
2015-09-10 6:15 ` Archit Taneja
2015-09-10 7:32 ` Thierry Reding
2015-09-15 10:32 ` Archit Taneja
2015-09-15 15:43 ` Rob Herring
2015-09-17 8:56 ` Archit Taneja
2015-09-15 10:41 ` Archit Taneja
2015-10-06 9:24 ` [RFC v2 0/5] " Archit Taneja
2015-10-06 9:24 ` Archit Taneja [this message]
2015-10-30 11:28 ` [RFC v2 1/5] drm/dsi: Refactor device creation Andrzej Hajda
2015-10-06 9:24 ` [RFC v2 2/5] drm/dsi: Try to match non-DT dsi devices Archit Taneja
2015-10-30 12:42 ` Andrzej Hajda
2015-11-02 5:26 ` Archit Taneja
2015-10-06 9:24 ` [RFC v2 3/5] drm/dsi: Check for used channels Archit Taneja
2015-10-30 12:52 ` Andrzej Hajda
2015-11-02 5:28 ` Archit Taneja
2015-10-06 9:24 ` [RFC v2 4/5] drm/dsi: Add routine to unregister dsi device Archit Taneja
2015-10-30 14:21 ` Andrzej Hajda
2015-11-02 6:28 ` Archit Taneja
2015-11-02 10:42 ` Andrzej Hajda
2015-11-03 7:18 ` Archit Taneja
2015-10-06 9:24 ` [RFC v2 5/5] drm/dsi: Get DSI host by DT device node Archit Taneja
2015-10-06 10:00 ` kbuild test robot
2015-11-02 10:50 ` Andrzej Hajda
2015-11-03 7:20 ` Archit Taneja
2015-11-30 12:01 ` [PATCH v3 0/5] drm/dsi: DSI for devices with different control bus Archit Taneja
2015-11-30 12:01 ` [PATCH v3 1/5] drm/dsi: Refactor device creation Archit Taneja
2015-11-30 12:01 ` [PATCH v3 2/5] drm/dsi: Try to match non-DT dsi devices Archit Taneja
2015-11-30 12:45 ` kbuild test robot
2015-12-07 5:29 ` Archit Taneja
2015-12-07 8:45 ` Jani Nikula
2015-12-07 8:59 ` Archit Taneja
2015-12-07 9:10 ` Jani Nikula
2015-12-07 9:18 ` Archit Taneja
2015-12-07 10:07 ` Jani Nikula
2015-12-07 16:55 ` Rob Clark
2015-11-30 12:01 ` [PATCH v3 3/5] drm/dsi: Check for used channels Archit Taneja
2015-11-30 12:01 ` [PATCH v3 4/5] drm/dsi: Add routine to unregister dsi device Archit Taneja
2015-11-30 12:34 ` Andrzej Hajda
2015-11-30 12:01 ` [PATCH v3 5/5] drm/dsi: Get DSI host by DT device node Archit Taneja
2015-12-10 12:41 ` [PATCH v4 0/6] drm/dsi: DSI for devices with different control bus Archit Taneja
2015-12-10 12:41 ` [PATCH v4 1/6] drm/dsi: check for CONFIG_OF when defining of_mipi_dsi_device_add Archit Taneja
2016-01-21 15:31 ` Thierry Reding
2016-01-26 14:59 ` Archit Taneja
2015-12-10 12:41 ` [PATCH v4 2/6] drm/dsi: Refactor device creation Archit Taneja
2016-01-21 15:46 ` Thierry Reding
2016-01-26 17:05 ` Archit Taneja
2015-12-10 12:41 ` [PATCH v4 3/6] drm/dsi: Try to match non-DT dsi devices Archit Taneja
2016-01-21 16:05 ` Thierry Reding
2016-01-26 18:04 ` Archit Taneja
2015-12-10 12:41 ` [PATCH v4 4/6] drm/dsi: Check for used channels Archit Taneja
2016-01-21 16:11 ` Thierry Reding
2016-01-27 5:16 ` Archit Taneja
2015-12-10 12:41 ` [PATCH v4 5/6] drm/dsi: Add routine to unregister dsi device Archit Taneja
2016-01-21 16:12 ` Thierry Reding
2016-01-27 5:20 ` Archit Taneja
2015-12-10 12:41 ` [PATCH v4 6/6] drm/dsi: Get DSI host by DT device node Archit Taneja
2016-01-21 16:16 ` Thierry Reding
2016-01-27 5:21 ` Archit Taneja
2016-01-05 5:29 ` [PATCH v4 0/6] drm/dsi: DSI for devices with different control bus Archit Taneja
2016-02-12 9:18 ` [PATCH v5 0/5] " Archit Taneja
2016-02-12 9:18 ` [PATCH v5 1/5] drm/dsi: check for CONFIG_OF when defining of_mipi_dsi_device_add Archit Taneja
2016-02-12 9:18 ` [PATCH v5 2/5] drm/dsi: Use mipi_dsi_device_register_full for DSI device creation Archit Taneja
2016-02-12 9:18 ` [PATCH v5 3/5] drm/dsi: Try to match non-DT DSI devices Archit Taneja
2016-02-12 9:18 ` [PATCH v5 4/5] drm/dsi: Add routine to unregister a DSI device Archit Taneja
2016-02-12 9:18 ` [PATCH v5 5/5] drm/dsi: Get DSI host by DT device node Archit Taneja
2016-03-02 16:05 ` [PATCH v5 0/5] drm/dsi: DSI for devices with different control bus Thierry Reding
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1444123482-25579-2-git-send-email-architt@codeaurora.org \
--to=architt@codeaurora.org \
--cc=a.hajda@samsung.com \
--cc=airlied@linux.ie \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@kernel.org \
--cc=treding@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).