From: Archit Taneja <architt@codeaurora.org> To: dri-devel@lists.freedesktop.org, a.hajda@samsung.com Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, treding@nvidia.com Subject: [RFC v2 2/5] drm/dsi: Try to match non-DT dsi devices Date: Tue, 6 Oct 2015 14:54:39 +0530 [thread overview] Message-ID: <1444123482-25579-3-git-send-email-architt@codeaurora.org> (raw) In-Reply-To: <1444123482-25579-1-git-send-email-architt@codeaurora.org> Add a device name field in mipi_dsi_device. This name is different from the actual dev name (which is of the format "hostname.reg"). When the device is created via DT, this name is set to the modalias string. In the non-DT case, the driver creating the DSI device provides the name by populating a filed in mipi_dsi_device_info. Matching for DT case would be as it was before. For the non-DT case, we compare the device and driver names. Matching by comparing driver and device names isn't the best thing to do. I'd appreciate some suggestions here. Other buses (like i2c/spi) perform a non-DT match by comparing the device name and entries in the driver's id_table. The id_table structs for different buses are defined in "include/linux/mod_devicetable.h", I didn't want to touch that for now. Signed-off-by: Archit Taneja <architt@codeaurora.org> --- drivers/gpu/drm/drm_mipi_dsi.c | 29 ++++++++++++++++++++++++++++- include/drm/drm_mipi_dsi.h | 8 ++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c index 245ecfe..46ee515 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c @@ -45,9 +45,30 @@ * subset of the MIPI DCS command set. */ +static const struct device_type mipi_dsi_device_type; + static int mipi_dsi_device_match(struct device *dev, struct device_driver *drv) { - return of_driver_match_device(dev, drv); + struct mipi_dsi_device *dsi; + + if (dev->type == &mipi_dsi_device_type) + dsi = to_mipi_dsi_device(dev); + else + return 0; + + /* Attempt OF style match */ + if (of_driver_match_device(dev, drv)) + return 1; + + /* + * Try to compare dsi device and driver names. If this matching approach + * isn't strong, we'd probably want the dsi drivers to populate the + * id_table field and use that instead + */ + if (!strcmp(dsi->name, drv->name)) + return 1; + + return 0; } static const struct dev_pm_ops mipi_dsi_device_pm_ops = { @@ -125,6 +146,7 @@ struct mipi_dsi_device *mipi_dsi_device_new(struct mipi_dsi_host *host, dsi->dev.type = &mipi_dsi_device_type; dsi->dev.of_node = info->node; dsi->channel = info->reg; + strlcpy(dsi->name, info->name, sizeof(dsi->name)); dev_set_name(&dsi->dev, "%s.%d", dev_name(host->dev), info->reg); @@ -147,6 +169,11 @@ of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node) int ret; u32 reg; + if (of_modalias_node(node, info.name, sizeof(info.name)) < 0) { + dev_err(dev, "modalias failure on %s\n", node->full_name); + return ERR_PTR(-EINVAL); + } + ret = of_property_read_u32(node, "reg", ®); if (ret) { dev_err(dev, "device node %s has no valid reg property: %d\n", diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h index 90f4f3c..93dec7b 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h @@ -139,8 +139,11 @@ enum mipi_dsi_pixel_format { MIPI_DSI_FMT_RGB565, }; +#define DSI_DEV_NAME_SIZE 20 + /** * struct mipi_dsi_device_info - template for creating a mipi_dsi_device + * @name: name of the dsi peripheral * @reg: DSI virtual channel assigned to peripheral * @node: pointer to OF device node * @@ -148,14 +151,17 @@ enum mipi_dsi_pixel_format { * DSI device */ struct mipi_dsi_device_info { + char name[DSI_DEV_NAME_SIZE]; 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 + * @name: name of the dsi peripheral * @channel: virtual channel assigned to the peripheral * @format: pixel format for video mode * @lanes: number of active data lanes @@ -165,6 +171,8 @@ struct mipi_dsi_device { struct mipi_dsi_host *host; struct device dev; + char name[DSI_DEV_NAME_SIZE]; + unsigned int channel; unsigned int lanes; enum mipi_dsi_pixel_format format; -- 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 http://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, 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 2/5] drm/dsi: Try to match non-DT dsi devices Date: Tue, 6 Oct 2015 14:54:39 +0530 [thread overview] Message-ID: <1444123482-25579-3-git-send-email-architt@codeaurora.org> (raw) In-Reply-To: <1444123482-25579-1-git-send-email-architt@codeaurora.org> Add a device name field in mipi_dsi_device. This name is different from the actual dev name (which is of the format "hostname.reg"). When the device is created via DT, this name is set to the modalias string. In the non-DT case, the driver creating the DSI device provides the name by populating a filed in mipi_dsi_device_info. Matching for DT case would be as it was before. For the non-DT case, we compare the device and driver names. Matching by comparing driver and device names isn't the best thing to do. I'd appreciate some suggestions here. Other buses (like i2c/spi) perform a non-DT match by comparing the device name and entries in the driver's id_table. The id_table structs for different buses are defined in "include/linux/mod_devicetable.h", I didn't want to touch that for now. Signed-off-by: Archit Taneja <architt@codeaurora.org> --- drivers/gpu/drm/drm_mipi_dsi.c | 29 ++++++++++++++++++++++++++++- include/drm/drm_mipi_dsi.h | 8 ++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c index 245ecfe..46ee515 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c @@ -45,9 +45,30 @@ * subset of the MIPI DCS command set. */ +static const struct device_type mipi_dsi_device_type; + static int mipi_dsi_device_match(struct device *dev, struct device_driver *drv) { - return of_driver_match_device(dev, drv); + struct mipi_dsi_device *dsi; + + if (dev->type == &mipi_dsi_device_type) + dsi = to_mipi_dsi_device(dev); + else + return 0; + + /* Attempt OF style match */ + if (of_driver_match_device(dev, drv)) + return 1; + + /* + * Try to compare dsi device and driver names. If this matching approach + * isn't strong, we'd probably want the dsi drivers to populate the + * id_table field and use that instead + */ + if (!strcmp(dsi->name, drv->name)) + return 1; + + return 0; } static const struct dev_pm_ops mipi_dsi_device_pm_ops = { @@ -125,6 +146,7 @@ struct mipi_dsi_device *mipi_dsi_device_new(struct mipi_dsi_host *host, dsi->dev.type = &mipi_dsi_device_type; dsi->dev.of_node = info->node; dsi->channel = info->reg; + strlcpy(dsi->name, info->name, sizeof(dsi->name)); dev_set_name(&dsi->dev, "%s.%d", dev_name(host->dev), info->reg); @@ -147,6 +169,11 @@ of_mipi_dsi_device_add(struct mipi_dsi_host *host, struct device_node *node) int ret; u32 reg; + if (of_modalias_node(node, info.name, sizeof(info.name)) < 0) { + dev_err(dev, "modalias failure on %s\n", node->full_name); + return ERR_PTR(-EINVAL); + } + ret = of_property_read_u32(node, "reg", ®); if (ret) { dev_err(dev, "device node %s has no valid reg property: %d\n", diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h index 90f4f3c..93dec7b 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h @@ -139,8 +139,11 @@ enum mipi_dsi_pixel_format { MIPI_DSI_FMT_RGB565, }; +#define DSI_DEV_NAME_SIZE 20 + /** * struct mipi_dsi_device_info - template for creating a mipi_dsi_device + * @name: name of the dsi peripheral * @reg: DSI virtual channel assigned to peripheral * @node: pointer to OF device node * @@ -148,14 +151,17 @@ enum mipi_dsi_pixel_format { * DSI device */ struct mipi_dsi_device_info { + char name[DSI_DEV_NAME_SIZE]; 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 + * @name: name of the dsi peripheral * @channel: virtual channel assigned to the peripheral * @format: pixel format for video mode * @lanes: number of active data lanes @@ -165,6 +171,8 @@ struct mipi_dsi_device { struct mipi_dsi_host *host; struct device dev; + char name[DSI_DEV_NAME_SIZE]; + unsigned int channel; unsigned int lanes; enum mipi_dsi_pixel_format format; -- 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:24 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 ` Archit Taneja [this message] 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-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 ` [PATCH v5 2/5] drm/dsi: Use mipi_dsi_device_register_full for DSI device creation Archit Taneja 2016-02-12 9:18 ` 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=1444123482-25579-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.