From: Leilk Liu <leilk.liu@mediatek.com>
To: Mark Brown <broonie@kernel.org>
Cc: Rob Herring <robh+dt@kernel.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-spi@vger.kernel.org>, <linux-mediatek@lists.infradead.org>,
Leilk Liu <leilk.liu@mediatek.com>
Subject: [PATCH V3 1/7] spi: mediatek: support tick_delay without enhance_timing
Date: Mon, 7 Mar 2022 14:52:24 +0800 [thread overview]
Message-ID: <20220307065230.12655-2-leilk.liu@mediatek.com> (raw)
In-Reply-To: <20220307065230.12655-1-leilk.liu@mediatek.com>
this patch support tick_delay bit[31:30] without enhance_timing feature.
Fixes: f84d866ab43f("spi: mediatek: add tick_delay support")
Signed-off-by: Leilk Liu <leilk.liu@mediatek.com>
---
drivers/spi/spi-mt65xx.c | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
index bbfeb8046c17..3fd89548ec3c 100644
--- a/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@ -43,8 +43,11 @@
#define SPI_CFG1_PACKET_LOOP_OFFSET 8
#define SPI_CFG1_PACKET_LENGTH_OFFSET 16
#define SPI_CFG1_GET_TICK_DLY_OFFSET 29
+#define SPI_CFG1_GET_TICK_DLY_OFFSET_V1 30
#define SPI_CFG1_GET_TICK_DLY_MASK 0xe0000000
+#define SPI_CFG1_GET_TICK_DLY_MASK_V1 0xc0000000
+
#define SPI_CFG1_CS_IDLE_MASK 0xff
#define SPI_CFG1_PACKET_LOOP_MASK 0xff00
#define SPI_CFG1_PACKET_LENGTH_MASK 0x3ff0000
@@ -346,9 +349,15 @@ static int mtk_spi_prepare_message(struct spi_master *master,
/* tick delay */
reg_val = readl(mdata->base + SPI_CFG1_REG);
- reg_val &= ~SPI_CFG1_GET_TICK_DLY_MASK;
- reg_val |= ((chip_config->tick_delay & 0x7)
- << SPI_CFG1_GET_TICK_DLY_OFFSET);
+ if (mdata->dev_comp->enhance_timing) {
+ reg_val &= ~SPI_CFG1_GET_TICK_DLY_MASK;
+ reg_val |= ((chip_config->tick_delay & 0x7)
+ << SPI_CFG1_GET_TICK_DLY_OFFSET);
+ } else {
+ reg_val &= ~SPI_CFG1_GET_TICK_DLY_MASK_V1;
+ reg_val |= ((chip_config->tick_delay & 0x3)
+ << SPI_CFG1_GET_TICK_DLY_OFFSET_V1);
+ }
writel(reg_val, mdata->base + SPI_CFG1_REG);
/* set hw cs timing */
--
2.25.1
next prev parent reply other threads:[~2022-03-07 6:52 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-07 6:52 [PATCH V3 0/7] spi: mediatek: add single/quad mode support Leilk Liu
2022-03-07 6:52 ` Leilk Liu [this message]
2022-03-07 10:28 ` [PATCH V3 1/7] spi: mediatek: support tick_delay without enhance_timing AngeloGioacchino Del Regno
2022-03-07 6:52 ` [PATCH V3 2/7] dt-bindings: spi: Add compatible for MT7986 with single mode Leilk Liu
2022-03-07 10:32 ` AngeloGioacchino Del Regno
2022-03-08 1:51 ` Leilk Liu
2022-03-07 6:52 ` [PATCH V3 3/7] spi: mediatek: add MT7986 single mode design support Leilk Liu
2022-03-07 6:52 ` [PATCH V3 4/7] dt-bindings: spi: Add compatible for MT7986 with quad mode Leilk Liu
2022-03-07 6:52 ` [PATCH V3 5/7] spi: mediatek: add spi memory support for MT7986 Leilk Liu
2022-03-07 6:52 ` [PATCH V3 6/7] dt-bindings: spi: support spi-hclk Leilk Liu
2022-03-07 23:42 ` Rob Herring
2022-03-08 1:48 ` Leilk Liu
2022-03-07 6:52 ` [PATCH V3 7/7] spi: mediatek: " Leilk Liu
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=20220307065230.12655-2-leilk.liu@mediatek.com \
--to=leilk.liu@mediatek.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-spi@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=robh+dt@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).