From patchwork Wed Nov 7 15:08:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 10672531 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 757B517D4 for ; Wed, 7 Nov 2018 15:08:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 663AD2C4AD for ; Wed, 7 Nov 2018 15:08:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59FB42C4DE; Wed, 7 Nov 2018 15:08:11 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D22782C4AD for ; Wed, 7 Nov 2018 15:08:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727709AbeKHAiz (ORCPT ); Wed, 7 Nov 2018 19:38:55 -0500 Received: from heliosphere.sirena.org.uk ([172.104.155.198]:51960 "EHLO heliosphere.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727417AbeKHAiz (ORCPT ); Wed, 7 Nov 2018 19:38:55 -0500 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=8p5/FJnqX0Ni88q9l1o6qrIrsFoPYji0wUMLw851/XE=; b=f9YuZHioHp/w etUf6WVV00BrfUzgsOPySCY4FwOx99sl9opycqm1OIeGyFXDKgjWdrrR0sma1UTs0BWChf5mZyc8k 0RfeJBoIFe7+mGUYwMZK1uOvkGR9Fc0wVn/TCSLrjy2do29XlrMsT9MuH6MSKrX7AaTlSSwZxvWGY MKZVA=; 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 1gKPR9-0006cQ-No; Wed, 07 Nov 2018 15:08:07 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 646281124E14; Wed, 7 Nov 2018 15:08:07 +0000 (GMT) From: Mark Brown To: Piotr Bugalski Cc: Mark Brown , linux-spi@vger.kernel.org Subject: Applied "mtd: spi-nor: atmel-quaspi: Typo fix" to the spi tree In-Reply-To: Message-Id: <20181107150807.646281124E14@debutante.sirena.org.uk> Date: Wed, 7 Nov 2018 15:08:07 +0000 (GMT) Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch mtd: spi-nor: atmel-quaspi: Typo fix 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 b82ab1c26962a952755d9b9c1d083436d88281a7 Mon Sep 17 00:00:00 2001 From: Piotr Bugalski Date: Mon, 5 Nov 2018 11:36:20 +0100 Subject: [PATCH] mtd: spi-nor: atmel-quaspi: Typo fix Just minor typo fix. Fixed in preparation of new driver. Signed-off: Piotr Bugalski Signed-off-by: Mark Brown --- drivers/mtd/spi-nor/atmel-quadspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/spi-nor/atmel-quadspi.c b/drivers/mtd/spi-nor/atmel-quadspi.c index 820048726b4f..1c5ba8feaa5e 100644 --- a/drivers/mtd/spi-nor/atmel-quadspi.c +++ b/drivers/mtd/spi-nor/atmel-quadspi.c @@ -67,7 +67,7 @@ #define QSPI_CR_LASTXFER BIT(24) /* Bitfields in QSPI_MR (Mode Register) */ -#define QSPI_MR_SSM BIT(0) +#define QSPI_MR_SMM BIT(0) #define QSPI_MR_LLB BIT(1) #define QSPI_MR_WDRBT BIT(2) #define QSPI_MR_SMRM BIT(3) @@ -563,7 +563,7 @@ static int atmel_qspi_init(struct atmel_qspi *aq) qspi_writel(aq, QSPI_CR, QSPI_CR_SWRST); /* Set the QSPI controller in Serial Memory Mode */ - mr = QSPI_MR_NBBITS(8) | QSPI_MR_SSM; + mr = QSPI_MR_NBBITS(8) | QSPI_MR_SMM; qspi_writel(aq, QSPI_MR, mr); src_rate = clk_get_rate(aq->clk);