From patchwork Mon Nov 5 12:06:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10668149 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 32E2915A6 for ; Mon, 5 Nov 2018 12:48:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 21038296BE for ; Mon, 5 Nov 2018 12:48:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 14EFF296FA; Mon, 5 Nov 2018 12:48:10 +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=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 AD321296BE for ; Mon, 5 Nov 2018 12:48:09 +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=9Vpv6dfXUgGLQtgfN6bQxhfYnwKxC4fGexcv24S9MJY=; b=OUr 8cKjKY38a+blySMthnaopHoVsaonWh/j+bY7cm4sSllE6BgWPMN+Ky+Yp+K9PLGDzCEQmucOHpd9f grLxhpMMrUoJI46bqJQoy4e4QVJrKMWmXHyXvyC1/An2N9axv/ZY7DT6i/xYUvcvVJ91D5QYfKRJh dRElT/IqzYxScnnR/piI9/AOxjKhNXN0bHd1r5YX6Ne1QaZtitb9m6VGZBPicKzZHDdgLY4RLZv4w NBd8InqbWY6ZuPLah2eRY2+c8w7YHY7osFsY3HYDt1AKBkk8RQOfNNkVitdgyb1UA2qDIZeCFcmpI RIZy/avNLc7NBGgVXcfBiHC4Gi1fdZw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJeIX-0003D8-JB; Mon, 05 Nov 2018 12:48:05 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJeIO-00034E-DX; Mon, 05 Nov 2018 12:47:56 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.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=7ENi49e5M9cIAlcFkxuQ1g5ThAkY+RnGkj47Kqm/Hg4=; b=fdbDS4wylpr7Ihx63X9cod5Kc/ OYqhTZKN66KHV5Zo1HpDfZAMJPTIPbbG0n6DGJGIaRanaeKCDpPhiBXiUDr6RDq8Muspb2Nwfs75D VTyAlPPevGio5XKNgwCeLLG16A88LtVOx2uRuAGgs6IBbanTTtTdN21AvIl9IzuHntlTm17tcIGyr MVFNLC+JoFqyAwpz3b4RopaE7j/NrDxue+nEq4kIVPQRv9iTNwS8PHwCcGRIBKJlPFvBOS8Mmr+3Q ZhSqR+hlT5TYixnJLnn/fuyA17SnO/pyU/udpIOSPoP6i7pXQAQb4CJZkd6AG1r0Kf9dmxUyANn5T YjBf3kGA==; Received: from heliosphere.sirena.org.uk ([2a01:7e01::f03c:91ff:fed4:a3b6]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gJdew-0004hL-Ru; Mon, 05 Nov 2018 12:07:11 +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=7ENi49e5M9cIAlcFkxuQ1g5ThAkY+RnGkj47Kqm/Hg4=; b=m+eBcnwvfIlO sJ/Xr2oHiJOUDH3MO7rePWMcG/HZq5eFO62m3XR+oye3bxdUdJO8VZ2a2bY5eNUD/ODWBEAUNolDu 3h5ljazrkvycj4yCojmFnPdL6OhaIjqyHq0glyqFnZtxLD6WKOhDezcLwaukcZ1dQ4h5wWxJJOYyB Aw8xE=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1gJdel-0008Oi-9B; Mon, 05 Nov 2018 12:06:59 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 0191B1124D98; Mon, 5 Nov 2018 12:06:58 +0000 (GMT) From: Mark Brown To: Emil Renner Berthing Subject: Applied "spi: rockchip: make spi_enable_chip take bool" to the spi tree In-Reply-To: <20181031105711.19575-2-esmil@mailme.dk> Message-Id: <20181105120659.0191B1124D98@debutante.sirena.org.uk> Date: Mon, 5 Nov 2018 12:06:58 +0000 (GMT) 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-20181105_070711_039055_E1DE325E X-CRM114-Status: GOOD ( 14.61 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Addy Ke , Heiko Stuebner , 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-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: rockchip: make spi_enable_chip take bool has been applied to the spi tree at https://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 30688e4e670d21126aa596df4523940e2f8d24de Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing Date: Wed, 31 Oct 2018 11:56:58 +0100 Subject: [PATCH] spi: rockchip: make spi_enable_chip take bool The spi_enable_chip function takes a boolean argument. Change the type to reflect that. Signed-off-by: Emil Renner Berthing Tested-by: Heiko Stuebner Signed-off-by: Mark Brown --- drivers/spi/spi-rockchip.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c index 51ef632bca52..7e54e1a69cc8 100644 --- a/drivers/spi/spi-rockchip.c +++ b/drivers/spi/spi-rockchip.c @@ -208,9 +208,9 @@ struct rockchip_spi { struct rockchip_spi_dma_data dma_tx; }; -static inline void spi_enable_chip(struct rockchip_spi *rs, int enable) +static inline void spi_enable_chip(struct rockchip_spi *rs, bool enable) { - writel_relaxed((enable ? 1 : 0), rs->regs + ROCKCHIP_SPI_SSIENR); + writel_relaxed((enable ? 1U : 0U), rs->regs + ROCKCHIP_SPI_SSIENR); } static inline void spi_set_clk(struct rockchip_spi *rs, u16 div) @@ -339,7 +339,7 @@ static int rockchip_spi_unprepare_message(struct spi_master *master, { struct rockchip_spi *rs = spi_master_get_devdata(master); - spi_enable_chip(rs, 0); + spi_enable_chip(rs, false); return 0; } @@ -379,7 +379,7 @@ static int rockchip_spi_pio_transfer(struct rockchip_spi *rs) { int remain = 0; - spi_enable_chip(rs, 1); + spi_enable_chip(rs, true); do { if (rs->tx) { @@ -399,7 +399,7 @@ static int rockchip_spi_pio_transfer(struct rockchip_spi *rs) if (rs->tx) wait_for_idle(rs); - spi_enable_chip(rs, 0); + spi_enable_chip(rs, false); return 0; } @@ -413,7 +413,7 @@ static void rockchip_spi_dma_rxcb(void *data) rs->state &= ~RXBUSY; if (!(rs->state & TXBUSY)) { - spi_enable_chip(rs, 0); + spi_enable_chip(rs, false); spi_finalize_current_transfer(rs->master); } @@ -432,7 +432,7 @@ static void rockchip_spi_dma_txcb(void *data) rs->state &= ~TXBUSY; if (!(rs->state & RXBUSY)) { - spi_enable_chip(rs, 0); + spi_enable_chip(rs, false); spi_finalize_current_transfer(rs->master); } @@ -503,7 +503,7 @@ static int rockchip_spi_prepare_dma(struct rockchip_spi *rs) dma_async_issue_pending(rs->dma_rx.ch); } - spi_enable_chip(rs, 1); + spi_enable_chip(rs, true); if (txdesc) { spin_lock_irqsave(&rs->lock, flags); @@ -705,7 +705,7 @@ static int rockchip_spi_probe(struct platform_device *pdev) goto err_disable_apbclk; } - spi_enable_chip(rs, 0); + spi_enable_chip(rs, false); rs->type = SSI_MOTO_SPI; rs->master = master;