spi: spi-mtk-nor: improve device table for adding more capabilities
Subsystems (2)
PATCH 2/4 spi: spi-mtk-nor: improve device table for adding more capabilities
From: Guochun Mao <[email protected]>
Define a structure for adding more capabilities.
Add a item extra_dummy_bit for new SoCs, due to design changed.
--- drivers/spi/spi-mtk-nor.c | 48 +++++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 9 deletions(-)
drivers/spi/spi-mtk-nor.c +39 -9
@@ -95,6 +95,17 @@#define CLK_TO_US (sp, clkcnt) DIV_ROUND_UP(clkcnt, sp->spi_freq / 1000000) +struct mtk_nor_caps { +u8 dma_bits; + +/* extra_dummy_bit is adding for the IP of new SoCs. +* Some new SoCs modify the timing of fetching registers' values +* and IDs of nor flash, they need a extra_dummy_bit which can add +* more clock cycles for fetching data. +*/ +u8 extra_dummy_bit; +}; +struct mtk_nor {struct spi_controller *ctlr;struct device *dev;
@@ -109,6 +120,7 @@ struct mtk_nor {bool has_irq;bool high_dma;struct completion op_done; +const struct mtk_nor_caps *caps; };static inline void mtk_nor_rmw (struct mtk_nor *sp,u32 reg,u32 set,u32 clr)
@@ -554,7 +566,12 @@ static int mtk_nor_spi_mem_prg(struct mtk_nor *sp, const struct spi_mem_op *op) }// trigger op -writel (prg_len *BITS_PER_BYTE , sp->base +MTK_NOR_REG_PRG_CNT ); +if (rx_len) +writel (prg_len *BITS_PER_BYTE + sp->caps->extra_dummy_bit, + sp->base +MTK_NOR_REG_PRG_CNT ); +else +writel (prg_len *BITS_PER_BYTE , sp->base +MTK_NOR_REG_PRG_CNT ); + ret =mtk_nor_cmd_exec (sp,MTK_NOR_CMD_PROGRAM , prg_len *BITS_PER_BYTE );if (ret)
@@ -743,9 +760,19 @@ static const struct spi_controller_mem_ops mtk_nor_mem_ops = { .exec_op = mtk_nor_exec_op }; +const struct mtk_nor_caps mtk_nor_caps_mt8173 = { + .dma_bits =32 , + .extra_dummy_bit =0 , +}; + +const struct mtk_nor_caps mtk_nor_caps_mt8192 = { + .dma_bits =36 , + .extra_dummy_bit =0 , +}; +static const struct of_device_id mtk_nor_match[] = { - { .compatible ="mediatek,mt8192-nor" , .data = (void *)36 }, - { .compatible ="mediatek,mt8173-nor" , .data = (void *)32 }, + { .compatible ="mediatek,mt8173-nor" , .data = &mtk_nor_caps_mt8173 }, + { .compatible ="mediatek,mt8192-nor" , .data = &mtk_nor_caps_mt8192 }, {/* sentinel */ } };MODULE_DEVICE_TABLE (of, mtk_nor_match);
@@ -754,10 +781,10 @@ static int mtk_nor_probe(struct platform_device *pdev) {struct spi_controller *ctlr;struct mtk_nor *sp; +struct mtk_nor_caps *caps;void __iomem *base;struct clk *spi_clk, *ctlr_clk, *axi_clk;int ret, irq; -unsigned long dma_bits; base =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (base))
@@ -775,10 +802,12 @@ static int mtk_nor_probe(struct platform_device *pdev)if (IS_ERR (axi_clk))return PTR_ERR (axi_clk); - dma_bits = (unsigned long )of_device_get_match_data (&pdev->dev); -if (dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (dma_bits))) { -dev_err (&pdev->dev,"failed to set dma mask(%lu)\n" , dma_bits); -return -EINVAL ; + caps = (struct mtk_nor_caps *)of_device_get_match_data (&pdev->dev); + + ret =dma_set_mask_and_coherent (&pdev->dev,DMA_BIT_MASK (caps->dma_bits)); +if (ret) { +dev_err (&pdev->dev,"failed to set dma mask(%u)\n" , caps->dma_bits); +return ret; } ctlr =devm_spi_alloc_master (&pdev->dev,sizeof (*sp));
@@ -808,7 +837,8 @@ static int mtk_nor_probe(struct platform_device *pdev) sp->spi_clk = spi_clk; sp->ctlr_clk = ctlr_clk; sp->axi_clk = axi_clk; - sp->high_dma = (dma_bits >32 ); + sp->caps = caps; + sp->high_dma = caps->dma_bits >32 ; sp->buffer =dmam_alloc_coherent (&pdev->dev,MTK_NOR_BOUNCE_BUF_SIZE +MTK_NOR_DMA_ALIGN , &sp->buffer_dma,GFP_KERNEL );
Signature · 7 lines
2.25.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Mark Brown
maintainerQuoted 4 lines · On Tue, Jan 18, 2022 at 10:19:40PM +0800, [email protected] wrote:
From: Guochun Mao <[email protected]>
Define a structure for adding more capabilities.
Add a itemextra_dummy_bitfor new SoCs, due to design changed.
This is patch 2/4 but I don't have any context for the rest of the series - what's the story?
Quoted 3 lines
Signed-off-by Guochun Mao <[email protected]>Signed-off-by Zhen Zhang <[email protected]>Change-Id I6f36e6fe1c752e57e85818758f742fb0e575bf7f
Please drop your internal Change-Ids from upstream submissions, they don't mean anything outside of your Gerritt.
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Quoted 10 lines · Mark Brown
Quoted 4 lines · On Tue, Jan 18, 2022 at 10:19:40PM +0800, [email protected] wrote:
From: Guochun Mao <[email protected]>
Define a structure for adding more capabilities.
Add a itemextra_dummy_bitfor new SoCs, due to design changed.This is patch 2/4 but I don't have any context for the rest of the series - what's the story?
Quoted 6 lines
Quoted 3 lines
Signed-off-by Guochun Mao <[email protected]>Signed-off-by Zhen Zhang <[email protected]>Change-Id I6f36e6fe1c752e57e85818758f742fb0e575bf7fPlease drop your internal Change-Ids from upstream submissions, they don't mean anything outside of your Gerritt.
Hi Mark,
Thanks for your review.
I am aware that, so I have sent another email
"[PATCH v2 2/4] spi: spi-mtk-nor: improve device table for adding more capabilities"
Sorry for the inconvenience.
BR,
Guochun
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Quoted 9 lines · Mark Brown
Quoted 4 lines · On Tue, Jan 18, 2022 at 10:19:40PM +0800, [email protected] wrote:
From: Guochun Mao <[email protected]>
Define a structure for adding more capabilities.
Add a itemextra_dummy_bitfor new SoCs, due to design changed.This is patch 2/4 but I don't have any context for the rest of the series - what's the story?
Sorry, I don't know why you can't recieve the reset of the esries. I'll sent these mails to you again.
thanks.
Guochun
Quoted 7 lines
Quoted 4 lines
Signed-off-by Guochun Mao <[email protected]>Signed-off-by Zhen Zhang <[email protected]>Change-Id I6f36e6fe1c752e57e85818758f742fb0e575bf7fPlease drop your internal Change-Ids from upstream submissions, they don't mean anything outside of your Gerritt.
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek