From: Archit Taneja <architt@codeaurora.org> To: dri-devel@lists.freedesktop.org, treding@nvidia.com Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, a.hajda@samsung.com Subject: [PATCH v5 2/5] drm/dsi: Use mipi_dsi_device_register_full for DSI device creation Date: Fri, 12 Feb 2016 14:48:31 +0530 [thread overview] Message-ID: <1455268714-28755-3-git-send-email-architt@codeaurora.org> (raw) In-Reply-To: <1455268714-28755-1-git-send-email-architt@codeaurora.org> Use mipi_dsi_device_register_full for device creation. This takes in mipi_dsi_device_info as a template to populate the DSI device information. The reason to introduce this is to have a way to create DSI devices not available via DT. Drivers that want to create a DSI device can populate mipi_dsi_device_info and call this function. For DSI devices available via DT, of_mipi_dsi_device_add is used as before, but this now calls mipi_dsi_device_register_full internally. Signed-off-by: Archit Taneja <architt@codeaurora.org> --- drivers/gpu/drm/drm_mipi_dsi.c | 64 +++++++++++++++++++++++++++++++----------- include/drm/drm_mipi_dsi.h | 16 +++++++++++ 2 files changed, 63 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c index 4f2a704..5d7243d 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c @@ -133,8 +133,8 @@ static int mipi_dsi_device_add(struct mipi_dsi_device *dsi) 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; @@ -145,39 +145,69 @@ 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); + info.channel = reg; + info.node = of_node_get(node); + + return mipi_dsi_device_register_full(host, &info); +} +#else +static struct mipi_dsi_device * +of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node) +{ + return ERR_PTR(-ENODEV); +} +#endif + +/** + * mipi_dsi_device_register_full - create a MIPI DSI device + * @host: DSI host to which this device is connected + * @info: pointer to template containing DSI device information + * + * Create a MIPI DSI device by using the device information provided by + * mipi_dsi_device_info template + * + * Returns: + * A pointer to the newly created MIPI DSI device, or, a pointer encoded + * with an error + */ +struct mipi_dsi_device * +mipi_dsi_device_register_full(struct mipi_dsi_host *host, + const struct mipi_dsi_device_info *info) +{ + struct mipi_dsi_device *dsi; + struct device *dev = host->dev; + int ret; + + if (!info) { + dev_err(dev, "invalid mipi_dsi_device_info pointer\n"); + return ERR_PTR(-EINVAL); + } + + if (info->channel > 3) { + dev_err(dev, "invalid virtual channel: %u\n", info->channel); 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)); + dev_err(dev, "failed to allocate DSI device %ld\n", + PTR_ERR(dsi)); return dsi; } - dsi->dev.of_node = of_node_get(node); - dsi->channel = reg; + dsi->dev.of_node = info->node; + dsi->channel = info->channel; ret = mipi_dsi_device_add(dsi); if (ret) { - dev_err(dev, "failed to add DSI device %s: %d\n", - node->full_name, ret); + dev_err(dev, "failed to add DSI device %d\n", ret); kfree(dsi); return ERR_PTR(ret); } return dsi; } -#else -static struct mipi_dsi_device * -of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node) -{ - return ERR_PTR(-ENODEV); -} -#endif +EXPORT_SYMBOL(mipi_dsi_device_register_full); 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 1b3b1f8..ce5eae43 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h @@ -139,6 +139,19 @@ enum mipi_dsi_pixel_format { MIPI_DSI_FMT_RGB565, }; + /** + * struct mipi_dsi_device_info - template for creating a mipi_dsi_device + * @channel: 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 channel; + struct device_node *node; +}; + /** * struct mipi_dsi_device - DSI peripheral device * @host: DSI host for this peripheral @@ -188,6 +201,9 @@ static inline int mipi_dsi_pixel_format_to_bpp(enum mipi_dsi_pixel_format fmt) return -EINVAL; } +struct mipi_dsi_device * +mipi_dsi_device_register_full(struct mipi_dsi_host *host, + const struct mipi_dsi_device_info *info); struct mipi_dsi_device *of_find_mipi_dsi_device_by_node(struct device_node *np); int mipi_dsi_attach(struct mipi_dsi_device *dsi); int mipi_dsi_detach(struct mipi_dsi_device *dsi); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Archit Taneja <architt@codeaurora.org> To: dri-devel@lists.freedesktop.org, treding@nvidia.com Cc: linux-kernel@vger.kernel.org, a.hajda@samsung.com, airlied@linux.ie, daniel@ffwll.ch, l.stach@pengutronix.de, robh@kernel.org, linux-arm-msm@vger.kernel.org, jani.nikula@linux.intel.com, Archit Taneja <architt@codeaurora.org> Subject: [PATCH v5 2/5] drm/dsi: Use mipi_dsi_device_register_full for DSI device creation Date: Fri, 12 Feb 2016 14:48:31 +0530 [thread overview] Message-ID: <1455268714-28755-3-git-send-email-architt@codeaurora.org> (raw) In-Reply-To: <1455268714-28755-1-git-send-email-architt@codeaurora.org> Use mipi_dsi_device_register_full for device creation. This takes in mipi_dsi_device_info as a template to populate the DSI device information. The reason to introduce this is to have a way to create DSI devices not available via DT. Drivers that want to create a DSI device can populate mipi_dsi_device_info and call this function. For DSI devices available via DT, of_mipi_dsi_device_add is used as before, but this now calls mipi_dsi_device_register_full internally. Signed-off-by: Archit Taneja <architt@codeaurora.org> --- drivers/gpu/drm/drm_mipi_dsi.c | 64 +++++++++++++++++++++++++++++++----------- include/drm/drm_mipi_dsi.h | 16 +++++++++++ 2 files changed, 63 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c index 4f2a704..5d7243d 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c @@ -133,8 +133,8 @@ static int mipi_dsi_device_add(struct mipi_dsi_device *dsi) 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; @@ -145,39 +145,69 @@ 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); + info.channel = reg; + info.node = of_node_get(node); + + return mipi_dsi_device_register_full(host, &info); +} +#else +static struct mipi_dsi_device * +of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node) +{ + return ERR_PTR(-ENODEV); +} +#endif + +/** + * mipi_dsi_device_register_full - create a MIPI DSI device + * @host: DSI host to which this device is connected + * @info: pointer to template containing DSI device information + * + * Create a MIPI DSI device by using the device information provided by + * mipi_dsi_device_info template + * + * Returns: + * A pointer to the newly created MIPI DSI device, or, a pointer encoded + * with an error + */ +struct mipi_dsi_device * +mipi_dsi_device_register_full(struct mipi_dsi_host *host, + const struct mipi_dsi_device_info *info) +{ + struct mipi_dsi_device *dsi; + struct device *dev = host->dev; + int ret; + + if (!info) { + dev_err(dev, "invalid mipi_dsi_device_info pointer\n"); + return ERR_PTR(-EINVAL); + } + + if (info->channel > 3) { + dev_err(dev, "invalid virtual channel: %u\n", info->channel); 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)); + dev_err(dev, "failed to allocate DSI device %ld\n", + PTR_ERR(dsi)); return dsi; } - dsi->dev.of_node = of_node_get(node); - dsi->channel = reg; + dsi->dev.of_node = info->node; + dsi->channel = info->channel; ret = mipi_dsi_device_add(dsi); if (ret) { - dev_err(dev, "failed to add DSI device %s: %d\n", - node->full_name, ret); + dev_err(dev, "failed to add DSI device %d\n", ret); kfree(dsi); return ERR_PTR(ret); } return dsi; } -#else -static struct mipi_dsi_device * -of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node) -{ - return ERR_PTR(-ENODEV); -} -#endif +EXPORT_SYMBOL(mipi_dsi_device_register_full); 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 1b3b1f8..ce5eae43 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h @@ -139,6 +139,19 @@ enum mipi_dsi_pixel_format { MIPI_DSI_FMT_RGB565, }; + /** + * struct mipi_dsi_device_info - template for creating a mipi_dsi_device + * @channel: 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 channel; + struct device_node *node; +}; + /** * struct mipi_dsi_device - DSI peripheral device * @host: DSI host for this peripheral @@ -188,6 +201,9 @@ static inline int mipi_dsi_pixel_format_to_bpp(enum mipi_dsi_pixel_format fmt) return -EINVAL; } +struct mipi_dsi_device * +mipi_dsi_device_register_full(struct mipi_dsi_host *host, + const struct mipi_dsi_device_info *info); struct mipi_dsi_device *of_find_mipi_dsi_device_by_node(struct device_node *np); int mipi_dsi_attach(struct mipi_dsi_device *dsi); int mipi_dsi_detach(struct mipi_dsi_device *dsi); -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation
next prev parent reply other threads:[~2016-02-12 9:18 UTC|newest] Thread overview: 144+ 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-06-30 5:24 ` Archit Taneja 2015-08-19 8:10 ` Andrzej Hajda 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-06-30 5:24 ` Archit Taneja 2015-08-19 8:46 ` Andrzej Hajda 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 13:13 ` Thierry Reding 2015-08-19 14:17 ` Lucas Stach 2015-08-19 14:34 ` Thierry Reding 2015-08-19 14:34 ` Thierry Reding 2015-08-19 14:52 ` Lucas Stach 2015-08-19 14:52 ` Lucas Stach 2015-08-19 15:02 ` Thierry Reding 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-20 11:48 ` Thierry Reding 2015-08-21 6:09 ` Archit Taneja 2015-08-21 6:09 ` Archit Taneja 2015-09-07 11:46 ` 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 6:15 ` Archit Taneja 2015-09-10 7:32 ` Thierry Reding 2015-09-10 7:32 ` Thierry Reding 2015-09-15 10:32 ` Archit Taneja 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-09-15 10:41 ` Archit Taneja 2015-10-06 9:24 ` [RFC v2 0/5] " Archit Taneja 2015-10-06 9:24 ` [RFC v2 1/5] drm/dsi: Refactor device creation Archit Taneja 2015-10-06 9:24 ` Archit Taneja 2015-10-30 11:28 ` Andrzej Hajda 2015-10-30 11:28 ` Andrzej Hajda 2015-10-06 9:24 ` [RFC v2 2/5] drm/dsi: Try to match non-DT dsi devices Archit Taneja 2015-10-06 9:24 ` Archit Taneja 2015-10-30 12:42 ` Andrzej Hajda 2015-10-30 12:42 ` Andrzej Hajda 2015-11-02 5:26 ` Archit Taneja 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-06 9:24 ` Archit Taneja 2015-10-30 12:52 ` Andrzej Hajda 2015-11-02 5:28 ` Archit Taneja 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-06 9:24 ` Archit Taneja 2015-10-30 14:21 ` Andrzej Hajda 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 9:24 ` Archit Taneja 2015-10-06 10:00 ` kbuild test robot 2015-10-06 10:00 ` kbuild test robot 2015-11-02 10:50 ` Andrzej Hajda 2015-11-02 10:50 ` Andrzej Hajda 2015-11-03 7:20 ` Archit Taneja 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 ` 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:01 ` Archit Taneja 2015-11-30 12:45 ` kbuild test robot 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 8:59 ` Archit Taneja 2015-12-07 9:10 ` Jani Nikula 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 ` 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:01 ` Archit Taneja 2015-11-30 12:34 ` Andrzej Hajda 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-11-30 12:01 ` 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 2015-12-10 12:41 ` Archit Taneja 2016-01-21 15:31 ` Thierry Reding 2016-01-21 15:31 ` Thierry Reding 2016-01-26 14:59 ` Archit Taneja 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-21 15:46 ` Thierry Reding 2016-01-26 17:05 ` Archit Taneja 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 2015-12-10 12:41 ` Archit Taneja 2016-01-21 16:05 ` Thierry Reding 2016-01-21 16:05 ` Thierry Reding 2016-01-26 18:04 ` Archit Taneja 2016-01-26 18:04 ` Archit Taneja 2015-12-10 12:41 ` [PATCH v4 4/6] drm/dsi: Check for used channels Archit Taneja 2015-12-10 12:41 ` Archit Taneja 2016-01-21 16:11 ` Thierry Reding 2016-01-21 16:11 ` Thierry Reding 2016-01-27 5:16 ` Archit Taneja 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 2015-12-10 12:41 ` Archit Taneja 2016-01-21 16:12 ` Thierry Reding 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 2015-12-10 12:41 ` Archit Taneja 2016-01-21 16:16 ` Thierry Reding 2016-01-21 16:16 ` Thierry Reding 2016-01-27 5:21 ` Archit Taneja 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 ` 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 ` Archit Taneja 2016-02-12 9:18 ` Archit Taneja [this message] 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 ` 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 ` Archit Taneja 2016-02-12 9:18 ` [PATCH v5 5/5] drm/dsi: Get DSI host by DT device node Archit Taneja 2016-02-12 9:18 ` Archit Taneja 2016-03-02 16:05 ` [PATCH v5 0/5] drm/dsi: DSI for devices with different control bus Thierry Reding 2016-03-02 16:05 ` 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=1455268714-28755-3-git-send-email-architt@codeaurora.org \ --to=architt@codeaurora.org \ --cc=a.hajda@samsung.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.