From patchwork Mon Sep 11 09:41:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bin Meng X-Patchwork-Id: 812291 X-Patchwork-Delegate: cyrille.pitchen@atmel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=65.50.211.133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Z/VWuRj4"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Po4AcRN7"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xrNXB2q7gz9s7G for ; Mon, 11 Sep 2017 19:52:58 +1000 (AEST) 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:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=+UdE8Ab4e5yTgIWSQKSNECIX+ngYuBzbL0fptQvoHRQ=; b=Z/VWuRj4P9EgsmQuZA2nIVjdG7 V3UvxsHd1lE+lkeumSP8gHcJzWTyIfAlq9dc1vBgW6yT2D4XqQBJYLf09QMqJTW1Jq6bIilgy9jZ4 UojklI3MrNwFWd+iXuRtNclUL9EZa6N5hqRNJ8U8a0jsAMShQZ6PRMhw07pFcZH34Yh5KtTRg50HS pe7+gQ+fuzdOqK7x/MWHLBzCrS4/qlfyvv2T5yzqjMhNxLBjQj0LUGB8Ugjz2hjwkIqZDwxwdGiXo edji1yeXy0Gqizr7tScEBdVWrROxRdWpJIDhO9jK5Cmv3X3593gpzDivvRdUYFhNZx0Phy30PJhvV 83VUgNpg==; 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 1drLOb-0007p1-NG; Mon, 11 Sep 2017 09:52:49 +0000 Received: from mail-it0-x242.google.com ([2607:f8b0:4001:c0b::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1drLAT-0006Cm-7h for linux-mtd@lists.infradead.org; Mon, 11 Sep 2017 09:38:16 +0000 Received: by mail-it0-x242.google.com with SMTP id o200so3845332itg.1 for ; Mon, 11 Sep 2017 02:37:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=opiqhPRazGUgAdVPbCe+4FTDYAW0jgLqZU0GT2IfPGs=; b=Po4AcRN7sSJna/TpUWa8sXLLWF+rIeAUqGI8CtIfiWei/oHdOWaqiOY3IPIi2GBi+z ia6Cy7jXakxkc8iV4DeHCJuOe4toJ/4H2oHLzVbA/Dt4Nj4V7JZZ6E04eOXC8Dokv8kw ydF7KuF8ut9EJm6c9lvZEvXcYu+/TGxvdtgYSjz0eZSvevPpYP2svfdOVdYpXtq5F7xs kSGSC4gZYt3o3kW8DxgOEhSVLA58P9SzytXm8TFdHBk7yFstfe2TJAL12pRvJsIHqxLG HWE1pYS/UOqP+VKTZcMJufp2bt8C1nTalMr5dNSEKYkrX/rENiO7z+Y5mD5R292hXrKT Y3Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=opiqhPRazGUgAdVPbCe+4FTDYAW0jgLqZU0GT2IfPGs=; b=AYuzAAY/h8z/wL67sEEZhtSQ0OzdF/tYxLM7MK+gKqeR9dEcCLNQ6mpbS0nMmNR6gz lJhzF5FOPJsV7SAKn5MLfnqwDiksRo+SgmdsRVunA4pKNDyo3uxSS3zatFcJ1LdnFN1X TRBSfY4UPlae6zn4FvFG0aXpUS8bcmaw6tR5aMitA1GwcUnbn3rfbqlj19Fu4dNT83oS mFzgM0STsi8tlfTW88FMnymXkQwmuHX9PZE08zgs6/9/p+w1ELhNTIBERrwCgTGa/NVH btrkz2FmDb8wgUmRpLluh5vkNc8Jebp2VpDiDQ5kTv3cMZd41ADfU0DO+MLpJGHYuq72 b2zQ== X-Gm-Message-State: AHPjjUjATbNEvtYNHFuQErKsHGdRR2dCXFGmmbt0dstw347ShIbXgWO8 27KkltPtvHKl5QQ44piD93E= X-Google-Smtp-Source: ADKCNb7kCplWnJ7kQfrVDR3DXPbQJsiU+Vhemq99EILBFrmyjbg+HbADk3/Y51Mpg6XsXSRwainFAQ== X-Received: by 10.36.7.19 with SMTP id f19mr13290637itf.111.1505122676732; Mon, 11 Sep 2017 02:37:56 -0700 (PDT) Received: from ala-d2121-lx1.wrs.com (unknown-156-139.windriver.com. [147.11.156.139]) by smtp.gmail.com with ESMTPSA id s2sm4121069ioa.2.2017.09.11.02.37.54 (version=TLS1_1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Sep 2017 02:37:55 -0700 (PDT) From: Bin Meng To: Mika Westerberg , Cyrille Pitchen , Marek Vasut , Boris Brezillon , Brian Norris , Richard Weinberger , David Woodhouse , linux-mtd , linux-kernel Subject: [PATCH v2 09/10] spi-nor: intel-spi: Rename swseq to swseq_reg in 'struct intel_spi' Date: Mon, 11 Sep 2017 02:41:59 -0700 Message-Id: <1505122921-5534-10-git-send-email-bmeng.cn@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1505122921-5534-1-git-send-email-bmeng.cn@gmail.com> References: <1505122921-5534-1-git-send-email-bmeng.cn@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170911_023813_519309_2F63AB7A X-CRM114-Status: GOOD ( 14.19 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4001:c0b:0:0:0:242 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (bmeng.cn[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Roese MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org The ispi->swseq is used for register access. Let's rename it to swseq_reg to better describe its usage. Signed-off-by: Bin Meng Acked-by: Mika Westerberg --- Changes in v2: None drivers/mtd/spi-nor/intel-spi.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/mtd/spi-nor/intel-spi.c b/drivers/mtd/spi-nor/intel-spi.c index 91ceef7..5e7a389 100644 --- a/drivers/mtd/spi-nor/intel-spi.c +++ b/drivers/mtd/spi-nor/intel-spi.c @@ -126,7 +126,7 @@ * @pr_num: Maximum number of protected range registers * @writeable: Is the chip writeable * @locked: Is SPI setting locked - * @swseq: Use SW sequencer in register reads/writes + * @swseq_reg: Use SW sequencer in register reads/writes * @erase_64k: 64k erase supported * @opcodes: Opcodes which are supported. This are programmed by BIOS * before it locks down the controller. @@ -143,7 +143,7 @@ struct intel_spi { size_t pr_num; bool writeable; bool locked; - bool swseq; + bool swseq_reg; bool erase_64k; u8 opcodes[8]; u8 preopcodes[2]; @@ -224,7 +224,7 @@ static void intel_spi_dump_regs(struct intel_spi *ispi) } dev_dbg(ispi->dev, "Using %cW sequencer for register access\n", - ispi->swseq ? 'S' : 'H'); + ispi->swseq_reg ? 'S' : 'H'); } /* Reads max INTEL_SPI_FIFO_SZ bytes from the device fifo */ @@ -297,7 +297,7 @@ static int intel_spi_init(struct intel_spi *ispi) ispi->pregs = ispi->base + BYT_PR; ispi->nregions = BYT_FREG_NUM; ispi->pr_num = BYT_PR_NUM; - ispi->swseq = true; + ispi->swseq_reg = true; if (writeable) { /* Disable write protection */ @@ -318,7 +318,7 @@ static int intel_spi_init(struct intel_spi *ispi) ispi->pregs = ispi->base + LPT_PR; ispi->nregions = LPT_FREG_NUM; ispi->pr_num = LPT_PR_NUM; - ispi->swseq = true; + ispi->swseq_reg = true; break; case INTEL_SPI_BXT: @@ -343,7 +343,7 @@ static int intel_spi_init(struct intel_spi *ispi) * sequencer. All other operations are supposed to be carried out * using software sequencer. */ - if (ispi->swseq) { + if (ispi->swseq_reg) { /* Disable #SMI generation from SW sequencer */ val = readl(ispi->sregs + SSFSTS_CTL); val &= ~SSFSTS_CTL_FSMIE; @@ -493,7 +493,7 @@ static int intel_spi_read_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) /* Address of the first chip */ writel(0, ispi->base + FADDR); - if (ispi->swseq) + if (ispi->swseq_reg) ret = intel_spi_sw_cycle(ispi, opcode, len, OPTYPE_READ_NO_ADDR); else @@ -529,7 +529,7 @@ static int intel_spi_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len) if (ret) return ret; - if (ispi->swseq) + if (ispi->swseq_reg) return intel_spi_sw_cycle(ispi, opcode, len, OPTYPE_WRITE_NO_ADDR); return intel_spi_hw_cycle(ispi, opcode, len);