94 lines
3.2 KiB
Diff
94 lines
3.2 KiB
Diff
From 12c5d4361e40e06999e4e0e9865fc61052841424 Mon Sep 17 00:00:00 2001
|
|
From: oujiefeng <oujiefeng@huawei.com>
|
|
Date: Tue, 19 Apr 2022 17:06:41 +0800
|
|
Subject: [PATCH 109/109] spi: hisi-kunpeng: Fix the debugfs directory name
|
|
incorrect
|
|
|
|
mainline inclusion
|
|
from mainline-v5.17-rc1
|
|
commit 40fafc8eca3f0d41b9dade5c10afb2dad723aad7
|
|
category: bugfix
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8DDF5
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=40fafc8eca3f0d41b9dade5c10afb2dad723aad7
|
|
|
|
----------------------------------------------------------------------------
|
|
|
|
Change the debugfs directory name from hisi_spi65535 to hisi_spi0.
|
|
|
|
Fixes: 2b2142f247eb ("spi: hisi-kunpeng: Add debugfs support")
|
|
Signed-off-by: oujiefeng <oujiefeng@huawei.com>
|
|
Signed-off-by: Jay Fang <f.fangjian@huawei.com>
|
|
Link: https://lore.kernel.org/r/20211117012119.55558-1-f.fangjian@huawei.com
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
Reviewed-by: Jay Fang <f.fangjian@huawei.com>
|
|
Acked-by: Xie XiuQi <xiexiuqi@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: YunYi Yang <yangyunyi2@huawei.com>
|
|
---
|
|
drivers/spi/spi-hisi-kunpeng.c | 15 ++++++++-------
|
|
1 file changed, 8 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/drivers/spi/spi-hisi-kunpeng.c b/drivers/spi/spi-hisi-kunpeng.c
|
|
index 4595044a530b..9832faadb324 100644
|
|
--- a/drivers/spi/spi-hisi-kunpeng.c
|
|
+++ b/drivers/spi/spi-hisi-kunpeng.c
|
|
@@ -127,7 +127,6 @@ struct hisi_spi {
|
|
void __iomem *regs;
|
|
int irq;
|
|
u32 fifo_len; /* depth of the FIFO buffer */
|
|
- u16 bus_num;
|
|
|
|
/* Current message transfer state info */
|
|
const void *tx;
|
|
@@ -165,7 +164,10 @@ static int hisi_spi_debugfs_init(struct hisi_spi *hs)
|
|
{
|
|
char name[32];
|
|
|
|
- snprintf(name, 32, "hisi_spi%d", hs->bus_num);
|
|
+ struct spi_controller *master;
|
|
+
|
|
+ master = container_of(hs->dev, struct spi_controller, dev);
|
|
+ snprintf(name, 32, "hisi_spi%d", master->bus_num);
|
|
hs->debugfs = debugfs_create_dir(name, NULL);
|
|
if (!hs->debugfs)
|
|
return -ENOMEM;
|
|
@@ -467,7 +469,6 @@ static int hisi_spi_probe(struct platform_device *pdev)
|
|
hs = spi_controller_get_devdata(master);
|
|
hs->dev = dev;
|
|
hs->irq = irq;
|
|
- hs->bus_num = pdev->id;
|
|
|
|
hs->regs = devm_platform_ioremap_resource(pdev, 0);
|
|
if (IS_ERR(hs->regs))
|
|
@@ -489,7 +490,7 @@ static int hisi_spi_probe(struct platform_device *pdev)
|
|
|
|
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP;
|
|
master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);
|
|
- master->bus_num = hs->bus_num;
|
|
+ master->bus_num = pdev->id;
|
|
master->setup = hisi_spi_setup;
|
|
master->cleanup = hisi_spi_cleanup;
|
|
master->transfer_one = hisi_spi_transfer_one;
|
|
@@ -505,15 +506,15 @@ static int hisi_spi_probe(struct platform_device *pdev)
|
|
return ret;
|
|
}
|
|
|
|
- if (hisi_spi_debugfs_init(hs))
|
|
- dev_info(dev, "failed to create debugfs dir\n");
|
|
-
|
|
ret = spi_register_controller(master);
|
|
if (ret) {
|
|
dev_err(dev, "failed to register spi master, ret=%d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
+ if (hisi_spi_debugfs_init(hs))
|
|
+ dev_info(dev, "failed to create debugfs dir\n");
|
|
+
|
|
dev_info(dev, "hw version:0x%x max-freq:%u kHz\n",
|
|
readl(hs->regs + HISI_SPI_VERSION),
|
|
master->max_speed_hz / 1000);
|
|
--
|
|
2.23.0
|
|
|