From: Pantelis Antoniou <panto-wVdstyuyKrO8r51toPun2/C9HSW9iNxf@public.gmane.org>
To: Alexander Sverdlin <alexander.sverdlin-OYasijW0DpE@public.gmane.org>
Cc: Grant Likely
<grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>,
Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>,
Matt Porter <matt.porter-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>,
Koen Kooi
<koen-QLwJDigV5abLmq1fohREcCpxlwaOVQ5f@public.gmane.org>,
Greg Kroah-Hartman
<gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>,
Alison Chaiken
<Alison_Chaiken-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org>,
Dinh Nguyen <dinh.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Jan Lubbe <jluebbe-H4yykcOXDpCzQB+pC5nmwQ@public.gmane.org>,
Michael Stickel <ms-g5CePrrZ5ROELgA04lAiVw@public.gmane.org>,
Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>,
Dirk Behme <dirk.behme-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Alan Tull
<delicious.quinoa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Sascha Hauer <s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
Michael Bohan <mbohan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>,
Ionut Nicu <ioan.nicu.ext-OYasijW0DpE@public.gmane.org>,
Michal Simek <monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org>,
Matt Ranostay <mranostay-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
Joel Becker <jlbec-aKy9MeLSZ9dg9hUCZPvPmw@public.gmane.org>,
devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>,
linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-ke
Subject: Re: [PATCH v8 7/8] of: spi: Export single device registration method and accessors
Date: Wed, 29 Oct 2014 10:19:33 +0200 [thread overview]
Message-ID: <6C87C279-4ED7-4E37-88FA-87C61437975F@antoniou-consulting.com> (raw)
In-Reply-To: <54509AE2.80404-OYasijW0DpE@public.gmane.org>
Hi Alexander,
> On Oct 29, 2014, at 09:44 , Alexander Sverdlin <alexander.sverdlin@nsn.com> wrote:
>
> Hello Pantelis,
>
> I've pointed to this already, but anyway:
>
> On 28/10/14 21:36, ext Pantelis Antoniou wrote:
>> Dynamically inserting spi device nodes requires the use of a single
>> device registration method. Rework and export it.
>>
>> Methods to lookup a device/master using a device node are added
>> as well, of_find_spi_master_by_node() & of_find_spi_device_by_node().
>>
>> Signed-off-by: Pantelis Antoniou <pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
>> ---
>> drivers/spi/spi.c | 256 +++++++++++++++++++++++++++++++++---------------------
>> 1 file changed, 158 insertions(+), 98 deletions(-)
>>
>> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
>> index ebcb33d..f81d799 100644
>> --- a/drivers/spi/spi.c
>> +++ b/drivers/spi/spi.c
>> @@ -1220,6 +1220,123 @@ err_init_queue:
>> /*-------------------------------------------------------------------------*/
>>
>> #if defined(CONFIG_OF)
>> +
>> +static struct spi_device *
>> +of_register_spi_device(struct spi_master *master, struct device_node *node)
>
> During the test Wladislav has found that node is actually not used,
>
Ugh.
>> +{
>> + struct spi_device *spi;
>> + struct device_node *nc;
>
> but non-initialized nc is used further in the code.
> Should not nc be a parameter of the function instead of a local variable?
>
Yes, my mistake. Updated patch follows.
>> + int rc;
>> + u32 value;
>> +
>> + /* Alloc an spi_device */
>> + spi = spi_alloc_device(master);
>> + if (!spi) {
>> + dev_err(&master->dev, "spi_device alloc error for %s\n",
>> + nc->full_name);
>> + rc = -ENOMEM;
>> + goto err_out;
>> + }
>> +
>> + /* Select device driver */
>> + rc = of_modalias_node(nc, spi->modalias,
>> + sizeof(spi->modalias));
>> + if (rc < 0) {
>> + dev_err(&master->dev, "cannot find modalias for %s\n",
>> + nc->full_name);
>> + goto err_out;
>> + }
>> +
>> + /* Device address */
>> + rc = of_property_read_u32(nc, "reg", &value);
>> + if (rc) {
>> + dev_err(&master->dev, "%s has no valid 'reg' property (%d)\n",
>> + nc->full_name, rc);
>> + goto err_out;
>> + }
>> + spi->chip_select = value;
>> +
>> + /* Mode (clock phase/polarity/etc.) */
>> + if (of_find_property(nc, "spi-cpha", NULL))
>> + spi->mode |= SPI_CPHA;
>> + if (of_find_property(nc, "spi-cpol", NULL))
>> + spi->mode |= SPI_CPOL;
>> + if (of_find_property(nc, "spi-cs-high", NULL))
>> + spi->mode |= SPI_CS_HIGH;
>> + if (of_find_property(nc, "spi-3wire", NULL))
>> + spi->mode |= SPI_3WIRE;
>> + if (of_find_property(nc, "spi-lsb-first", NULL))
>> + spi->mode |= SPI_LSB_FIRST;
>> +
>> + /* Device DUAL/QUAD mode */
>> + if (!of_property_read_u32(nc, "spi-tx-bus-width", &value)) {
>> + switch (value) {
>> + case 1:
>> + break;
>> + case 2:
>> + spi->mode |= SPI_TX_DUAL;
>> + break;
>> + case 4:
>> + spi->mode |= SPI_TX_QUAD;
>> + break;
>> + default:
>> + dev_warn(&master->dev,
>> + "spi-tx-bus-width %d not supported\n",
>> + value);
>> + break;
>> + }
>> + }
>> +
>> + if (!of_property_read_u32(nc, "spi-rx-bus-width", &value)) {
>> + switch (value) {
>> + case 1:
>> + break;
>> + case 2:
>> + spi->mode |= SPI_RX_DUAL;
>> + break;
>> + case 4:
>> + spi->mode |= SPI_RX_QUAD;
>> + break;
>> + default:
>> + dev_warn(&master->dev,
>> + "spi-rx-bus-width %d not supported\n",
>> + value);
>> + break;
>> + }
>> + }
>> +
>> + /* Device speed */
>> + rc = of_property_read_u32(nc, "spi-max-frequency", &value);
>> + if (rc) {
>> + dev_err(&master->dev, "%s has no valid 'spi-max-frequency' property (%d)\n",
>> + nc->full_name, rc);
>> + goto err_out;
>> + }
>> + spi->max_speed_hz = value;
>> +
>> + /* IRQ */
>> + spi->irq = irq_of_parse_and_map(nc, 0);
>> +
>> + /* Store a pointer to the node in the device structure */
>> + of_node_get(nc);
>> + spi->dev.of_node = nc;
>> +
>> + /* Register the new device */
>> + request_module("%s%s", SPI_MODULE_PREFIX, spi->modalias);
>> + rc = spi_add_device(spi);
>> + if (rc) {
>> + dev_err(&master->dev, "spi_device register error %s\n",
>> + nc->full_name);
>> + goto err_out;
>> + }
>> +
>> + return spi;
>> +
>> +err_out:
>> + spi_dev_put(spi);
>> + return ERR_PTR(rc);
>> +}
>> +
>> /**
>> * of_register_spi_devices() - Register child devices onto the SPI bus
>> * @master: Pointer to spi_master device
>> @@ -1229,120 +1346,63 @@ err_init_queue:
>> */
>> static void of_register_spi_devices(struct spi_master *master)
>> {
>> - struct spi_device *spi;
>> struct device_node *nc;
>> - int rc;
>> - u32 value;
>> + struct spi_device *spi;
>>
>> if (!master->dev.of_node)
>> return;
>>
>> for_each_available_child_of_node(master->dev.of_node, nc) {
>> - /* Alloc an spi_device */
>> - spi = spi_alloc_device(master);
>> - if (!spi) {
>> - dev_err(&master->dev, "spi_device alloc error for %s\n",
>> + spi = of_register_spi_device(master, nc);
>> + if (IS_ERR(spi))
>> + dev_warn(&master->dev, "Failed to create SPI device for %s\n",
>> nc->full_name);
>> - spi_dev_put(spi);
>> - continue;
>> - }
>> + }
>> +}
>>
>> - /* Select device driver */
>> - if (of_modalias_node(nc, spi->modalias,
>> - sizeof(spi->modalias)) < 0) {
>> - dev_err(&master->dev, "cannot find modalias for %s\n",
>> - nc->full_name);
>> - spi_dev_put(spi);
>> - continue;
>> - }
>> +static int of_dev_node_match(struct device *dev, void *data)
>> +{
>> + return dev->of_node == data;
>> +}
>>
>> - /* Device address */
>> - rc = of_property_read_u32(nc, "reg", &value);
>> - if (rc) {
>> - dev_err(&master->dev, "%s has no valid 'reg' property (%d)\n",
>> - nc->full_name, rc);
>> - spi_dev_put(spi);
>> - continue;
>> - }
>> - spi->chip_select = value;
>> -
>> - /* Mode (clock phase/polarity/etc.) */
>> - if (of_find_property(nc, "spi-cpha", NULL))
>> - spi->mode |= SPI_CPHA;
>> - if (of_find_property(nc, "spi-cpol", NULL))
>> - spi->mode |= SPI_CPOL;
>> - if (of_find_property(nc, "spi-cs-high", NULL))
>> - spi->mode |= SPI_CS_HIGH;
>> - if (of_find_property(nc, "spi-3wire", NULL))
>> - spi->mode |= SPI_3WIRE;
>> - if (of_find_property(nc, "spi-lsb-first", NULL))
>> - spi->mode |= SPI_LSB_FIRST;
>> -
>> - /* Device DUAL/QUAD mode */
>> - if (!of_property_read_u32(nc, "spi-tx-bus-width", &value)) {
>> - switch (value) {
>> - case 1:
>> - break;
>> - case 2:
>> - spi->mode |= SPI_TX_DUAL;
>> - break;
>> - case 4:
>> - spi->mode |= SPI_TX_QUAD;
>> - break;
>> - default:
>> - dev_warn(&master->dev,
>> - "spi-tx-bus-width %d not supported\n",
>> - value);
>> - break;
>> - }
>> - }
>> +/* bah; the match functions differ just by const-ness */
>> +static int of_dev_node_match_const(struct device *dev, const void *data)
>> +{
>> + return dev->of_node == data;
>> +}
>>
>> - if (!of_property_read_u32(nc, "spi-rx-bus-width", &value)) {
>> - switch (value) {
>> - case 1:
>> - break;
>> - case 2:
>> - spi->mode |= SPI_RX_DUAL;
>> - break;
>> - case 4:
>> - spi->mode |= SPI_RX_QUAD;
>> - break;
>> - default:
>> - dev_warn(&master->dev,
>> - "spi-rx-bus-width %d not supported\n",
>> - value);
>> - break;
>> - }
>> - }
>> +/* must call put_device() when done with returned spi_device device */
>> +struct spi_device *of_find_spi_device_by_node(struct device_node *node)
>> +{
>> + struct device *dev;
>>
>> - /* Device speed */
>> - rc = of_property_read_u32(nc, "spi-max-frequency", &value);
>> - if (rc) {
>> - dev_err(&master->dev, "%s has no valid 'spi-max-frequency' property (%d)\n",
>> - nc->full_name, rc);
>> - spi_dev_put(spi);
>> - continue;
>> - }
>> - spi->max_speed_hz = value;
>> + dev = bus_find_device(&spi_bus_type, NULL, node,
>> + of_dev_node_match);
>> + if (!dev)
>> + return NULL;
>>
>> - /* IRQ */
>> - spi->irq = irq_of_parse_and_map(nc, 0);
>> + return to_spi_device(dev);
>> +}
>> +EXPORT_SYMBOL(of_find_spi_device_by_node);
>>
>> - /* Store a pointer to the node in the device structure */
>> - of_node_get(nc);
>> - spi->dev.of_node = nc;
>> +/* forward decl */
>> +static struct class spi_master_class;
>>
>> - /* Register the new device */
>> - request_module("%s%s", SPI_MODULE_PREFIX, spi->modalias);
>> - rc = spi_add_device(spi);
>> - if (rc) {
>> - dev_err(&master->dev, "spi_device register error %s\n",
>> - nc->full_name);
>> - spi_dev_put(spi);
>> - }
>> +/* the spi masters are not using spi_bus, so we find it with another way */
>> +struct spi_master *of_find_spi_master_by_node(struct device_node *node)
>> +{
>> + struct device *dev;
>>
>> - }
>> + dev = class_find_device(&spi_master_class, NULL, node,
>> + of_dev_node_match_const);
>> + if (!dev)
>> + return NULL;
>> +
>> + /* reference got in class_find_device */
>> + return container_of(dev, struct spi_master, dev);
>> }
>> +EXPORT_SYMBOL(of_find_spi_master_by_node);
>> +
>> #else
>> static void of_register_spi_devices(struct spi_master *master) { }
>> #endif
>>
>
> --
> Best regards,
> Alexander Sverdlin.
Regards
— Pantelis
--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2014-10-29 8:19 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 20:35 [PATCH v8 0/8] Device Tree Overlays - 8th time's the charm Pantelis Antoniou
[not found] ` <1414528565-10907-1-git-send-email-pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-10-28 20:35 ` [PATCH v8 1/8] OF: Introduce DT overlay support. (v2) Pantelis Antoniou
[not found] ` <1414528565-10907-2-git-send-email-pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-11-13 23:36 ` Grant Likely
[not found] ` <20141113233618.1C378C40B52-WNowdnHR2B42iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2014-11-17 14:35 ` Pantelis Antoniou
[not found] ` <3DA4B86C-C294-400D-8D03-D850B940CF7B-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-11-17 22:54 ` Grant Likely
2014-10-28 20:36 ` [PATCH v8 4/8] OF: platform: Add OF notifier handler Pantelis Antoniou
[not found] ` <1414528565-10907-5-git-send-email-pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-11-13 23:29 ` Grant Likely
[not found] ` <20141113232944.1F136C40B52-WNowdnHR2B42iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2014-11-14 15:13 ` Pantelis Antoniou
2014-10-28 20:35 ` [PATCH v8 2/8] OF: selftest: Add overlay self-test support. (v2) Pantelis Antoniou
2014-10-28 20:36 ` [PATCH v8 3/8] OF: DT-Overlay configfs interface (v2) Pantelis Antoniou
[not found] ` <1414528565-10907-4-git-send-email-pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-11-25 10:28 ` Grant Likely
2014-11-25 14:50 ` Pantelis Antoniou
[not found] ` <773D4828-4530-46E7-8786-1DBA490C36EB-wVdstyuyKrO8r51toPun2/C9HSW9iNxf@public.gmane.org>
2014-11-26 12:49 ` Grant Likely
2014-10-28 20:36 ` [PATCH v8 5/8] of: i2c: Export single device registration method Pantelis Antoniou
[not found] ` <1414528565-10907-6-git-send-email-pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-11-21 1:46 ` Grant Likely
[not found] ` <20141121014631.C86D5C413E8-WNowdnHR2B42iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2014-11-23 16:22 ` Wolfram Sang
2014-10-28 20:36 ` [PATCH v8 6/8] OF: i2c: Add OF notifier handler Pantelis Antoniou
[not found] ` <1414528565-10907-7-git-send-email-pantelis.antoniou-OWPKS81ov/FWk0Htik3J/w@public.gmane.org>
2014-11-21 1:53 ` Grant Likely
2014-11-21 2:03 ` Guenter Roeck
[not found] ` <546E9D75.3000208-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>
2014-11-21 15:08 ` Grant Likely
[not found] ` <20141121150837.20DC4C40D85-WNowdnHR2B42iJbIjFUEsiwD8/FfD2ys@public.gmane.org>
2014-11-21 15:11 ` Pantelis Antoniou
2014-11-23 16:23 ` Wolfram Sang
2014-10-28 20:36 ` [PATCH v8 7/8] of: spi: Export single device registration method and accessors Pantelis Antoniou
2014-10-29 7:44 ` Alexander Sverdlin
[not found] ` <54509AE2.80404-OYasijW0DpE@public.gmane.org>
2014-10-29 8:19 ` Pantelis Antoniou [this message]
2014-10-28 20:36 ` [PATCH v8 8/8] OF: spi: Add OF notifier handler Pantelis Antoniou
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=6C87C279-4ED7-4E37-88FA-87C61437975F@antoniou-consulting.com \
--to=panto-wvdstyuykro8r51topun2/c9hsw9inxf@public.gmane.org \
--cc=Alison_Chaiken-nmGgyN9QBj3QT0dZR+AlfA@public.gmane.org \
--cc=alexander.sverdlin-OYasijW0DpE@public.gmane.org \
--cc=broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
--cc=delicious.quinoa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=dinh.linux-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=dirk.behme-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org \
--cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \
--cc=ioan.nicu.ext-OYasijW0DpE@public.gmane.org \
--cc=jlbec-aKy9MeLSZ9dg9hUCZPvPmw@public.gmane.org \
--cc=jluebbe-H4yykcOXDpCzQB+pC5nmwQ@public.gmane.org \
--cc=koen-QLwJDigV5abLmq1fohREcCpxlwaOVQ5f@public.gmane.org \
--cc=linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=matt.porter-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org \
--cc=mbohan-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org \
--cc=monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org \
--cc=mranostay-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=ms-g5CePrrZ5ROELgA04lAiVw@public.gmane.org \
--cc=robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
--cc=s.hauer-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org \
--cc=swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org \
--cc=wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org \
/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).