From patchwork Sun Feb 14 20:48:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 582559 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id E3C87140321 for ; Mon, 15 Feb 2016 07:51:52 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E38ACA761A; Sun, 14 Feb 2016 21:51:08 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AF-0ixxgGiKL; Sun, 14 Feb 2016 21:51:08 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0516DA760A; Sun, 14 Feb 2016 21:50:56 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5BD99A757A for ; Sun, 14 Feb 2016 21:50:50 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id l_kAHDrg0dGK for ; Sun, 14 Feb 2016 21:50:50 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-pf0-f172.google.com (mail-pf0-f172.google.com [209.85.192.172]) by theia.denx.de (Postfix) with ESMTPS id 82ADAA75D7 for ; Sun, 14 Feb 2016 21:50:43 +0100 (CET) Received: by mail-pf0-f172.google.com with SMTP id e127so75971007pfe.3 for ; Sun, 14 Feb 2016 12:50:43 -0800 (PST) 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:in-reply-to :references; bh=mkgIbeep5JM6KykH2one6LdXvber9E094uqv2cu+Z4A=; b=HyNgEdlN3JQD9H5O5zlBn9ZbLGNyy75m9AyIEe+2kuSrTAo9mG+utOQNk8NPVObpYM 05dPtC6MjGMQscjuwW0qi3xKU0kC61Ll1ok700ya0s4ubU6ebWP7O2Lz+YVmBlwZ+4QU viDLy3wk/8cTZ+1KENbQgZBrxZdpncpKUrWM9/vvQz9+6eyYLRpqYWjMtxE9O3YcLjh3 hlm17yq77IzW+7uPfImJsUjOYVGDuJAH+dTzJsKx7TVtWoR9VIAxanW31XantqtzvcG0 etfZHFqvDqNvFfhkCfVk5OeqjJt5LgxUKeiAAYp3XRsbBitfI53pRmhNjWstsQLhVk1y 5LDw== X-Gm-Message-State: AG10YOTBj8ERlDjveyS8fQ9aG4QlLARRNkBQVwgi+yKvof6Cdgg336XwHtA0bw2u561rYA== X-Received: by 10.98.73.6 with SMTP id w6mr18915035pfa.82.1455483041850; Sun, 14 Feb 2016 12:50:41 -0800 (PST) Received: from localhost.localdomain ([123.236.183.254]) by smtp.gmail.com with ESMTPSA id cq9sm11423890pac.26.2016.02.14.12.50.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 14 Feb 2016 12:50:40 -0800 (PST) From: Jagan Teki To: u-boot@lists.denx.de Date: Mon, 15 Feb 2016 02:18:09 +0530 Message-Id: <1455482955-19053-10-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1455482955-19053-1-git-send-email-jteki@openedev.com> References: <1455482955-19053-1-git-send-email-jteki@openedev.com> Cc: Michal Simek , Siva Durga Prasad Paladugu , Jagan Teki Subject: [U-Boot] [PATCH v6 10/76] mtd: spi-nor: Add spi_flash_probe for mtd-dm-spi-nor X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" While probing spi-nor in SPL spi_flash_probe is needed, so add the flash probe code in spi-nor-probe.c Cc: Simon Glass Cc: Bin Meng Cc: Mugunthan V N Cc: Michal Simek Cc: Siva Durga Prasad Paladugu Signed-off-by: Jagan Teki --- drivers/mtd/spi-nor/spi-nor-probe.c | 15 +++++++++++++++ include/spi_flash.h | 6 ++++++ 2 files changed, 21 insertions(+) diff --git a/drivers/mtd/spi-nor/spi-nor-probe.c b/drivers/mtd/spi-nor/spi-nor-probe.c index c808a7d..9bc61ea 100644 --- a/drivers/mtd/spi-nor/spi-nor-probe.c +++ b/drivers/mtd/spi-nor/spi-nor-probe.c @@ -9,6 +9,21 @@ #include #include +/* + * TODO(sjg@chromium.org): This is an old-style function. We should remove + * it when all SPI flash drivers use dm + */ +spi_flash_t *spi_flash_probe(unsigned int bus, unsigned int cs, + unsigned int max_hz, unsigned int spi_mode) +{ + struct udevice *dev; + + if (spi_flash_probe_bus_cs(bus, cs, max_hz, spi_mode, &dev)) + return NULL; + + return dev_get_uclass_priv(dev); +} + int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, unsigned int max_hz, unsigned int spi_mode, struct udevice **devp) diff --git a/include/spi_flash.h b/include/spi_flash.h index db07b99..45fda7a 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -110,10 +110,16 @@ struct spi_flash { #if defined(CONFIG_MTD_SPI_NOR) && defined(CONFIG_MTD_DM_SPI_NOR) +typedef struct mtd_info spi_flash_t; + int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, unsigned int max_hz, unsigned int spi_mode, struct udevice **devp); +/* Compatibility function - this is the old U-Boot API */ +spi_flash_t *spi_flash_probe(unsigned int bus, unsigned int cs, + unsigned int max_hz, unsigned int spi_mode); + #endif struct dm_spi_flash_ops {