From patchwork Mon Aug 26 05:48:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?546L5a6H6Iiq?= X-Patchwork-Id: 269818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from casper.infradead.org (unknown [IPv6:2001:770:15f::2]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ED7112C0040 for ; Mon, 26 Aug 2013 15:49:52 +1000 (EST) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VDpgO-0005l6-I9; Mon, 26 Aug 2013 05:49:44 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VDpgM-0005Yd-RA; Mon, 26 Aug 2013 05:49:42 +0000 Received: from mail-pd0-x236.google.com ([2607:f8b0:400e:c02::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VDpgJ-0005XK-JB for linux-mtd@lists.infradead.org; Mon, 26 Aug 2013 05:49:40 +0000 Received: by mail-pd0-f182.google.com with SMTP id r10so3038386pdi.13 for ; Sun, 25 Aug 2013 22:49:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=VpOaJRaktKyd9AnyefckK/ZGYJZXB3Fc6td2vmeFNK8=; b=hnO2B98RQxvJQ4dfj0EnzMorfibYgkYkH566mxSrIeCKqWqGlTWdymLFbkX1fQZgq1 FrOpUJGl5K20n7ArW87mrQXRGH+v0olfjjjSLvGLVjfUlM8NlE4L4pvy+1d/BlXzxnrY OGg7rl0IuUPDYu++jvArrsacQ/1VnHRHoFJUU1JFiiW60QSiauWmuZzqJTGjJNZSrx9Y K7nwpTwokoYhVpURPW2XBXDFLikhyvyKh9/MnjmY0cC0RgE4QFScqqRlpfiwYvepw88T sRLKS18POG/9gCwPXCpXWjMVpYBbS+wjQd0OBQ7jmuGn21J2i5Xg4VD0JFpNnYHgwWAz fMKQ== X-Received: by 10.67.4.197 with SMTP id cg5mr12692142pad.10.1377496157881; Sun, 25 Aug 2013 22:49:17 -0700 (PDT) Received: from localhost.localdomain ([218.24.172.134]) by mx.google.com with ESMTPSA id jf4sm15702972pbb.19.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 25 Aug 2013 22:49:17 -0700 (PDT) From: wangyuhang To: broonie@kernel.org, linux-spi@vger.kernel.org, devicetree@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH 2/2] spi: dual and quad support(device tree) Date: Mon, 26 Aug 2013 13:48:00 +0800 Message-Id: <1377496080-14356-2-git-send-email-wangyuhang2014@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1377496080-14356-1-git-send-email-wangyuhang2014@gmail.com> References: <1377496080-14356-1-git-send-email-wangyuhang2014@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130826_014939_760568_50B48DDF X-CRM114-Status: GOOD ( 10.84 ) X-Spam-Score: -1.8 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.8 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (wangyuhang2014[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (wangyuhang2014[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: sourav.poddar@ti.com, pekon@ti.com, wangyuhang X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org fix one thing in patch: commit id:f477b7fb13df2b843997559ff34e87d054ba6538 change property spi-tx-nbits and spi-rx-nbits to optional. If User don't set spi-tx-nbits or spi-rx-nbits, spi device mode should be regarded as SINGLE, not return an error. Signed-off-by: wangyuhang --- drivers/spi/spi.c | 68 +++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 50f7fc3..46a55f0 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -872,46 +872,42 @@ static void of_register_spi_devices(struct spi_master *master) /* Device DUAL/QUAD mode */ prop = of_get_property(nc, "spi-tx-nbits", &len); if (!prop || len < sizeof(*prop)) { - dev_err(&master->dev, "%s has no 'spi-tx-nbits' property\n", - nc->full_name); - spi_dev_put(spi); - continue; - } - switch (be32_to_cpup(prop)) { - case SPI_NBITS_SINGLE: - break; - case SPI_NBITS_DUAL: - spi->mode |= SPI_TX_DUAL; - break; - case SPI_NBITS_QUAD: - spi->mode |= SPI_TX_QUAD; - break; - default: - dev_err(&master->dev, "spi-tx-nbits value is not supported\n"); - spi_dev_put(spi); - continue; + /* set tx mode in SINGLE as default */ + } else { + switch (be32_to_cpup(prop)) { + case SPI_NBITS_SINGLE: + break; + case SPI_NBITS_DUAL: + spi->mode |= SPI_TX_DUAL; + break; + case SPI_NBITS_QUAD: + spi->mode |= SPI_TX_QUAD; + break; + default: + dev_err(&master->dev, + "spi-tx-nbits value is not supported\n"); + spi_dev_put(spi); + continue; } prop = of_get_property(nc, "spi-rx-nbits", &len); if (!prop || len < sizeof(*prop)) { - dev_err(&master->dev, "%s has no 'spi-rx-nbits' property\n", - nc->full_name); - spi_dev_put(spi); - continue; - } - switch (be32_to_cpup(prop)) { - case SPI_NBITS_SINGLE: - break; - case SPI_NBITS_DUAL: - spi->mode |= SPI_RX_DUAL; - break; - case SPI_NBITS_QUAD: - spi->mode |= SPI_RX_QUAD; - break; - default: - dev_err(&master->dev, "spi-rx-nbits value is not supported\n"); - spi_dev_put(spi); - continue; + /* set rx mode in SINGLE as default */ + } else { + switch (be32_to_cpup(prop)) { + case SPI_NBITS_SINGLE: + break; + case SPI_NBITS_DUAL: + spi->mode |= SPI_RX_DUAL; + break; + case SPI_NBITS_QUAD: + spi->mode |= SPI_RX_QUAD; + break; + default: + dev_err(&master->dev, + "spi-rx-nbits value is not supported\n"); + spi_dev_put(spi); + continue; } /* Device speed */