From patchwork Wed Aug 16 11:21:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 9903477 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 67F366038C for ; Wed, 16 Aug 2017 11:22:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5993628520 for ; Wed, 16 Aug 2017 11:22:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4E0D6289A7; Wed, 16 Aug 2017 11:22:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C0F922898F for ; Wed, 16 Aug 2017 11:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Date:Message-Id: In-Reply-To:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: References:List-Owner; bh=LOkd5YHRKZi+ONBFNcPgOOG1yVzEYbrik/7HyiJ98Mw=; b=Wxo vBpPpB7lDhkULlM6IdyEqHsIsTKS/2qyw3GYIEZoavp9ndhlfVhHjHUh+5UjcpcV96L6iYcrG4BhY I+EMDPmd9FUEx8xm0fXqBL6ZIUEbri0bo9jwS5Prn08StHqQFTrvMbgM4kgUAQgAicjgxsvXXWkld KiSegAaZM/oVTAoUqUkZvr5ShxzRFOoBVE67t+6fH8JH4y4J5yOnoBM14ANWBlHG4BpHuJAoMJIxQ JsNePRouUrF1bv1sNl7KHZZ8uSpp2yJfabs4BA0p3eyuiJtcNJe++S2+YqwLPplPWTNdznwRA6HNy SnzI0wEhZYY7Nh7kjA22WCIz5sOjufA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dhwP0-0001wv-E5; Wed, 16 Aug 2017 11:22:22 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dhwOx-0001wE-Nb; Wed, 16 Aug 2017 11:22:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Date:Message-Id:In-Reply-To:Subject:Cc: To:From:Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:References:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=5QxCzwffYh9CAndh7sCDROnfxQk0rxVrwp3dSUHf8v0=; b=j+CaxhDs/UfJdn2NXVNayd+Zu2 iljfhmIoIxR9Qs5Hrla2izybREb1MJ2BrivCSYJiaCs54krpJdPTnedpaArAPrmmmv9Hq8pfSmWEV RD1hyOz5VBk4QLwajEGI8dROTmBLcUjFK8Qwy2ldcfbXfumnLPaGxUWO5IHCC341R2R5nKDhTqA5i qUwmHm61bPsfuMeFlo/dn7GgsGfvIjIfrX0FKPNxUMFCdgza+GiS47A8fitQXOqkx/93jcrtP/vL1 ENzAo+PiujAU5z8dj9zKIrwrCGnFnOs1j+AL6jtppPkkmVszo+bApv6EY/sYLgKcGoxyf4iDcmnvP Y4qcvlhQ==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dhwOu-0007eC-Mz; Wed, 16 Aug 2017 11:22:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=5QxCzwffYh9CAndh7sCDROnfxQk0rxVrwp3dSUHf8v0=; b=onFODUDCzzWu 15Z7fQKtTXqnjsBMS9j6yM1VIq4nDwEjrUmGQ2E4d8aQ1Te1ly5ss5ogQKr0RDwI5D+5U4HFa298J dBX7tz485tWgAG9pCIZVJ1DdfCBX2gHd9KJ1gUxGvr6kvxXe/TFwIUOw+h0aH8+wmFdgGmq/p28sP KN5t4=; Received: from [2001:470:1f1d:6b5:7e7a:91ff:fede:4a45] (helo=finisterre) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1dhwNj-0004DK-1C; Wed, 16 Aug 2017 11:21:03 +0000 Received: from broonie by finisterre with local (Exim 4.89) (envelope-from ) id 1dhwNh-0003iD-VL; Wed, 16 Aug 2017 12:21:01 +0100 From: Mark Brown To: Huibin Hong Subject: Applied "spi: rockchip: configure CTRLR1 according to size and data frame" to the spi tree In-Reply-To: <1502849522-10073-1-git-send-email-huibin.hong@rock-chips.com> Message-Id: Date: Wed, 16 Aug 2017 12:21:01 +0100 X-Bad-Reply: In-Reply-To but no 'Re:' in Subject. X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170816_122216_790907_0F9C1605 X-CRM114-Status: GOOD ( 15.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangtao@rock-chips.com, heiko@sntech.de, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org, linux-rockchip@lists.infradead.org, Mark Brown , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: rockchip: configure CTRLR1 according to size and data frame has been applied to the spi tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 04b37d2d02c0a5ae2f4e59326ef6deaff18e0456 Mon Sep 17 00:00:00 2001 From: Huibin Hong Date: Wed, 16 Aug 2017 10:12:02 +0800 Subject: [PATCH] spi: rockchip: configure CTRLR1 according to size and data frame CTRLR1 is number of data frames, when rx only. When data frame is 8 bit, CTRLR1 is len-1. When data frame is 16 bit, CTRLR1 is (len/2)-1. Signed-off-by: Huibin Hong Signed-off-by: Mark Brown --- drivers/spi/spi-rockchip.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 474033e2149e..fdcf3076681b 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -568,7 +568,13 @@ static void rockchip_spi_config(struct rockchip_spi *rs) writel_relaxed(cr0, rs->regs + ROCKCHIP_SPI_CTRLR0); - writel_relaxed(rs->len - 1, rs->regs + ROCKCHIP_SPI_CTRLR1); + if (rs->n_bytes == 1) + writel_relaxed(rs->len - 1, rs->regs + ROCKCHIP_SPI_CTRLR1); + else if (rs->n_bytes == 2) + writel_relaxed((rs->len / 2) - 1, rs->regs + ROCKCHIP_SPI_CTRLR1); + else + writel_relaxed((rs->len * 2) - 1, rs->regs + ROCKCHIP_SPI_CTRLR1); + writel_relaxed(rs->fifo_len / 2 - 1, rs->regs + ROCKCHIP_SPI_TXFTLR); writel_relaxed(rs->fifo_len / 2 - 1, rs->regs + ROCKCHIP_SPI_RXFTLR);