From: Miquel Raynal <miquel.raynal@bootlin.com> To: Mark Brown <broonie@kernel.org>, <linux-spi@vger.kernel.org>, Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, Tudor Ambarus <Tudor.Ambarus@microchip.com>, Pratyush Yadav <p.yadav@ti.com>, Michael Walle <michael@walle.cc>, <linux-mtd@lists.infradead.org>, Rob Herring <robh+dt@kernel.org>, <devicetree@vger.kernel.org> Cc: Julien Su <juliensu@mxic.com.tw>, Jaime Liao <jaimeliao@mxic.com.tw>, Thomas Petazzoni <thomas.petazzoni@bootlin.com>, Miquel Raynal <miquel.raynal@bootlin.com> Subject: [PATCH v6 25/28] spi: mxic: Create a helper to configure the controller before an operation Date: Thu, 16 Dec 2021 12:16:51 +0100 [thread overview] Message-ID: <20211216111654.238086-26-miquel.raynal@bootlin.com> (raw) In-Reply-To: <20211216111654.238086-1-miquel.raynal@bootlin.com> Create the mxic_spi_set_hc_cfg() helper to configure the HC_CFG register. This helper will soon be used by the dirmap implementation and having this code factorized out earlier will clarify this addition. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi-mxic.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/drivers/spi/spi-mxic.c b/drivers/spi/spi-mxic.c index 3d6561a3ff8b..950319dc54dc 100644 --- a/drivers/spi/spi-mxic.c +++ b/drivers/spi/spi-mxic.c @@ -280,6 +280,22 @@ static void mxic_spi_hw_init(struct mxic_spi *mxic) mxic->regs + HC_CFG); } +static u32 mxic_spi_prep_hc_cfg(struct spi_device *spi, u32 flags) +{ + int nio = 1; + + if (spi->mode & (SPI_TX_OCTAL | SPI_RX_OCTAL)) + nio = 8; + else if (spi->mode & (SPI_TX_QUAD | SPI_RX_QUAD)) + nio = 4; + else if (spi->mode & (SPI_TX_DUAL | SPI_RX_DUAL)) + nio = 2; + + return flags | HC_CFG_NIO(nio) | + HC_CFG_TYPE(spi->chip_select, HC_CFG_TYPE_SPI_NOR) | + HC_CFG_SLV_ACT(spi->chip_select) | HC_CFG_IDLE_SIO_LVL(1); +} + static int mxic_spi_data_xfer(struct mxic_spi *mxic, const void *txbuf, void *rxbuf, unsigned int len) { @@ -349,7 +365,7 @@ static int mxic_spi_mem_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) { struct mxic_spi *mxic = spi_master_get_devdata(mem->spi->master); - int nio = 1, i, ret; + int i, ret; u32 ss_ctrl; u8 addr[8], cmd[2]; @@ -357,18 +373,9 @@ static int mxic_spi_mem_exec_op(struct spi_mem *mem, if (ret) return ret; - if (mem->spi->mode & (SPI_TX_OCTAL | SPI_RX_OCTAL)) - nio = 8; - else if (mem->spi->mode & (SPI_TX_QUAD | SPI_RX_QUAD)) - nio = 4; - else if (mem->spi->mode & (SPI_TX_DUAL | SPI_RX_DUAL)) - nio = 2; - - writel(HC_CFG_NIO(nio) | - HC_CFG_TYPE(mem->spi->chip_select, HC_CFG_TYPE_SPI_NOR) | - HC_CFG_SLV_ACT(mem->spi->chip_select) | HC_CFG_IDLE_SIO_LVL(1) | - HC_CFG_MAN_CS_EN, + writel(mxic_spi_prep_hc_cfg(mem->spi, HC_CFG_MAN_CS_EN), mxic->regs + HC_CFG); + writel(HC_EN_BIT, mxic->regs + HC_EN); ss_ctrl = OP_CMD_BYTES(op->cmd.nbytes) | -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Miquel Raynal <miquel.raynal@bootlin.com> To: Mark Brown <broonie@kernel.org>, <linux-spi@vger.kernel.org>, Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, Tudor Ambarus <Tudor.Ambarus@microchip.com>, Pratyush Yadav <p.yadav@ti.com>, Michael Walle <michael@walle.cc>, <linux-mtd@lists.infradead.org>, Rob Herring <robh+dt@kernel.org>, <devicetree@vger.kernel.org> Cc: Julien Su <juliensu@mxic.com.tw>, Jaime Liao <jaimeliao@mxic.com.tw>, Thomas Petazzoni <thomas.petazzoni@bootlin.com>, Miquel Raynal <miquel.raynal@bootlin.com> Subject: [PATCH v6 25/28] spi: mxic: Create a helper to configure the controller before an operation Date: Thu, 16 Dec 2021 12:16:51 +0100 [thread overview] Message-ID: <20211216111654.238086-26-miquel.raynal@bootlin.com> (raw) In-Reply-To: <20211216111654.238086-1-miquel.raynal@bootlin.com> Create the mxic_spi_set_hc_cfg() helper to configure the HC_CFG register. This helper will soon be used by the dirmap implementation and having this code factorized out earlier will clarify this addition. Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> Reviewed-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi-mxic.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/drivers/spi/spi-mxic.c b/drivers/spi/spi-mxic.c index 3d6561a3ff8b..950319dc54dc 100644 --- a/drivers/spi/spi-mxic.c +++ b/drivers/spi/spi-mxic.c @@ -280,6 +280,22 @@ static void mxic_spi_hw_init(struct mxic_spi *mxic) mxic->regs + HC_CFG); } +static u32 mxic_spi_prep_hc_cfg(struct spi_device *spi, u32 flags) +{ + int nio = 1; + + if (spi->mode & (SPI_TX_OCTAL | SPI_RX_OCTAL)) + nio = 8; + else if (spi->mode & (SPI_TX_QUAD | SPI_RX_QUAD)) + nio = 4; + else if (spi->mode & (SPI_TX_DUAL | SPI_RX_DUAL)) + nio = 2; + + return flags | HC_CFG_NIO(nio) | + HC_CFG_TYPE(spi->chip_select, HC_CFG_TYPE_SPI_NOR) | + HC_CFG_SLV_ACT(spi->chip_select) | HC_CFG_IDLE_SIO_LVL(1); +} + static int mxic_spi_data_xfer(struct mxic_spi *mxic, const void *txbuf, void *rxbuf, unsigned int len) { @@ -349,7 +365,7 @@ static int mxic_spi_mem_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) { struct mxic_spi *mxic = spi_master_get_devdata(mem->spi->master); - int nio = 1, i, ret; + int i, ret; u32 ss_ctrl; u8 addr[8], cmd[2]; @@ -357,18 +373,9 @@ static int mxic_spi_mem_exec_op(struct spi_mem *mem, if (ret) return ret; - if (mem->spi->mode & (SPI_TX_OCTAL | SPI_RX_OCTAL)) - nio = 8; - else if (mem->spi->mode & (SPI_TX_QUAD | SPI_RX_QUAD)) - nio = 4; - else if (mem->spi->mode & (SPI_TX_DUAL | SPI_RX_DUAL)) - nio = 2; - - writel(HC_CFG_NIO(nio) | - HC_CFG_TYPE(mem->spi->chip_select, HC_CFG_TYPE_SPI_NOR) | - HC_CFG_SLV_ACT(mem->spi->chip_select) | HC_CFG_IDLE_SIO_LVL(1) | - HC_CFG_MAN_CS_EN, + writel(mxic_spi_prep_hc_cfg(mem->spi, HC_CFG_MAN_CS_EN), mxic->regs + HC_CFG); + writel(HC_EN_BIT, mxic->regs + HC_EN); ss_ctrl = OP_CMD_BYTES(op->cmd.nbytes) | -- 2.27.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2021-12-16 11:17 UTC|newest] Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-12-16 11:16 [PATCH v6 00/28] External ECC engines & Macronix support Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 01/28] dt-bindings: mtd: nand-controller: Fix the reg property description Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:54 ` Miquel Raynal 2021-12-17 15:54 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 02/28] dt-bindings: mtd: nand-controller: Fix a comment in the examples Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:54 ` Miquel Raynal 2021-12-17 15:54 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 03/28] dt-bindings: mtd: nand-controller: Harmonize the property types Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-16 21:09 ` Rob Herring 2021-12-16 21:09 ` Rob Herring 2021-12-17 15:54 ` Miquel Raynal 2021-12-17 15:54 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 04/28] dt-bindings: mtd: nand-chip: Create a NAND chip description Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:54 ` Miquel Raynal 2021-12-17 15:54 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 05/28] dt-bindings: mtd: spi-nand: Convert spi-nand description file to yaml Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:54 ` Miquel Raynal 2021-12-17 15:54 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 06/28] dt-bindings: vendor-prefixes: Clarify Macronix prefix Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:54 ` Miquel Raynal 2021-12-17 15:54 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 07/28] dt-bindings: spi: mxic: The interrupt property is not mandatory Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 08/28] dt-bindings: spi: mxic: Convert to yaml Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 09/28] dt-bindings: spi: mxic: Document the nand-ecc-engine property Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 10/28] dt-bindings: mtd: Describe Macronix NAND ECC engine Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 11/28] mtd: spinand: macronix: Use random program load Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 12/28] mtd: nand: ecc: Add infrastructure to support hardware engines Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 13/28] mtd: nand: Add a new helper to retrieve the ECC context Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 14/28] mtd: nand: mxic-ecc: Add Macronix external ECC engine support Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2021-12-17 15:53 ` Miquel Raynal 2022-02-22 10:39 ` Geert Uytterhoeven 2022-02-22 10:39 ` Geert Uytterhoeven 2022-02-22 10:41 ` Miquel Raynal 2022-02-22 10:41 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 15/28] mtd: nand: ecc: Provide a helper to retrieve a pilelined engine device Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:52 ` Miquel Raynal 2021-12-17 15:52 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 16/28] mtd: nand: mxic-ecc: Support SPI pipelined mode Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-17 15:52 ` Miquel Raynal 2021-12-17 15:52 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 17/28] mtd: spinand: Delay a little bit the dirmap creation Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 18/28] spi: spi-mem: Fix a DTR related check in spi_mem_dtr_supports_op() Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 19/28] spi: spi-mem: Introduce a capability structure Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 20/28] spi: spi-mem: Fill the spi-mem controller capabilities of all the drivers Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-16 15:52 ` Miquel Raynal 2021-12-16 15:52 ` Miquel Raynal 2021-12-16 18:00 ` kernel test robot 2021-12-16 18:00 ` kernel test robot 2021-12-16 18:00 ` kernel test robot 2021-12-16 18:21 ` kernel test robot 2021-12-16 18:21 ` kernel test robot 2021-12-16 18:21 ` kernel test robot 2021-12-16 18:52 ` kernel test robot 2021-12-16 18:52 ` kernel test robot 2021-12-16 18:52 ` kernel test robot 2021-12-16 20:10 ` [RFC PATCH] spi: spi-mem: mxic_spi_mem_caps can be static kernel test robot 2021-12-16 20:10 ` kernel test robot 2021-12-16 20:10 ` kernel test robot 2021-12-16 20:14 ` [PATCH v6 20/28] spi: spi-mem: Fill the spi-mem controller capabilities of all the drivers kernel test robot 2021-12-16 20:14 ` kernel test robot 2021-12-16 20:14 ` kernel test robot 2021-12-16 20:14 ` [RFC PATCH] spi: spi-mem: cqspi_mem_caps can be static kernel test robot 2021-12-16 20:14 ` kernel test robot 2021-12-16 20:14 ` kernel test robot 2021-12-16 20:24 ` [PATCH v6 20/28] spi: spi-mem: Fill the spi-mem controller capabilities of all the drivers kernel test robot 2021-12-16 20:24 ` kernel test robot 2021-12-16 20:24 ` kernel test robot 2021-12-16 11:16 ` [PATCH v6 21/28] spi: spi-mem: Kill the spi_mem_dtr_supports_op() helper Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 22/28] spi: spi-mem: Add an ecc_en parameter to the spi_mem_op structure Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 23/28] mtd: spinand: Create direct mapping descriptors for ECC operations Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 24/28] spi: mxic: Fix the transmit path Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal [this message] 2021-12-16 11:16 ` [PATCH v6 25/28] spi: mxic: Create a helper to configure the controller before an operation Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 26/28] spi: mxic: Create a helper to ease the start of " Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 27/28] spi: mxic: Add support for direct mapping Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal 2021-12-16 11:16 ` [PATCH v6 28/28] spi: mxic: Add support for pipelined ECC operations Miquel Raynal 2021-12-16 11:16 ` Miquel Raynal
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211216111654.238086-26-miquel.raynal@bootlin.com \ --to=miquel.raynal@bootlin.com \ --cc=Tudor.Ambarus@microchip.com \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=jaimeliao@mxic.com.tw \ --cc=juliensu@mxic.com.tw \ --cc=linux-mtd@lists.infradead.org \ --cc=linux-spi@vger.kernel.org \ --cc=michael@walle.cc \ --cc=p.yadav@ti.com \ --cc=richard@nod.at \ --cc=robh+dt@kernel.org \ --cc=thomas.petazzoni@bootlin.com \ --cc=vigneshr@ti.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.