From patchwork Wed Oct 29 08:40:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pantelis Antoniou X-Patchwork-Id: 5185211 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 49B289F387 for ; Wed, 29 Oct 2014 08:40:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3356920225 for ; Wed, 29 Oct 2014 08:40:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 01FE72022A for ; Wed, 29 Oct 2014 08:40:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755698AbaJ2Ikt (ORCPT ); Wed, 29 Oct 2014 04:40:49 -0400 Received: from mail-wi0-f169.google.com ([209.85.212.169]:62567 "EHLO mail-wi0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755932AbaJ2Ikq (ORCPT ); Wed, 29 Oct 2014 04:40:46 -0400 Received: by mail-wi0-f169.google.com with SMTP id n3so908571wiv.2 for ; Wed, 29 Oct 2014 01:40:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=yYnpUAirsUDHuinD/QDZB88Z4XiLho+ArKFrOR6YC7k=; b=VLQNNXyaisMmuYbYuKeL5Rl6/1Q30CTyYydD2ZpUIaheZ494EHPjsSiklF/2RzeXxz BmzPuFBWjWxlb4YzsJwZzRt+Z2Yk2IKGPd8InCvvsE1D6/jK1cckCWOUp0PIS6Yufr/l mx49fruhHbdX2zTNZNtYqJI2aNKHz5uwbEEwohvuosebEKmHruskLTyIOGE4jS2L5sMr nFsG0ysa6D2ArJMeLxtuiqDIVt6pC5fwO4plf6wh8gtkn5SC7morM0vo+nFuF27F6dzu zURa/yP/NBM0G4aFM7/NqymDXpgbBTTumeFwwXqchCkqSZq0M0d1Eo6JqDJjqtjsBZua O88w== X-Gm-Message-State: ALoCoQnHAlPe9cmcNdhxVsEAk+XfdH4K+Xsdt2MqFGsJwPznYN24aRrs/qVyXlcBXCvFfaYyyho2 X-Received: by 10.194.134.200 with SMTP id pm8mr565908wjb.136.1414572044682; Wed, 29 Oct 2014 01:40:44 -0700 (PDT) Received: from sles11esa.localdomain ([195.97.110.117]) by mx.google.com with ESMTPSA id bi7sm4744965wib.17.2014.10.29.01.40.39 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 29 Oct 2014 01:40:43 -0700 (PDT) From: Pantelis Antoniou To: Alexander Sverdlin Cc: Grant Likely , Rob Herring , Stephen Warren , Matt Porter , Koen Kooi , Greg Kroah-Hartman , Alison Chaiken , Dinh Nguyen , Jan Lubbe , Michael Stickel , Guenter Roeck , Dirk Behme , Alan Tull , Sascha Hauer , Michael Bohan , Ionut Nicu , Michal Simek , Matt Ranostay , Joel Becker , devicetree@vger.kernel.org, Wolfram Sang , linux-i2c@vger.kernel.org, Mark Brown , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Pete Popov , Dan Malek , Georgi Vlaev , Pantelis Antoniou , Pantelis Antoniou Subject: [PATCH] of: spi: Export single device registration method and accessors (v2) Date: Wed, 29 Oct 2014 10:40:37 +0200 Message-Id: <1414572037-11306-1-git-send-email-pantelis.antoniou@konsulko.com> X-Mailer: git-send-email 1.7.12 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(). Changes since v1: * Brown paper bug with parameter on of_register_spi_device(). Signed-off-by: Pantelis Antoniou Acked-by: Alexander Sverdlin --- drivers/spi/spi.c | 255 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 157 insertions(+), 98 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index ebcb33d..4778366 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1220,6 +1220,122 @@ err_init_queue: /*-------------------------------------------------------------------------*/ #if defined(CONFIG_OF) + +static struct spi_device * +of_register_spi_device(struct spi_master *master, struct device_node *nc) +{ + struct spi_device *spi; + 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 +1345,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