From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BB20F2E3385 for ; Thu, 3 Apr 2025 09:51:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743673872; cv=none; b=p883tA+ptWi2MxGUkWqtJhr3LQoWprySZ+6bek1cMWxk+6hLK/FK0laXCloG42VyVPfjAz057gxDKfz9vw7ZU3zSBt9bXuJaSYOdUFDheaCQ3auOS9LSnzJyHzH44QzxrjamWeeSXb40YW7szXTF4I3Z8PdVVLUMyNlYh0BP6Zs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743673872; c=relaxed/simple; bh=9PfqJfYENqfYnykzR4Vw/SrFtP+55BdHCpqVJs8rcCU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=rL0cFzMr6zVNfU2bd6R49lshee5Hr+NCq8XwImLXHYXmTYrh3Bq3uWOqG9LXFxRmnIDbKl2OFX9wUJGH89duzrr0Pwm+qndEJwddTNzKisZnNIZ8MDo/xJP8eWmAATC6U7lXH4Qf2jmgPt6XlXDnba24eKiomse+t96rgJHf6w0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=b6fI9xPN; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="b6fI9xPN" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43d0c18e84eso2970725e9.3 for ; Thu, 03 Apr 2025 02:51:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743673868; x=1744278668; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=qz+wTex84HxR9hjDkpBqo0t+c4uTz2yvssMo9Eniq78=; b=b6fI9xPNNq9dTIVzCKy7ZfO+O8O9r3f35exf7DycLOLveQXqXdv52MLYT1BEnFaVXJ DMHgc1wBPS2nUWGwkQoPzYVrgX7rSR8YGsOAH+ph2olcukSXlchEnCQQaXEzh7s+zfcy qwOsa+LiPoZpLBHTDjkideTfU4//CJdRaNAbYpVIwGFvXU6teE/iXYp3WM06ZtBEANVu lxQFyI7QfpeKBo+dKacE4q5nD00Hdp9UsCPEgEnnKkEFvjc/IXsXY0TN8/3mhEBga1bz 5cGht/3hpNva9yCrXFa96E/NXQUfCiwV1ndKIKW9HsrzKZDADx53Z53sxz5GBVQ/1yB9 gRuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743673868; x=1744278668; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qz+wTex84HxR9hjDkpBqo0t+c4uTz2yvssMo9Eniq78=; b=ejE51pDqjRIovJZ+qT40YfzDrwVjjhMJ3vK+0Gbi7XuBHUrGqIIyEzNBVTkoDHP4Ry kDqDr/n12VUMS79YHBho/X+pznAU6ZVr1uPms/d4/VXtGNGkRSJTvx338Sn/i/rKzboc nzoOwkaM1ksUjtI5NdjOflRb9hjC1qinTyNzhp8/Zn7gy9LLpWmraEQcJ6/EjMvJlzFW ayg8FMdE6SI3SarmbInfsf6CqI3y37JaGnabOGA8zW8G5P2qbyByvz7jcgZN+veEnsOw gJueMtFGLuqBAxPr3bivGYn9mt0YES5RFJMcbJ4qAoyOxyDLut8/aQSUTJ2lvf1zz/MQ YXgQ== X-Forwarded-Encrypted: i=1; AJvYcCUVMa78gCG20E5ORvYpm4BRX0lu62I9b+o0xY4EC2Yhfh7nBG6V0vpmnmTXjKWMauNT8ryUWudPoXn7myk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw4YKQN2Ez6Sl03eiArnViMsvB8srISdxP0HEPn/o74brv/yM5T 349JaYOTkGhdLM8MEWEwbR62HoogydDW/7SL1VhEKnbgotyRFTs9WtzQnNGH4h9+8QAsGK9xNjR y X-Gm-Gg: ASbGncs5JjkUE5HvgDDtICgf6Jr1t97b7QtvZMFVN8vPNwEOI5GPL3PAzpkIedBs473 KqSXiq/N/Bxb+XBTJS9p7OhdBRIzbk3UaPA3C5+ngUtx5VkPoJ3DvsP7HPGAxa1jEylslYXYNtu R7Rw8WSgkZVHL506E0qqFTMJC2hDjIcndsQehgxMmPNEVduq827DjLXfmqyXrK5mBn1HOjePpNX fE2WVaZyB1a6HH8XBnyCEzY+z6SuOEsLXlNNiYkQqT8BeloJPTLmaJPh9AwaYepJRt4xFA7eQ3E QaDQObNAn79p0ugFSRqozdmTAqHR5FDBc4i+P9M5SbkWsYHU6pgeQg== X-Google-Smtp-Source: AGHT+IEIXqJmQGNM4WrsnpKhF9Sm8XZJvJ7OgSqwDtk2VARx0U0o19gRdCAZ+vFE3HaVEb0xqdwcAw== X-Received: by 2002:a05:600c:468c:b0:43c:fa3f:8e5d with SMTP id 5b1f17b1804b1-43db61b52e5mr213840145e9.2.1743673867963; Thu, 03 Apr 2025 02:51:07 -0700 (PDT) Received: from [192.168.0.14] ([79.115.63.146]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ec366b571sm13288845e9.40.2025.04.03.02.51.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 03 Apr 2025 02:51:07 -0700 (PDT) Message-ID: <4df5c39b-5692-4d71-b381-aa8df1ce1fd7@linaro.org> Date: Thu, 3 Apr 2025 10:51:03 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 07/19] mtd: spinand: Use more specific naming for the (single) read from cache ops To: Miquel Raynal , Richard Weinberger , Vignesh Raghavendra , Santhosh Kumar K Cc: Pratyush Yadav , Michael Walle , Thomas Petazzoni , Steam Lin , linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org References: <20250403-winbond-6-14-rc1-octal-v2-0-7846bd88fe83@bootlin.com> <20250403-winbond-6-14-rc1-octal-v2-7-7846bd88fe83@bootlin.com> Content-Language: en-US From: Tudor Ambarus In-Reply-To: <20250403-winbond-6-14-rc1-octal-v2-7-7846bd88fe83@bootlin.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 4/3/25 10:19 AM, Miquel Raynal wrote: > SPI operations have been initially described through macros implicitly > implying the use of a single SPI SDR bus. Macros for supporting dual and > quad I/O transfers have been added on top, generally inspired by vendor > naming, followed by DTR operations. Soon we might see octal > and even octal DTR operations as well (including the opcode byte). > > Let's clarify what the macro really mean by describing the expected bus > topology in the (single) read from cache macro names. > > Signed-off-by: Miquel Raynal Acked-by: Tudor Ambarus > --- > drivers/mtd/nand/spi/alliancememory.c | 4 ++-- > drivers/mtd/nand/spi/ato.c | 4 ++-- > drivers/mtd/nand/spi/esmt.c | 4 ++-- > drivers/mtd/nand/spi/foresee.c | 4 ++-- > drivers/mtd/nand/spi/gigadevice.c | 16 ++++++++-------- > drivers/mtd/nand/spi/macronix.c | 4 ++-- > drivers/mtd/nand/spi/micron.c | 8 ++++---- > drivers/mtd/nand/spi/paragon.c | 4 ++-- > drivers/mtd/nand/spi/skyhigh.c | 4 ++-- > drivers/mtd/nand/spi/toshiba.c | 4 ++-- > drivers/mtd/nand/spi/winbond.c | 10 +++++----- > drivers/mtd/nand/spi/xtx.c | 4 ++-- > include/linux/mtd/spinand.h | 12 ++++++------ > 13 files changed, 41 insertions(+), 41 deletions(-) > > diff --git a/drivers/mtd/nand/spi/alliancememory.c b/drivers/mtd/nand/spi/alliancememory.c > index 6046c73f8424e9fb338ec3a1d35dc6fe30a2e1bc..723c740308d26e901fd3d9a402ddd48e8e69060f 100644 > --- a/drivers/mtd/nand/spi/alliancememory.c > +++ b/drivers/mtd/nand/spi/alliancememory.c > @@ -21,8 +21,8 @@ static SPINAND_OP_VARIANTS(read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(write_cache_variants, > SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), > diff --git a/drivers/mtd/nand/spi/ato.c b/drivers/mtd/nand/spi/ato.c > index bb5298911137f08c1793d244b33dddf1971e2fed..9026a14aca07ce011af151eb6dfe56797e0e70c0 100644 > --- a/drivers/mtd/nand/spi/ato.c > +++ b/drivers/mtd/nand/spi/ato.c > @@ -15,8 +15,8 @@ > > static SPINAND_OP_VARIANTS(read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(write_cache_variants, > SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), > diff --git a/drivers/mtd/nand/spi/esmt.c b/drivers/mtd/nand/spi/esmt.c > index 323a20901fc9fcc252b8317d9434aabf5e30a495..aad751f95269b3f501aff01753c4bf0ff9484fbe 100644 > --- a/drivers/mtd/nand/spi/esmt.c > +++ b/drivers/mtd/nand/spi/esmt.c > @@ -15,8 +15,8 @@ > static SPINAND_OP_VARIANTS(read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(write_cache_variants, > SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), > diff --git a/drivers/mtd/nand/spi/foresee.c b/drivers/mtd/nand/spi/foresee.c > index ecd5f6bffa33423abddf750b34b823a640fa2c23..8a9725ea29bac5901d67304db95ed5573bd7fa40 100644 > --- a/drivers/mtd/nand/spi/foresee.c > +++ b/drivers/mtd/nand/spi/foresee.c > @@ -14,8 +14,8 @@ > static SPINAND_OP_VARIANTS(read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(write_cache_variants, > SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), > diff --git a/drivers/mtd/nand/spi/gigadevice.c b/drivers/mtd/nand/spi/gigadevice.c > index 73a483227831518a480dc34de17efdaa398b5627..76856f1de8fefc6404345e363b2c873cc3c02e52 100644 > --- a/drivers/mtd/nand/spi/gigadevice.c > +++ b/drivers/mtd/nand/spi/gigadevice.c > @@ -28,32 +28,32 @@ static SPINAND_OP_VARIANTS(read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(read_cache_variants_f, > SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X4_OP_3A(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP_3A(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP_3A(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP_3A(0, 0, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_3A_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_1S_OP(0, 0, NULL, 0)); > > static SPINAND_OP_VARIANTS(read_cache_variants_1gq5, > SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(read_cache_variants_2gq5, > SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 4, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(write_cache_variants, > SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), > diff --git a/drivers/mtd/nand/spi/macronix.c b/drivers/mtd/nand/spi/macronix.c > index 3dc4d63d6832d0213387f335fd233f1c4306bfff..59bd476a29f03967a3f5a814872f9a6039b0a585 100644 > --- a/drivers/mtd/nand/spi/macronix.c > +++ b/drivers/mtd/nand/spi/macronix.c > @@ -28,8 +28,8 @@ struct macronix_priv { > static SPINAND_OP_VARIANTS(read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(write_cache_variants, > SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), > diff --git a/drivers/mtd/nand/spi/micron.c b/drivers/mtd/nand/spi/micron.c > index 6ec20fad837bc534cfa0bc7cc629622a7dfab5da..d7dbd22db1a3f8457c8947f4044dd8442dc475cb 100644 > --- a/drivers/mtd/nand/spi/micron.c > +++ b/drivers/mtd/nand/spi/micron.c > @@ -33,8 +33,8 @@ static SPINAND_OP_VARIANTS(quadio_read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(x4_write_cache_variants, > SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), > @@ -48,8 +48,8 @@ static SPINAND_OP_VARIANTS(x4_update_cache_variants, > static SPINAND_OP_VARIANTS(x4_read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(x1_write_cache_variants, > SPINAND_PROG_LOAD(true, 0, NULL, 0)); > diff --git a/drivers/mtd/nand/spi/paragon.c b/drivers/mtd/nand/spi/paragon.c > index 6e7cc6995380c00ae40fe362f711a490ff463130..ae3527d6d5fa358be482eb8cf0ba4e1e2304e441 100644 > --- a/drivers/mtd/nand/spi/paragon.c > +++ b/drivers/mtd/nand/spi/paragon.c > @@ -26,8 +26,8 @@ static SPINAND_OP_VARIANTS(read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(write_cache_variants, > SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), > diff --git a/drivers/mtd/nand/spi/skyhigh.c b/drivers/mtd/nand/spi/skyhigh.c > index 961df0d74984a8dc8484ac5d7323d172012058e5..ffbedb8d92f659967f6aa0c80d5b0aa7d088929c 100644 > --- a/drivers/mtd/nand/spi/skyhigh.c > +++ b/drivers/mtd/nand/spi/skyhigh.c > @@ -21,8 +21,8 @@ static SPINAND_OP_VARIANTS(read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 2, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(write_cache_variants, > SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), > diff --git a/drivers/mtd/nand/spi/toshiba.c b/drivers/mtd/nand/spi/toshiba.c > index a600aa771519fa04a1caafb8c8e636eab10359c4..bc5adadf6084f48ff482d6846be1c6d2e9157e85 100644 > --- a/drivers/mtd/nand/spi/toshiba.c > +++ b/drivers/mtd/nand/spi/toshiba.c > @@ -17,8 +17,8 @@ > static SPINAND_OP_VARIANTS(read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(write_cache_x4_variants, > SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), > diff --git a/drivers/mtd/nand/spi/winbond.c b/drivers/mtd/nand/spi/winbond.c > index 5816b489b57b0070ddeda745cf17c04efc5080cd..8379a1d12dd563e573c6d37cf099759088176da4 100644 > --- a/drivers/mtd/nand/spi/winbond.c > +++ b/drivers/mtd/nand/spi/winbond.c > @@ -32,17 +32,17 @@ static SPINAND_OP_VARIANTS(read_cache_dtr_variants, > SPINAND_PAGE_READ_FROM_CACHE_X2_DTR_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ), > SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_DTR_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0, 54 * HZ_PER_MHZ)); > + SPINAND_PAGE_READ_FROM_CACHE_1S_1D_1D_OP(0, 2, NULL, 0, 80 * HZ_PER_MHZ), > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0, 54 * HZ_PER_MHZ)); > > static SPINAND_OP_VARIANTS(read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_QUADIO_OP(0, 2, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(write_cache_variants, > SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), > diff --git a/drivers/mtd/nand/spi/xtx.c b/drivers/mtd/nand/spi/xtx.c > index 3f539ca0de861c082217701607f96c2a6b7c5378..a0003f52ae8f52ab00374fedc457476136a78568 100644 > --- a/drivers/mtd/nand/spi/xtx.c > +++ b/drivers/mtd/nand/spi/xtx.c > @@ -27,8 +27,8 @@ static SPINAND_OP_VARIANTS(read_cache_variants, > SPINAND_PAGE_READ_FROM_CACHE_X4_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_DUALIO_OP(0, 1, NULL, 0), > SPINAND_PAGE_READ_FROM_CACHE_X2_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(0, 1, NULL, 0), > - SPINAND_PAGE_READ_FROM_CACHE_OP(0, 1, NULL, 0)); > + SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(0, 1, NULL, 0), > + SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(0, 1, NULL, 0)); > > static SPINAND_OP_VARIANTS(write_cache_variants, > SPINAND_PROG_LOAD_X4(true, 0, NULL, 0), > diff --git a/include/linux/mtd/spinand.h b/include/linux/mtd/spinand.h > index 10b2c1279c0e2e0e3ddec3b4ce93e7fe25402c9f..868d983b4544d88965f9bd52830e39e8c8c34346 100644 > --- a/include/linux/mtd/spinand.h > +++ b/include/linux/mtd/spinand.h > @@ -62,32 +62,32 @@ > SPI_MEM_OP_NO_DUMMY, \ > SPI_MEM_OP_NO_DATA) > > -#define SPINAND_PAGE_READ_FROM_CACHE_OP(addr, ndummy, buf, len, ...) \ > +#define SPINAND_PAGE_READ_FROM_CACHE_1S_1S_1S_OP(addr, ndummy, buf, len, ...) \ > SPI_MEM_OP(SPI_MEM_OP_CMD(0x03, 1), \ > SPI_MEM_OP_ADDR(2, addr, 1), \ > SPI_MEM_OP_DUMMY(ndummy, 1), \ > SPI_MEM_OP_DATA_IN(len, buf, 1), \ > SPI_MEM_OP_MAX_FREQ(__VA_ARGS__ + 0)) > > -#define SPINAND_PAGE_READ_FROM_CACHE_FAST_OP(addr, ndummy, buf, len) \ > - SPI_MEM_OP(SPI_MEM_OP_CMD(0x0b, 1), \ > +#define SPINAND_PAGE_READ_FROM_CACHE_FAST_1S_1S_1S_OP(addr, ndummy, buf, len) \ > + SPI_MEM_OP(SPI_MEM_OP_CMD(0x0b, 1), \ > SPI_MEM_OP_ADDR(2, addr, 1), \ > SPI_MEM_OP_DUMMY(ndummy, 1), \ > SPI_MEM_OP_DATA_IN(len, buf, 1)) > > -#define SPINAND_PAGE_READ_FROM_CACHE_OP_3A(addr, ndummy, buf, len) \ > +#define SPINAND_PAGE_READ_FROM_CACHE_3A_1S_1S_1S_OP(addr, ndummy, buf, len) \ > SPI_MEM_OP(SPI_MEM_OP_CMD(0x03, 1), \ > SPI_MEM_OP_ADDR(3, addr, 1), \ > SPI_MEM_OP_DUMMY(ndummy, 1), \ > SPI_MEM_OP_DATA_IN(len, buf, 1)) > > -#define SPINAND_PAGE_READ_FROM_CACHE_FAST_OP_3A(addr, ndummy, buf, len) \ > +#define SPINAND_PAGE_READ_FROM_CACHE_FAST_3A_1S_1S_1S_OP(addr, ndummy, buf, len) \ > SPI_MEM_OP(SPI_MEM_OP_CMD(0x0b, 1), \ > SPI_MEM_OP_ADDR(3, addr, 1), \ > SPI_MEM_OP_DUMMY(ndummy, 1), \ > SPI_MEM_OP_DATA_IN(len, buf, 1)) > > -#define SPINAND_PAGE_READ_FROM_CACHE_DTR_OP(addr, ndummy, buf, len, freq) \ > +#define SPINAND_PAGE_READ_FROM_CACHE_1S_1D_1D_OP(addr, ndummy, buf, len, freq) \ > SPI_MEM_OP(SPI_MEM_OP_CMD(0x0d, 1), \ > SPI_MEM_DTR_OP_ADDR(2, addr, 1), \ > SPI_MEM_DTR_OP_DUMMY(ndummy, 1), \ >