Skip to contentSkip to conversation

Some fixes for spi-altera

PATCH In review Xu Yilun 2 participants 4 messages Jun 24, 2020 SPI

lore
Share & tools
lore

Xu Yilun

author
#0 lore raw

cover Some fixes for spi-altera

Two fixes for indirect access support patchset.

Xu Yilun (2):
spi: altera: fix driver matching failure of the device ID "spi_altera"
spi: altera: fix module autoload

 drivers/spi/spi-altera.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/2 spi: altera: fix driver matching failure of the device ID "spi_altera"

The driver is expected to support device ID "spi_altera" for MMIO accessed devices, device ID "subdev_spi_altera" for indirect accessed devices. But the platform bus will not try driver name match anymore if the platform driver has an id_table. So the "spi_altera" should also be added to id_table.

---
 drivers/spi/spi-altera.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/spi/spi-altera.c +2 -1
index d91c093..e272a04 100644
@@ -352,7 +352,8 @@ MODULE_DEVICE_TABLE(of, altera_spi_match);
 #endif /* CONFIG_OF */
 
 static const struct platform_device_id altera_spi_ids[] = {
-	{ "subdev_spi_altera", ALTERA_SPI_TYPE_SUBDEV },
+	{ DRV_NAME,		ALTERA_SPI_TYPE_UNKNOWN },
+	{ "subdev_spi_altera",	ALTERA_SPI_TYPE_SUBDEV },
 	{ }
 };
 
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH 2/2 spi: altera: fix module autoload

In reply to Xu Yilun

Add the MODULE_DEVICE_TABLE macro for the platform_device_id table to allow proper creation of modalias strings and fix autoloading module for this driver.

---
 drivers/spi/spi-altera.c | 1 +
 1 file changed, 1 insertion(+)
drivers/spi/spi-altera.c +1 -0
index e272a04..809bfff 100644
@@ -356,6 +356,7 @@ static const struct platform_device_id altera_spi_ids[] = {
 	{ "subdev_spi_altera",	ALTERA_SPI_TYPE_SUBDEV },
 	{ }
 };
+MODULE_DEVICE_TABLE(platform, altera_spi_ids);
 
 static struct platform_driver altera_spi_driver = {
 	.probe = altera_spi_probe,
Signature · 1 line
2.7.4
maintainer
#3 lore raw
In reply to Xu Yilun
Quoted 8 lines · Xu Yilun

Two fixes for indirect access support patchset.

Xu Yilun (2):
spi: altera: fix driver matching failure of the device ID "spi_altera"
spi: altera: fix module autoload

 drivers/spi/spi-altera.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/2] spi: altera: fix driver matching failure of the device ID "spi_altera"

      commit: de5fd9cb6a3f89a1ac8f27883d029f823112243f
[2/2] spi: altera: fix module autoload
      commit: 1ac6f21a948b45a49737a5eff6b4dae9f37a8dc0

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark